matplotlib-checkins Mailing List for matplotlib

Sorry. I didn't read carefully enough. That's right -- the "if 
converter: break" was replaced with "return converter".
You're right. This is fine.
Mike
John Hunter wrote:
> On Tue, Oct 7, 2008 at 11:26 AM, Michael Droettboom <md...@st...> wrote:
> 
>> This isn't quite what I was suggesting (and seems to be equivalent to
>> the code as before). In the common case where there are no units in the
>> data, this will still traverse the entire list.
>>
>> I think replacing the whole loop with:
>>
>> converter = self.get_converter(iter(x).next())
>>
>> would be even better. (Since lists of data should not be heterogeneous
>> anyway...)
>> 
>
> Hmm, I don't see how it would traverse the entire list
>
> for thisx in x:
> converter = self.get_converter( thisx )
> return converter
>
> since it will return after the first element in the loop. I have no
> problem with the iter approach, but am not seeing what the problem is
> with this usage.
>
> JDH
> 
-- 
Michael Droettboom
Science Software Branch
Operations and Engineering Division
Space Telescope Science Institute
Operated by AURA for NASA

This isn't quite what I was suggesting (and seems to be equivalent to 
the code as before). In the common case where there are no units in the 
data, this will still traverse the entire list.
I think replacing the whole loop with:
 converter = self.get_converter(iter(x).next())
would be even better. (Since lists of data should not be heterogeneous 
anyway...)
Mike
jd...@us... wrote:
> Revision: 6166
> http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6166&view=rev
> Author: jdh2358
> Date: 2008年10月07日 15:13:53 +0000 (2008年10月07日)
>
> Log Message:
> -----------
> added michaels unit detection optimization for arrays
>
> Modified Paths:
> --------------
> trunk/matplotlib/lib/matplotlib/units.py
>
> Modified: trunk/matplotlib/lib/matplotlib/units.py
> ===================================================================
> --- trunk/matplotlib/lib/matplotlib/units.py	2008年10月07日 15:13:13 UTC (rev 6165)
> +++ trunk/matplotlib/lib/matplotlib/units.py	2008年10月07日 15:13:53 UTC (rev 6166)
> @@ -135,7 +135,7 @@
> 
> for thisx in x:
> converter = self.get_converter( thisx )
> - if converter: break
> + return converter
> 
> #DISABLED self._cached[idx] = converter
> return converter
>
>
> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
>
> -------------------------------------------------------------------------
> This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
> Build the coolest Linux based applications with Moblin SDK & win great prizes
> Grand prize is a trip for two to an Open Source event anywhere in the world
> http://moblin-contest.org/redirect.php?banner_id=100&url=/
> _______________________________________________
> Matplotlib-checkins mailing list
> Mat...@li...
> https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins
> 
-- 
Michael Droettboom
Science Software Branch
Operations and Engineering Division
Space Telescope Science Institute
Operated by AURA for NASA

