SF.net SVN: matplotlib: [4535] trunk/py4science

2007-12-01 Thread jswhit
Revision: 4535
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4535&view=rev
Author:   jswhit
Date: 2007-12-01 05:59:01 -0800 (Sat, 01 Dec 2007)

Log Message:
---
update basemap examples for version 0.9.8

Modified Paths:
--
trunk/py4science/examples/basemap1.py
trunk/py4science/examples/basemap2.py
trunk/py4science/examples/basemap3.py
trunk/py4science/examples/basemap4.py
trunk/py4science/examples/basemap5.py
trunk/py4science/examples/skel/basemap1_skel.py
trunk/py4science/examples/skel/basemap2_skel.py
trunk/py4science/examples/skel/basemap3_skel.py
trunk/py4science/examples/skel/basemap4_skel.py
trunk/py4science/examples/skel/basemap5_skel.py
trunk/py4science/workbook/basemap.tex

Modified: trunk/py4science/examples/basemap1.py
===
--- trunk/py4science/examples/basemap1.py   2007-11-30 20:06:59 UTC (rev 
4534)
+++ trunk/py4science/examples/basemap1.py   2007-12-01 13:59:01 UTC (rev 
4535)
@@ -2,9 +2,7 @@
 from matplotlib.toolkits.basemap import Basemap
 
 # create figure.
-# background color will be used for 'wet' areas.
 fig = pylab.figure()
-fig.add_axes([0.1,0.1,0.8,0.8],axisbg='aqua')
 # create map by specifying lat/lon values at corners.
 resolution = 'l'
 projection = 'lcc'
@@ -18,8 +16,10 @@
 resolution=resolution,projection=projection)
 # draw coastlines. Make liness a little thinner than default.
 m.drawcoastlines(linewidth=0.5)
-# fill continents.
-m.fillcontinents(color='coral')
+# background fill color will show ocean areas.
+m.drawmapboundary(fill_color='aqua')
+# fill continents, lakes within continents.
+m.fillcontinents(color='coral',lake_color='aqua')
 # draw states and countries.
 m.drawcountries()
 m.drawstates()

Modified: trunk/py4science/examples/basemap2.py
===
--- trunk/py4science/examples/basemap2.py   2007-11-30 20:06:59 UTC (rev 
4534)
+++ trunk/py4science/examples/basemap2.py   2007-12-01 13:59:01 UTC (rev 
4535)
@@ -2,9 +2,7 @@
 from matplotlib.toolkits.basemap import Basemap
 
 # create figure.
-# background color will be used for 'wet' areas.
 fig = pylab.figure()
-fig.add_axes([0.1,0.1,0.8,0.8],axisbg='aqua')
 # create map by specifying width and height in km.
 resolution = 'l'
 projection = 'lcc'
@@ -15,11 +13,9 @@
 m = Basemap(lon_0=lon_0,lat_0=lat_0,\
 width=width,height=height,\
 resolution=resolution,projection=projection)
-# draw coastlines.
 m.drawcoastlines(linewidth=0.5)
-# fill continents.
-m.fillcontinents(color='coral')
-# draw states and countries.
+m.drawmapboundary(fill_color='aqua')
+m.fillcontinents(color='coral',lake_color='aqua')
 m.drawcountries()
 m.drawstates()
 pylab.title('map region specified using width and height')

Modified: trunk/py4science/examples/basemap3.py
===
--- trunk/py4science/examples/basemap3.py   2007-11-30 20:06:59 UTC (rev 
4534)
+++ trunk/py4science/examples/basemap3.py   2007-12-01 13:59:01 UTC (rev 
4535)
@@ -2,9 +2,7 @@
 from matplotlib.toolkits.basemap import Basemap
 
 # create figure.
-# background color will be used for 'wet' areas.
 fig = pylab.figure()
-fig.add_axes([0.1,0.1,0.8,0.8],axisbg='aqua')
 # create map by specifying width and height in km.
 resolution = 'l'
 lon_0 = -50
@@ -37,7 +35,8 @@
 pylab.text(lon_x-10,lon_y+10,'London',fontsize=12,\
color='k',horizontalalignment='right',fontweight='bold')
 m.drawcoastlines(linewidth=0.5)
-m.fillcontinents(color='coral')
+m.drawmapboundary(fill_color='aqua')
+m.fillcontinents(color='coral',lake_color='aqua')
 m.drawcountries()
 m.drawstates()
 pylab.title('NY to London Great Circle')

Modified: trunk/py4science/examples/basemap4.py
===
--- trunk/py4science/examples/basemap4.py   2007-11-30 20:06:59 UTC (rev 
4534)
+++ trunk/py4science/examples/basemap4.py   2007-12-01 13:59:01 UTC (rev 
4535)
@@ -1,9 +1,7 @@
 import pylab, numpy
 from matplotlib.toolkits.basemap import Basemap
 # create figure.
-# background color will be used for 'wet' areas.
 fig = pylab.figure()
-fig.add_axes([0.1,0.1,0.8,0.8],axisbg='aqua')
 # create map by specifying width and height in km.
 resolution = 'l'
 lon_0 = -50
@@ -15,7 +13,8 @@
 width=width,height=height,\
 resolution=resolution,projection=projection)
 m.drawcoastlines(linewidth=0.5)
-m.fillcontinents(color='coral')
+m.drawmapboundary(fill_color='aqua')
+m.fillcontinents(color='coral',lake_color='aqua')
 m.drawcountries()
 m.drawstates()
 # label meridians where they intersect the left, right and bottom

