Skip to content

Commit

Permalink
change: rename vonmises_ext to vonmises_flattopped, jonespewsey_asyme…
Browse files Browse the repository at this point in the history 
…xt to jonespewsey_asym
  • Loading branch information
@huangziwei
huangziwei committed Dec 5, 2024
1 parent 19da8e3 commit c2d7d41
Show file tree
Hide file tree
Showing 9 changed files with 240 additions and 218 deletions.
0 ...s/images/circ-mod-jonespewsey-asymext.png → ...docs/images/circ-mod-jonespewsey-asym.png
View file
File renamed without changes
0 docs/docs/images/circ-mod-vonmises-ext.png → .../images/circ-mod-vonmises-flat-topped.png
View file
File renamed without changes
65 changes: 29 additions & 36 deletions examples/B3-Pewsey-2014.ipynb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
"metadata": {},
"outputs": [],
"source": [
"from pycircstat2.distributions import cardioid, cartwright, jonespewsey, vonmises, vonmises_ext, wrapnorm, wrapcauchy"
"from pycircstat2.distributions import cardioid, cartwright, jonespewsey, vonmises, vonmises_flattopped, wrapnorm, wrapcauchy"
]
},
{
Expand Down Expand Up @@ -836,7 +836,7 @@
{
"data": {
"text/plain": [
"<matplotlib.legend.Legend at 0x7f91607c6740>"
"<matplotlib.legend.Legend at 0x7fbfab3739d0>"
]
},
"execution_count": 19,
Expand All @@ -861,15 +861,15 @@
"\n",
"fig, ax = plt.subplots(figsize=(5,5), subplot_kw={'projection': 'polar'}, layout='constrained')\n",
"\n",
"ax.plot(x, vonmises_ext.pdf(x, kappa=3, nu=0, mu=np.pi/2) + 1, linestyle='-', color='black', label='ν=0')\n",
"ax.plot(x, vonmises_flattopped.pdf(x, kappa=3, nu=0, mu=np.pi/2) + 1, linestyle='-', color='black', label='ν=0')\n",
"\n",
"ax.plot(x, vonmises_ext.pdf(x, kappa=3, nu=-0.999, mu=np.pi/2) + 1, linestyle=':', color='black', label='ν=-0.999;-0.75;-0.5')\n",
"ax.plot(x, vonmises_ext.pdf(x, kappa=3, nu=-0.75, mu=np.pi/2) + 1, linestyle=':', color='black')\n",
"ax.plot(x, vonmises_ext.pdf(x, kappa=3, nu=-0.5, mu=np.pi/2) + 1, linestyle=':', color='black')\n",
"ax.plot(x, vonmises_flattopped.pdf(x, kappa=3, nu=-0.999, mu=np.pi/2) + 1, linestyle=':', color='black', label='ν=-0.999;-0.75;-0.5')\n",
"ax.plot(x, vonmises_flattopped.pdf(x, kappa=3, nu=-0.75, mu=np.pi/2) + 1, linestyle=':', color='black')\n",
"ax.plot(x, vonmises_flattopped.pdf(x, kappa=3, nu=-0.5, mu=np.pi/2) + 1, linestyle=':', color='black')\n",
"\n",
"ax.plot(x, vonmises_ext.pdf(x, kappa=3, nu=0.999, mu=np.pi/2) + 1, linestyle='--', color='black', label='ν=0.999;0.75;0.5')\n",
"ax.plot(x, vonmises_ext.pdf(x, kappa=3, nu=0.75, mu=np.pi/2) + 1, linestyle='--', color='black')\n",
"ax.plot(x, vonmises_ext.pdf(x, kappa=3, nu=0.5, mu=np.pi/2) + 1, linestyle='-', color='black')\n",
"ax.plot(x, vonmises_flattopped.pdf(x, kappa=3, nu=0.999, mu=np.pi/2) + 1, linestyle='--', color='black', label='ν=0.999;0.75;0.5')\n",
"ax.plot(x, vonmises_flattopped.pdf(x, kappa=3, nu=0.75, mu=np.pi/2) + 1, linestyle='--', color='black')\n",
"ax.plot(x, vonmises_flattopped.pdf(x, kappa=3, nu=0.5, mu=np.pi/2) + 1, linestyle='-', color='black')\n",
"\n",
"rtick = [0, 1]\n",
"ax.spines[\"polar\"].set_visible(False)\n",
Expand Down Expand Up @@ -995,7 +995,7 @@
}
],
"source": [
"from pycircstat2.distributions import jonespewsey_asymext\n",
"from pycircstat2.distributions import jonespewsey_asym\n",
"\n",
"n = 200\n",
"x = np.linspace(0, 2 * np.pi, n)\n",
Expand All @@ -1005,27 +1005,27 @@
"\n",
"### left\n",
"\n",
"ax['a'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=-1, nu=0, xi=mu) + 1, linestyle='-', color='black')\n",
"ax['a'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=-1, nu=0.25, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['a'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=-1, nu=0.5, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['a'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=-1, nu=0.75, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['a'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=-1, nu=0.999, xi=mu) + 1, linestyle=':', color='black')\n",
"ax['a'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=-1, nu=0, xi=mu) + 1, linestyle='-', color='black')\n",
"ax['a'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=-1, nu=0.25, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['a'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=-1, nu=0.5, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['a'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=-1, nu=0.75, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['a'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=-1, nu=0.999, xi=mu) + 1, linestyle=':', color='black')\n",
"\n",
"#### mid\n",
"\n",
"ax['b'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=0, nu=0, xi=mu) + 1, linestyle='-', color='black')\n",
"ax['b'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=0, nu=0.25, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['b'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=0, nu=0.5, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['b'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=0, nu=0.75, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['b'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=0, nu=0.999, xi=mu) + 1, linestyle=':', color='black')\n",
"ax['b'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=0, nu=0, xi=mu) + 1, linestyle='-', color='black')\n",
"ax['b'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=0, nu=0.25, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['b'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=0, nu=0.5, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['b'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=0, nu=0.75, xi=mu) + 1, linestyle='--', color='black')\n",
"ax['b'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=0, nu=0.999, xi=mu) + 1, linestyle=':', color='black')\n",
"\n",
"#### right\n",
"\n",
"ax['c'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=1, nu=0, xi=mu) + 1, linestyle='-', color='black', label='ν=0')\n",
"ax['c'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=1, nu=0.25, xi=mu) + 1, linestyle='--', color='black', label='ν=0.25')\n",
"ax['c'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=1, nu=0.5, xi=mu) + 1, linestyle='--', color='black', label='ν=0.5')\n",
"ax['c'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=1, nu=0.75, xi=mu) + 1, linestyle='--', color='black', label='ν=0.75')\n",
"ax['c'].plot(x, jonespewsey_asymext.pdf(x, kappa=2, psi=1, nu=0.999, xi=mu) + 1, linestyle=':', color='black', label='ν=0.999')\n",
"ax['c'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=1, nu=0, xi=mu) + 1, linestyle='-', color='black', label='ν=0')\n",
"ax['c'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=1, nu=0.25, xi=mu) + 1, linestyle='--', color='black', label='ν=0.25')\n",
"ax['c'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=1, nu=0.5, xi=mu) + 1, linestyle='--', color='black', label='ν=0.5')\n",
"ax['c'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=1, nu=0.75, xi=mu) + 1, linestyle='--', color='black', label='ν=0.75')\n",
"ax['c'].plot(x, jonespewsey_asym.pdf(x, kappa=2, psi=1, nu=0.999, xi=mu) + 1, linestyle=':', color='black', label='ν=0.999')\n",
"\n",
"psis = [-1, 0, 1]\n",
"for j, s in enumerate(['a', 'b', 'c']):\n",
Expand Down Expand Up @@ -1254,18 +1254,18 @@
"name": "stdout",
"output_type": "stream",
"text": [
"Last updated: 2024-12-03 11:54:27CET\n",
"Last updated: 2024-12-05 11:51:22CET\n",
"\n",
"Python implementation: CPython\n",
"Python version : 3.10.13\n",
"IPython version : 8.29.0\n",
"\n",
"pycircstat2: 0.1.2\n",
"pycircstat2: 0.1.4\n",
"\n",
"matplotlib : 3.9.2\n",
"pycircstat2: 0.1.4\n",
"numpy : 2.1.3\n",
"polars : 1.14.0\n",
"pycircstat2: 0.1.2\n",
"matplotlib : 3.9.2\n",
"\n",
"Watermark: 2.5.0\n",
"\n"
Expand All @@ -1276,13 +1276,6 @@
"%load_ext watermark\n",
"%watermark --time --date --timezone --updated --python --iversions --watermark -p pycircstat2"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand Down
Loading

0 comments on commit c2d7d41

Please sign in to comment.