Revision: 6165
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6165&view=rev
Author: jdh2358
Date: 2008年10月07日 15:13:13 +0000 (2008年10月07日)
Log Message:
-----------
added michaels unit detection optimization for arrays
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/units.py
Modified: trunk/matplotlib/lib/matplotlib/units.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/units.py	2008年10月07日 06:31:29 UTC (rev 6164)
+++ trunk/matplotlib/lib/matplotlib/units.py	2008年10月07日 15:13:13 UTC (rev 6165)
@@ -43,6 +43,7 @@
 units.registry[datetime.date] = DateConverter()
 
 """
+import numpy as np
 from matplotlib.cbook import iterable, is_numlike
 
 class AxisInfo:
@@ -127,6 +128,11 @@
 converter = self.get(classx)
 
 if converter is None and iterable(x):
+ # if this is anything but an object array, we'll assume
+ # there are no custom units
+ if isinstance(x, np.ndarray) and x.dtype != np.object:
+ return None
+
 for thisx in x:
 converter = self.get_converter( thisx )
 if converter: break
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6166
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6166&view=rev
Author: jdh2358
Date: 2008年10月07日 15:13:53 +0000 (2008年10月07日)
Log Message:
-----------
added michaels unit detection optimization for arrays
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/units.py
Modified: trunk/matplotlib/lib/matplotlib/units.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/units.py	2008年10月07日 15:13:13 UTC (rev 6165)
+++ trunk/matplotlib/lib/matplotlib/units.py	2008年10月07日 15:13:53 UTC (rev 6166)
@@ -135,7 +135,7 @@
 
 for thisx in x:
 converter = self.get_converter( thisx )
- if converter: break
+ return converter
 
 #DISABLED self._cached[idx] = converter
 return converter
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6164
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6164&view=rev
Author: efiring
Date: 2008年10月07日 06:31:29 +0000 (2008年10月07日)
Log Message:
-----------
fix typos
Modified Paths:
--------------
 trunk/htdocs/interactive.html.template
 trunk/htdocs/whats_new.html.template
Modified: trunk/htdocs/interactive.html.template
===================================================================
--- trunk/htdocs/interactive.html.template	2008年10月07日 00:50:17 UTC (rev 6163)
+++ trunk/htdocs/interactive.html.template	2008年10月07日 06:31:29 UTC (rev 6164)
@@ -44,7 +44,7 @@
 
 <pre>
 peds-pc311:~> ipython -pylab
-Python 2.3.3 (#2, Apr 13 2004, 17:41:29) 
+Python 2.3.3 (#2, Apr 13 2004, 17:41:29)
 Type "copyright", "credits" or "license" for more information.
 
 IPython 0.6.5 -- An enhanced Interactive Python.
@@ -74,10 +74,10 @@
 /home/jdhunter/python/projects/matplotlib/examples/pylab
 >>> run simple_plot.py
 >>> title('a new title', color='r')
-</pre> 
+</pre>
 
 The pylab interface provides 4 commands that are useful for
-interactive control. Note again that the interactgive setting
+interactive control. Note again that the interactive setting
 primarily controls whether the figure is redrawn with each plotting
 command. <a
 href=matplotlib.pyplot.html#-isinteractive>isinteractive</a> returns
@@ -109,7 +109,7 @@
 <pre>
 >>> import matplotlib
 >>> matplotlib.interactive(True)
- >>> matplotlib.use('WX') 
+ >>> matplotlib.use('WX')
 >>> from matplotlib.pylab import *
 >>> plot([1,2,3])
 >>> xlabel('time (s)')
@@ -120,7 +120,7 @@
 
 <pre>
 backend : Wx
-interactive : True 
+interactive : True
 </pre>
 
 
Modified: trunk/htdocs/whats_new.html.template
===================================================================
--- trunk/htdocs/whats_new.html.template	2008年10月07日 00:50:17 UTC (rev 6163)
+++ trunk/htdocs/whats_new.html.template	2008年10月07日 06:31:29 UTC (rev 6164)
@@ -12,7 +12,7 @@
 
 ('external backends', """backend developers and users can now use custom backends outside the matplotlib tree, by using the special syntax <pre>module://my_backend</pre> for the backend setting in the rc file, the use directive, or in -d command line argument to pylab/pyplot scripts"""),
 
-('findobj', """Introduced a recursive object search method to find all objects that meet some matching criterion, ef to find all text instances in a figure. See <a href=examples/pylab_examples/findobj_demo.py>fondobj_demo.py</a>"""),
+('findobj', """Introduced a recursive object search method to find all objects that meet some matching criterion, e.g. to find all text instances in a figure. See <a href=examples/pylab_examples/findobj_demo.py>findobj_demo.py</a>"""),
 
 ('tons of bug fixes', """Many critical bugfixes affecting memory leaks, math rendering, UI specific problems and more. For details, see the <a href=CHANGELOG>CHANGELOG</a>""")
 
@@ -67,7 +67,7 @@
 to <a href=matplotlib.patches.html#Arc-draw>elliptical arcs</a> in the
 viewport. This provides a scale free, accurate graph of the arc
 regardless of zoom level.
-See <a href=screenshots.html#ellipse_demo>ellipse_demo 
+See <a href=screenshots.html#ellipse_demo>ellipse_demo
 screenshot</a>."""),
 
 ('imread enhanced', """<a href=matplotlib.image.html#-imread>imread</a> now will use PIL when available to load images and return numpy arrays"""),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6161
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6161&view=rev
Author: jswhit
Date: 2008年10月07日 00:46:26 +0000 (2008年10月07日)
Log Message:
-----------
fix url
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/plotsst.py
Modified: trunk/toolkits/basemap/examples/plotsst.py
===================================================================
--- trunk/toolkits/basemap/examples/plotsst.py	2008年10月07日 00:38:35 UTC (rev 6160)
+++ trunk/toolkits/basemap/examples/plotsst.py	2008年10月07日 00:46:26 UTC (rev 6161)
@@ -10,9 +10,9 @@
 else:
 date = sys.argv[1]
 if date[0:4] > '2005':