Modified: trunk/py4science/examples/basemap5.py
===
--- trunk/py4science/examples/basemap5.py   2007-11-30 20:06:59 UTC (rev 

SF.net SVN: matplotlib: [4537] trunk/matplotlib/examples/data_helper.py

2007-12-01 Thread astraw
Revision: 4537
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4537&view=rev
Author:   astraw
Date: 2007-12-01 12:12:05 -0800 (Sat, 01 Dec 2007)

Log Message:
---
Fix loading of AAPL data in get_two_stock_data()

Modified Paths:
--
trunk/matplotlib/examples/data_helper.py

Modified: trunk/matplotlib/examples/data_helper.py
===
--- trunk/matplotlib/examples/data_helper.py2007-12-01 14:37:44 UTC (rev 
4536)
+++ trunk/matplotlib/examples/data_helper.py2007-12-01 20:12:05 UTC (rev 
4537)
@@ -15,7 +15,7 @@
 M1 = resize(M1, (M1.shape[0]/2,2) )
 
 M2 = fromstring( file('data/%s.dat' % ticker2, 'rb').read(), 'http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4538] trunk/py4science/classes/0712_ncar_agenda. txt

2007-12-01 Thread fer_perez
Revision: 4538
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4538&view=rev
Author:   fer_perez
Date: 2007-12-01 13:29:49 -0800 (Sat, 01 Dec 2007)

Log Message:
---
Agenda updates

Modified Paths:
--
trunk/py4science/classes/0712_ncar_agenda.txt

Modified: trunk/py4science/classes/0712_ncar_agenda.txt
===
--- trunk/py4science/classes/0712_ncar_agenda.txt   2007-12-01 20:12:05 UTC 
(rev 4537)
+++ trunk/py4science/classes/0712_ncar_agenda.txt   2007-12-01 21:29:49 UTC 
(rev 4538)
@@ -51,11 +51,15 @@
   - matplotlib (latex, etc).
   - Modules: import/reload, PYTHONPATH.
 
+- Urllib Yahoo finance demo.
+  
 ToDo: Add numerical error measure of trapezoid rule.
 
 ToDo Add in workflow comparison with scipy's integration. compare timing and
 eror.
 
+ToDo: write cheat-sheet.
+
 1045:1100 --- Coffee break ---
 
 
@@ -86,8 +90,8 @@
 
 1500:1700: Optional material (there's a Christmas party)
 
-Web-based data sources, tabular data and record arrays, illustrated with Yahoo
-Finance scraping, or PyDAP/OpenDAP.
+PyDAP/OpenDAP
+PyTables
 
 
 Day 2 (Saturday December 8)
@@ -114,32 +118,19 @@
  
 1200:1300 --- Lunch break ---
 
-1300:1500 Menu of options:
+1300:1330: JDH - SVN workflow, contributing to the workbook.  (optional 
mailing list
+  subscription)
 
-* Data fitting/smoothing: least squares, cubic splines, polynomial fitting.
-Basic linear algebra (30 min).
+1330:1400: JDH - Type along data smoothing, convolutions, scipy.filter
 
-* Bessel functions: special functions library, array manipulations to check
-recursion relation (30 min).
+1400:1430: FP - Basic data fitting, scipy.optimize
 
-* Descriptive statistics, statistical distributions (1 hr).
+1430:1500: FP - Sage intro/demo.
 
-* SVD/eigenfaces (1 hr).
+1500:1515 - Wrapup.
 
-* Logistic map (1 hr).
 
-* Sage intro/demo (20-30 min).
 
-* Beautiful soup: screen-scraping HTML for data extraction (30 min).
-
-* Word frequencies: use of dictionaries and text processing (20 min).
-
-* Prime numbers: the Sieve of Erathostenes.  Illustrates lists and sets (30
-  min).
-  
-* Wallis' pi: arbitrary precision integers (30 min).
-
-
 Unused examples and exercises, extra ideas
 ==
 
@@ -153,3 +144,21 @@
 
 * Extended precision root finding: manually implement newton's method using
   clnum or mpfr.
+
+* Bessel functions: special functions library, array manipulations to check
+recursion relation (30 min).
+
+* Descriptive statistics, statistical distributions (1 hr).
+
+* SVD/eigenfaces (1 hr).
+
+* Logistic map (1 hr).
+
+* Beautiful soup: screen-scraping HTML for data extraction (30 min).
+
+* Word frequencies: use of dictionaries and text processing (20 min).
+
+* Prime numbers: the Sieve of Erathostenes.  Illustrates lists and sets (30
+  min).
+  
+* Wallis' pi: arbitrary precision integers (30 min).


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4539] trunk/py4science/workbook/problems_skel/

2007-12-01 Thread fer_perez
Revision: 4539
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4539&view=rev
Author:   fer_perez
Date: 2007-12-01 23:44:51 -0800 (Sat, 01 Dec 2007)

Log Message:
---
Partial commit, I have a bit of a mess here...

Added Paths:
---
trunk/py4science/workbook/problems_skel/

Copied: trunk/py4science/workbook/problems_skel (from rev 4538, 
trunk/py4science/workbook/examples_skel)


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins


SF.net SVN: matplotlib: [4540] trunk/py4science/workbook/examples_skel/

2007-12-01 Thread fer_perez
Revision: 4540
  http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4540&view=rev
Author:   fer_perez
Date: 2007-12-01 23:45:41 -0800 (Sat, 01 Dec 2007)

Log Message:
---
Renaming dirs to avoid conflicts in doc merge

Removed Paths:
-
trunk/py4science/workbook/examples_skel/


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

-
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell.  From the desktop to the data center, Linux is going
mainstream.  Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
___
Matplotlib-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/matplotlib-checkins