SF.net SVN: matplotlib:[6698] trunk/py4science/examples/pyrex/trailstats/ ringbufnan.c
Revision: 6698
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6698&view=rev
Author: jdh2358
Date: 2008-12-23 16:06:15 + (Tue, 23 Dec 2008)
Log Message:
---
fixed a bug in the nsorted changes
Modified Paths:
--
trunk/py4science/examples/pyrex/trailstats/ringbufnan.c
Modified: trunk/py4science/examples/pyrex/trailstats/ringbufnan.c
===
--- trunk/py4science/examples/pyrex/trailstats/ringbufnan.c 2008-12-23
01:06:18 UTC (rev 6697)
+++ trunk/py4science/examples/pyrex/trailstats/ringbufnan.c 2008-12-23
16:06:15 UTC (rev 6698)
@@ -376,7 +376,7 @@
rb_ptr = new_ringbuf(nrb);
for (i = 0; i < npad; i++)
{
-nsorted[j*step] = ringbuf_add(rb_ptr, data[i*step]);
+nsorted[i*step] = ringbuf_add(rb_ptr, data[i*step]);
}
for (j=0; jhttps://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6699] trunk/matplotlib
Revision: 6699
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6699&view=rev
Author: jdh2358
Date: 2008-12-23 19:49:08 + (Tue, 23 Dec 2008)
Log Message:
---
added support for mincnt to hexbin
Modified Paths:
--
trunk/matplotlib/lib/matplotlib/axes.py
trunk/matplotlib/release/osx/Makefile
Modified: trunk/matplotlib/lib/matplotlib/axes.py
===
--- trunk/matplotlib/lib/matplotlib/axes.py 2008-12-23 16:06:15 UTC (rev
6698)
+++ trunk/matplotlib/lib/matplotlib/axes.py 2008-12-23 19:49:08 UTC (rev
6699)
@@ -5212,7 +5212,7 @@
xscale = 'linear', yscale = 'linear',
cmap=None, norm=None, vmin=None, vmax=None,
alpha=1.0, linewidths=None, edgecolors='none',
-reduce_C_function = np.mean,
+reduce_C_function = np.mean, mincnt=None,
**kwargs):
"""
call signature::
@@ -5221,7 +5221,7 @@
xscale = 'linear', yscale = 'linear',
cmap=None, norm=None, vmin=None, vmax=None,
alpha=1.0, linewidths=None, edgecolors='none'
- reduce_C_function = np.mean,
+ reduce_C_function = np.mean, mincnt=None,
**kwargs)
Make a hexagonal binning plot of *x* versus *y*, where *x*,
@@ -5269,6 +5269,10 @@
*scale*: [ 'linear' | 'log' ]
Use a linear or log10 scale on the vertical axis.
+ *mincnt*: None | a positive integer
+If not None, only display cells with at least *mincnt*
+number of points in the cell
+
Other keyword arguments controlling color mapping and normalization
arguments:
@@ -5369,6 +5373,8 @@
d1 = (x-ix1)**2 + 3.0 * (y-iy1)**2
d2 = (x-ix2-0.5)**2 + 3.0 * (y-iy2-0.5)**2
bdist = (d1mincnt:
lattice1[i,j] = reduce_C_function( vals )
else:
lattice1[i,j] = np.nan
Modified: trunk/matplotlib/release/osx/Makefile
===
--- trunk/matplotlib/release/osx/Makefile 2008-12-23 16:06:15 UTC (rev
6698)
+++ trunk/matplotlib/release/osx/Makefile 2008-12-23 19:49:08 UTC (rev
6699)
@@ -95,7 +95,7 @@
rm -rf upload &&\
mkdir upload &&\
cp matplotlib-${MPLVERSION}.tar.gz upload/ &&\
- cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py2.5-macosx-10.3-fat.egg
upload/matplotlib-${MPLVERSION}-py2.5.egg &&\
+ cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}_r0-py2.5-macosx-10.3-fat.egg
upload/matplotlib-${MPLVERSION}-macosx-py2.5.egg &&\
cp
matplotlib-${MPLVERSION}/dist/matplotlib-${MPLVERSION}-py2.5-macosx10.5.zip
upload/matplotlib-${MPLVERSION}-py2.5-mpkg.zip&&\
scp upload/* [email protected]:uploads/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
--
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6700] trunk/matplotlib/lib/matplotlib/axes.py
Revision: 6700 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6700&view=rev Author: jdh2358 Date: 2008-12-23 19:54:17 + (Tue, 23 Dec 2008) Log Message: --- added support for mincnt to hexbin Modified Paths: -- trunk/matplotlib/lib/matplotlib/axes.py Modified: trunk/matplotlib/lib/matplotlib/axes.py === --- trunk/matplotlib/lib/matplotlib/axes.py 2008-12-23 19:49:08 UTC (rev 6699) +++ trunk/matplotlib/lib/matplotlib/axes.py 2008-12-23 19:54:17 UTC (rev 6700) @@ -5270,7 +5270,7 @@ Use a linear or log10 scale on the vertical axis. *mincnt*: None | a positive integer -If not None, only display cells with at least *mincnt* +If not None, only display cells with more than *mincnt* number of points in the cell Other keyword arguments controlling color mapping and normalization This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
SF.net SVN: matplotlib:[6701] trunk/matplotlib/lib/matplotlib/axes.py
Revision: 6701 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6701&view=rev Author: jdh2358 Date: 2008-12-23 21:55:45 + (Tue, 23 Dec 2008) Log Message: --- fixed a mincnt problem with hexbin Modified Paths: -- trunk/matplotlib/lib/matplotlib/axes.py Modified: trunk/matplotlib/lib/matplotlib/axes.py === --- trunk/matplotlib/lib/matplotlib/axes.py 2008-12-23 19:54:17 UTC (rev 6700) +++ trunk/matplotlib/lib/matplotlib/axes.py 2008-12-23 21:55:45 UTC (rev 6701) @@ -5417,7 +5417,7 @@ for i in xrange(nx2): for j in xrange(ny2): vals = lattice2[i,j] -if len(vals): +if len(vals)>mincnt: lattice2[i,j] = reduce_C_function( vals ) else: lattice2[i,j] = np.nan This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. -- ___ Matplotlib-checkins mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