- ncfile = NetCDFFile('http://nomads.ncdc.noaa.gov:8085/thredds/dodsC/oisst/'+date[0:4]+'/AVHRR/sst4-navy-eot.'+date+'.nc')
+ ncfile = NetCDFFile('http://nomads.ncdc.noaa.gov/thredds/dodsC/oisst/'+date[0:4]+'/AVHRR/sst4-navy-eot.'+date+'.nc')
 else:
- ncfile = NetCDFFile('http://nomads.ncdc.noaa.gov:8085/thredds/dodsC/oisst/'+date[0:4]+'/AVHRR/sst4-path-eot.'+date+'.nc')
+ ncfile = NetCDFFile('http://nomads.ncdc.noaa.gov/thredds/dodsC/oisst/'+date[0:4]+'/AVHRR/sst4-path-eot.'+date+'.nc')
 # read sst. Will automatically create a masked array using
 # missing_value variable attribute.
 sst = ncfile.variables['sst'][:]
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6163
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6163&view=rev
Author: jswhit
Date: 2008年10月07日 00:50:17 +0000 (2008年10月07日)
Log Message:
-----------
update URL
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/fcstmaps.py
Modified: trunk/toolkits/basemap/examples/fcstmaps.py
===================================================================
--- trunk/toolkits/basemap/examples/fcstmaps.py	2008年10月07日 00:47:05 UTC (rev 6162)
+++ trunk/toolkits/basemap/examples/fcstmaps.py	2008年10月07日 00:50:17 UTC (rev 6163)
@@ -15,7 +15,8 @@
 YYYYMMDD = datetime.datetime.today().strftime('%Y%m%d')
 
 # set OpenDAP server URL.
-URLbase="http://nomad3.ncep.noaa.gov:9090/dods/mrf/mrf"
+#URLbase="http://nomad3.ncep.noaa.gov:9090/dods/mrf/mrf"
+URLbase="http://nomad5.ncep.noaa.gov:9090/dods/nomad1-raid2/mrf/mrf"
 URL=URLbase+YYYYMMDD+'/mrf'+YYYYMMDD
 print URL+'\n'
 try:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6162
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6162&view=rev
Author: jswhit
Date: 2008年10月07日 00:47:05 +0000 (2008年10月07日)
Log Message:
-----------
remove plotsst.py from automatic tests
Modified Paths:
--------------
 trunk/toolkits/basemap/examples/run_all.py
Modified: trunk/toolkits/basemap/examples/run_all.py
===================================================================
--- trunk/toolkits/basemap/examples/run_all.py	2008年10月07日 00:46:26 UTC (rev 6161)
+++ trunk/toolkits/basemap/examples/run_all.py	2008年10月07日 00:47:05 UTC (rev 6162)
@@ -5,6 +5,7 @@
 test_files.remove('testgdal.py')
 test_files.remove('pnganim.py')
 test_files.remove('geos_demo_2.py')
+test_files.remove('plotsst.py')
 print test_files
 py_path = os.environ.get('PYTHONPATH')
 if py_path is None:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 6160
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6160&view=rev
Author: jswhit
Date: 2008年10月07日 00:38:35 +0000 (2008年10月07日)
Log Message:
-----------
fix pickling
Modified Paths:
--------------
 trunk/toolkits/basemap/setup.py
Modified: trunk/toolkits/basemap/setup.py
===================================================================
--- trunk/toolkits/basemap/setup.py	2008年10月06日 19:18:09 UTC (rev 6159)
+++ trunk/toolkits/basemap/setup.py	2008年10月07日 00:38:35 UTC (rev 6160)
@@ -81,15 +81,19 @@
 package_dirs = {'':'lib'}
 extensions = [Extension("mpl_toolkits.basemap._proj",deps+['src/_proj.c'],include_dirs = ['src'],)]
 extensions.append(Extension("mpl_toolkits.basemap._geod",deps+['src/_geod.c'],include_dirs = ['src'],))
+# can't install _geoslib in mpl_toolkits.basemap namespace,
+# or Basemap objects won't be pickleable.
 if sys.platform == 'win32': 
 # don't use runtime_library_dirs on windows (workaround
 # for a distutils bug - http://bugs.python.org/issue2437).
- extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ #extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ extensions.append(Extension("_geoslib",['src/_geoslib.c'],
 library_dirs=geos_library_dirs,
 include_dirs=geos_include_dirs,
 libraries=['geos_c','geos']))
 else:
- extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ #extensions.append(Extension("mpl_toolkits.basemap._geoslib",['src/_geoslib.c'],
+ extensions.append(Extension("_geoslib",['src/_geoslib.c'],
 library_dirs=geos_library_dirs,
 runtime_library_dirs=geos_library_dirs,
 include_dirs=geos_include_dirs,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.