matplotlib-checkins Mailing List for matplotlib (Page 8)

Revision: 4359
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4359&view=rev
Author: jswhit
Date: 2007年11月17日 07:47:52 -0800 (2007年11月17日)
Log Message:
-----------
Ra should be bR_a
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 15:34:16 UTC (rev 4358)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 15:47:52 UTC (rev 4359)
@@ -230,9 +230,9 @@
 projparams['b'] = rsphere[0]
 except:
 if projection == 'tmerc':
- # use Ra instead of R because of obscure bug
+ # use bR_a instead of R because of obscure bug
 # in proj4 for tmerc projection.
- projparams['Ra'] = rsphere
+ projparams['bR_a'] = rsphere
 else:
 projparams['R'] = rsphere
 # set units to meters.
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py	2007年11月17日 15:34:16 UTC (rev 4358)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py	2007年11月17日 15:47:52 UTC (rev 4359)
@@ -57,7 +57,7 @@
 try:
 self.rmajor = projparams['R']
 except:
- self.rmajor = projparams['Ra']
+ self.rmajor = projparams['bR_a']
 self.rminor = self.rmajor
 if self.rmajor == self.rminor:
 self.ellipsoid = False
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4358
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4358&view=rev
Author: jswhit
Date: 2007年11月17日 07:34:16 -0800 (2007年11月17日)
Log Message:
-----------
fix full-res rivers
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_f.dat
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_f.dat
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_f.dat	2007年11月17日 15:25:15 UTC (rev 4357)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/riversmeta_f.dat	2007年11月17日 15:34:16 UTC (rev 4358)
@@ -1,32944 +1,41648 @@
--1 -1 2 74.00310 74.00760 0 16
--1 -1 8 74.00760 74.15700 16 64
--1 -1 15 74.15610 74.41170 80 120
--1 -1 9 74.15610 74.27470 200 72
--1 -1 5 74.39800 74.41170 272 40
--1 -1 9 74.27470 74.38060 312 72
--1 -1 2 74.00000 74.00050 384 16
--1 -1 7 74.00050 74.09830 400 56
--1 -1 2 74.09830 74.10060 456 16
--1 -1 14 74.09830 74.16470 472 112
--1 -1 12 74.14220 74.30610 584 96
--1 -1 9 74.20190 74.30830 680 72
--1 -1 2 74.00000 74.00530 752 16
--1 -1 5 72.94720 72.99440 768 40
--1 -1 5 72.95170 72.99810 808 40
--1 -1 2 73.06800 73.06810 848 16
--1 -1 5 72.99810 73.06810 864 40
--1 -1 2 73.18390 73.18420 904 16
--1 -1 14 73.18420 73.23610 920 112
--1 -1 15 73.06780 73.20530 1032 120
--1 -1 2 72.00000 72.00360 1152 16
--1 -1 21 72.00360 72.40470 1168 168
--1 -1 7 72.48170 72.55280 1336 56
--1 -1 8 72.40470 72.48170 1392 64
--1 -1 29 72.50110 73.00080 1456 232
--1 -1 7 73.00080 73.20750 1688 56
--1 -1 11 73.17780 73.27170 1744 88
--1 -1 2 73.91250 73.91290 1832 16
--1 -1 2 73.64330 73.64360 1848 16
--1 -1 3 73.95960 73.99470 1864 24
--1 -1 7 73.84630 73.91250 1888 56
--1 -1 32 73.24810 73.65080 1944 256
--1 -1 2 73.48540 73.48610 2200 16
--1 -1 16 73.12860 73.32630 2216 128
--1 -1 8 73.48610 73.53570 2344 64
--1 -1 5 73.91290 73.95170 2408 40
--1 -1 10 73.62830 73.84500 2448 80
--1 -1 13 73.11330 73.24580 2528 104
--1 -1 2 73.95170 73.95960 2632 16
--1 -1 2 73.84500 73.84630 2648 16
--1 -1 2 73.24580 73.24810 2664 16
--1 -1 13 73.78360 74.00000 2680 104
--1 -1 9 73.32780 73.48540 2784 72
--1 -1 18 73.53690 73.78360 2856 144
--1 -1 2 73.32630 73.32780 3000 16
--1 -1 2 73.53570 73.53690 3016 16
--1 -1 2 72.00000 72.00310 3032 16
--1 -1 12 72.00000 72.25220 3048 96
--1 -1 12 72.00310 72.29780 3144 96
--1 -1 13 72.25220 72.45610 3240 104
--1 -1 15 72.29780 72.47600 3344 120
--1 -1 7 72.43470 72.56530 3464 56
--1 -1 2 72.45610 72.45650 3520 16
--1 -1 2 72.47600 72.47610 3536 16
--1 -1 2 72.56530 72.56670 3552 16
--1 -1 15 72.45650 72.76170 3568 120
--1 -1 15 72.47610 72.78190 3688 120
--1 -1 4 72.56670 72.61610 3808 32
--1 -1 16 72.50470 72.70190 3840 128
--1 -1 2 72.66440 72.70500 3968 16
--1 -1 7 72.52830 72.61670 3984 56
--1 -1 2 72.60670 72.61610 4040 16
--1 -1 2 72.76170 72.76440 4056 16
--1 -1 2 72.78190 72.78280 4072 16
--1 -1 6 72.70190 72.76500 4088 48
--1 -1 12 72.85220 72.95110 4136 96
--1 -1 16 72.75360 72.85610 4232 128
--1 -1 2 72.75560 72.75610 4360 16
--1 -1 25 72.50420 72.75560 4376 200
--1 -1 21 72.40450 72.56560 4576 168
--1 -1 2 72.40230 72.40450 4744 16
--1 -1 2 72.00000 72.00140 4760 16
--1 -1 23 72.00140 72.40230 4776 184
--1 -1 27 72.02500 72.47960 4960 216
--1 -1 2 72.02300 72.02500 5176 16
--1 -1 2 72.00000 72.00560 5192 16
--1 -1 2 72.47960 72.48250 5208 16
--1 -1 2 72.00560 72.02300 5224 16
--1 -1 11 72.47390 72.59500 5240 88
--1 -1 5 72.79110 72.89050 5328 40
--1 -1 6 72.76500 72.87280 5368 48
--1 -1 16 72.57020 72.81500 5416 128
--1 -1 16 72.54690 72.79220 5544 128
--1 -1 3 72.79470 72.80200 5672 24
--1 -1 2 72.54550 72.54690 5696 16
--1 -1 2 72.00000 72.00390 5712 16
--1 -1 2 72.56810 72.57020 5728 16
--1 -1 12 72.29110 72.56810 5744 96
--1 -1 10 72.26750 72.54550 5840 80
--1 -1 7 72.97560 73.00310 5920 56
--1 -1 8 72.86200 72.99810 5976 64
--1 -1 12 72.00000 72.29110 6040 96
--1 -1 11 72.00390 72.26750 6136 88
--1 -1 2 72.98130 72.98140 6224 16
--1 -1 2 73.11130 73.11580 6240 16
--1 -1 2 73.01190 73.01310 6256 16
--1 -1 16 73.09720 73.15750 6272 128
--1 -1 6 73.00310 73.09940 6400 48
--1 -1 2 72.99810 73.01190 6448 16
--1 -1 15 72.92450 72.98130 6464 120
--1 -1 12 72.95580 72.98030 6584 96
--1 -1 27 72.56420 73.00440 6680 216
--1 -1 25 72.66560 73.00000 6896 200
--1 -1 2 72.83330 72.84250 7096 16
--1 -1 23 72.67440 72.88550 7112 184
--1 -1 7 72.86420 72.95830 7296 56
--1 -1 4 72.92890 72.98030 7352 32
--1 -1 2 72.56380 72.56420 7384 16
--1 -1 2 72.82750 72.83330 7400 16
--1 -1 6 73.00030 73.03420 7416 48
--1 -1 10 73.00000 73.09480 7464 80
--1 -1 11 73.02640 73.11130 7544 88
--1 -1 4 73.01310 73.06500 7632 32
--1 -1 2 72.28170 72.29110 7664 16
--1 -1 10 72.55220 72.73390 7680 80
--1 -1 20 72.47670 72.91280 7760 160
--1 -1 12 72.60720 73.00220 7920 96
--1 -1 2 72.52970 72.56110 8016 16
--1 -1 7 72.50080 72.56380 8032 56
--1 -1 7 72.70110 72.82750 8088 56
--1 -1 3 72.67280 72.72970 8144 24
--1 -1 16 72.73390 72.94920 8168 128
--1 -1 4 72.91280 73.00030 8296 32
--1 -1 17 73.00030 73.17080 8328 136
--1 -1 16 73.08580 73.47950 8464 128
--1 -1 16 73.25690 73.43360 8592 128
--1 -1 3 73.00220 73.08580 8720 24
--1 -1 19 73.09750 73.37220 8744 152
--1 -1 2 73.09480 73.09750 8896 16
--1 -1 2 72.72970 72.73110 8912 16
--1 -1 2 72.93890 72.93970 8928 16
--1 -1 5 72.69610 72.72080 8944 40
--1 -1 8 72.70780 72.74030 8984 64
--1 -1 7 72.93970 73.00330 9048 56
--1 -1 3 72.67610 72.69610 9104 24
--1 -1 4 73.00330 73.06360 9128 32
--1 -1 3 73.17640 73.26250 9160 24
--1 -1 2 73.17080 73.17640 9184 16
--1 -1 4 72.44920 72.49810 9200 32
--1 -1 12 72.41060 72.46250 9232 96
--1 -1 2 72.46200 72.46250 9328 16
--1 -1 2 73.57580 73.57610 9344 16
--1 -1 2 73.57610 73.58610 9360 16
--1 -1 17 72.45670 72.50330 9376 136
--1 -1 17 72.16780 72.48580 9512 136
--1 -1 2 72.16700 72.16780 9648 16
--1 -1 2 73.40600 73.40670 9664 16
--1 -1 12 73.40670 73.46860 9680 96
--1 -1 16 73.46860 73.57580 9776 128
--1 -1 2 72.00000 72.00530 9904 16
--1 -1 9 72.00530 72.16700 9920 72
--1 -1 40 72.12560 73.00280 9992 320
--1 -1 4 72.05060 72.12860 10312 32
--1 -1 2 73.48990 73.49030 10344 16
--1 -1 9 73.49030 73.60820 10360 72
--1 -1 6 73.61250 73.63600 10432 48
--1 -1 26 73.00280 73.40600 10480 208
--1 -1 35 72.57500 73.00640 10688 280
--1 -1 37 73.00640 73.48990 10968 296
--1 -1 16 73.63780 74.00000 11264 128
--1 -1 2 73.60820 73.60830 11392 16
--1 -1 2 73.63600 73.63780 11408 16
--1 -1 2 72.00000 72.00080 11424 16
--1 -1 12 72.00080 72.25060 11440 96
--1 -1 29 72.20780 72.44930 11536 232
--1 -1 2 72.44930 72.45000 11768 16
--1 -1 23 72.41220 72.50110 11784 184
--1 -1 4 72.47330 72.50830 11968 32
--1 -1 3 72.45420 72.47330 12000 24
--1 -1 5 72.50830 72.55890 12024 40
--1 -1 6 72.53580 72.60280 12064 48
--1 -1 2 70.00000 70.00280 12112 16
--1 -1 2 70.00000 70.00330 12128 16
--1 -1 2 70.00000 70.00560 12144 16
--1 -1 11 70.00000 70.17920 12160 88
--1 -1 11 70.00330 70.20250 12248 88
--1 -1 2 70.00560 70.01780 12336 16
--1 -1 4 70.03640 70.08310 12352 32
--1 -1 8 70.00000 70.08610 12384 64
--1 -1 6 70.00280 70.06470 12448 48
--1 -1 3 70.01780 70.03640 12496 24
--1 -1 31 70.06170 70.56670 12520 248
--1 -1 18 70.56670 71.00170 12768 144
--1 -1 2 71.76740 71.77080 12912 16
--1 -1 39 71.00170 71.72340 12928 312
--1 -1 5 71.77080 71.84860 13240 40
--1 -1 4 71.72580 71.76740 13280 32
--1 -1 7 71.84920 72.00000 13312 56
--1 -1 2 71.72340 71.72580 13368 16
--1 -1 2 71.84860 71.84920 13384 16
--1 -1 2 70.00000 70.00200 13400 16
--1 -1 38 70.62750 70.97670 13416 304
--1 -1 53 70.00200 70.65920 13720 424
--1 -1 22 70.83780 70.92390 14144 176
--1 -1 2 70.84360 70.84380 14320 16
--1 -1 9 70.82390 70.86830 14336 72
--1 -1 18 70.78890 70.90880 14408 144
--1 -1 2 70.90880 70.90890 14552 16
--1 -1 7 70.90890 71.00110 14568 56
--1 -1 2 71.65610 71.65690 14624 16
--1 -1 16 71.44580 71.65610 14640 128
--1 -1 13 71.44550 71.67920 14768 104
--1 -1 13 71.16190 71.44420 14872 104
--1 -1 30 71.00110 71.20310 14976 240
--1 -1 2 71.89030 71.89050 15216 16
--1 -1 14 71.75360 71.89030 15232 112
--1 -1 16 71.77220 71.92160 15344 128
--1 -1 12 71.65690 71.75360 15472 96
--1 -1 12 71.68220 71.77220 15568 96
--1 -1 2 71.67920 71.68220 15664 16
--1 -1 2 70.00000 70.00220 15680 16
--1 -1 15 70.82970 71.00110 15696 120
--1 -1 71 70.00220 70.82970 15816 568
--1 -1 19 71.27640 71.52780 16384 152
--1 -1 24 71.52920 71.99610 16536 192
--1 -1 25 71.52890 71.89860 16728 200
--1 -1 8 71.92310 72.00000 16928 64
--1 -1 20 71.00110 71.27640 16992 160
--1 -1 2 71.52780 71.53470 17152 16
--1 -1 2 71.92160 71.92310 17168 16
--1 -1 2 71.99610 72.00000 17184 16
--1 -1 2 70.00000 70.00390 17200 16
--1 -1 2 70.00000 70.00170 17216 16
--1 -1 6 70.81470 70.84110 17232 48
--1 -1 6 70.00000 70.02300 17280 48
--1 -1 5 70.00000 70.00580 17328 40
--1 -1 9 70.84110 71.00030 17368 72
--1 -1 2 71.38390 71.38550 17440 16
--1 -1 2 71.46960 71.47080 17456 16
--1 -1 6 71.00030 71.05590 17472 48
--1 -1 12 71.38550 71.44750 17520 96
--1 -1 2 71.47080 71.48060 17616 16
--1 -1 31 71.48470 71.88080 17632 248
--1 -1 10 71.87720 72.00000 17880 80
--1 -1 2 70.00000 70.00170 17960 16
--1 -1 51 70.00170 70.76000 17976 408
--1 -1 16 70.74690 71.00080 18384 128
--1 -1 4 70.12250 70.14430 18512 32
--1 -1 31 70.17670 70.81140 18544 248
--1 -1 2 70.12120 70.12250 18792 16
--1 -1 2 70.18430 70.18700 18808 16
--1 -1 30 71.00080 71.64010 18824 240
--1 -1 35 71.05890 71.38390 19064 280
--1 -1 5 71.44750 71.46960 19344 40
--1 -1 2 71.05590 71.05890 19384 16
--1 -1 2 71.44750 71.44750 19400 16
--1 -1 2 71.48060 71.48610 19416 16
--1 -1 2 70.00000 70.00390 19432 16
--1 -1 2 70.14430 70.14530 19448 16
--1 -1 6 70.00390 70.12120 19464 48
--1 -1 5 70.14530 70.18430 19512 40
--1 -1 2 71.48310 71.48330 19552 16
--1 -1 31 71.44780 71.58640 19568 248
--1 -1 24 71.64080 72.00000 19816 192
--1 -1 19 71.57890 71.77190 20008 152
--1 -1 2 71.64010 71.64080 20160 16
--1 -1 9 70.81440 71.00420 20176 72
--1 -1 7 70.35970 70.47870 20248 56
--1 -1 27 70.51190 70.81440 20304 216
--1 -1 2 70.50710 70.51190 20520 16
--1 -1 3 71.00250 71.02860 20536 24
--1 -1 30 71.05670 71.26470 20560 240
--1 -1 4 71.27670 71.30970 20800 32
--1 -1 4 71.00140 71.00640 20832 32
--1 -1 3 71.02860 71.05670 20864 24
--1 -1 2 71.26470 71.27670 20888 16
--1 -1 36 71.30970 71.48780 20904 288
--1 -1 2 70.00000 70.00450 21192 16
--1 -1 2 70.47870 70.47940 21208 16
--1 -1 12 70.24550 70.36080 21224 96
--1 -1 3 70.47940 70.50710 21320 24
--1 -1 8 70.00450 70.24550 21344 64
--1 -1 22 70.28830 70.54390 21408 176
--1 -1 2 70.54080 70.54120 21584 16
--1 -1 16 70.48670 70.54080 21600 128
--1 -1 13 70.50580 70.53720 21728 104
--1 -1 2 70.51700 70.51720 21832 16
--1 -1 28 70.51720 71.00360 21848 224
--1 -1 29 71.46560 71.99830 22072 232
--1 -1 29 71.50860 72.00000 22304 232
--1 -1 19 71.03610 71.46560 22536 152
--1 -1 21 71.03830 71.50860 22688 168
--1 -1 3 71.00360 71.03720 22856 24
--1 -1 2 71.99830 72.00000 22880 16
--1 -1 2 70.00000 70.00110 22896 16
--1 -1 9 70.34370 70.50420 22912 72
--1 -1 6 70.00000 70.16310 22984 48
--1 -1 22 70.00110 70.52900 23032 176
--1 -1 2 70.50420 70.50650 23208 16
--1 -1 2 70.16310 70.16570 23224 16
--1 -1 2 70.34200 70.34370 23240 16
--1 -1 2 70.52900 70.52920 23256 16
--1 -1 12 70.50390 70.52720 23272 96
--1 -1 6 70.16570 70.34200 23368 48
--1 -1 12 70.52920 70.57500 23416 96
--1 -1 15 70.52720 70.99780 23512 120
--1 -1 16 70.57500 71.00060 23632 128
--1 -1 11 70.99780 71.40140 23760 88
--1 -1 13 71.00060 71.39670 23848 104
--1 -1 7 70.17640 70.24220 23952 56
--1 -1 20 70.34420 70.59560 24008 160
--1 -1 17 70.00000 70.17640 24168 136
--1 -1 19 70.23640 70.39500 24304 152
--1 -1 40 70.59080 70.79220 24456 320
--1 -1 2 71.07900 71.08060 24776 16
--1 -1 2 71.28230 71.28420 24792 16
--1 -1 7 71.08060 71.16080 24808 56
--1 -1 5 71.28420 71.31770 24864 40
--1 -1 41 71.16190 71.40000 24904 328
--1 -1 4 71.40000 71.42220 25232 32
--1 -1 2 70.79220 70.79390 25264 16
--1 -1 15 70.76640 71.00280 25280 120
--1 -1 5 71.00280 71.07900 25400 40
--1 -1 12 71.13000 71.28230 25440 96
--1 -1 15 71.32080 71.51530 25536 120
--1 -1 2 71.15920 71.15940 25656 16
--1 -1 2 71.31770 71.32080 25672 16
--1 -1 2 70.00000 70.00140 25688 16
--1 -1 37 70.00000 70.62420 25704 296
--1 -1 38 70.00140 70.64380 26000 304
--1 -1 2 70.62420 70.62490 26304 16
--1 -1 2 70.64380 70.64580 26320 16
--1 -1 20 70.61610 70.80940 26336 160
--1 -1 18 70.63440 70.82750 26496 144
--1 -1 8 70.82860 70.88330 26640 64
--1 -1 4 70.97800 70.99420 26704 32
--1 -1 23 70.80530 70.99890 26736 184
--1 -1 13 70.82720 71.00530 26920 104
--1 -1 9 70.88140 70.97800 27024 72
--1 -1 2 70.99420 71.00110 27096 16
--1 -1 10 70.91610 70.94030 27112 80
--1 -1 18 70.99890 71.20390 27192 144
--1 -1 16 71.00530 71.22060 27336 128
--1 -1 34 71.00110 71.46110 27464 272
--1 -1 2 70.92050 70.92070 27736 16
--1 -1 18 70.91190 70.93330 27752 144
--1 -1 12 70.93060 70.99530 27896 96
--1 -1 23 70.61420 70.85190 27992 184
--1 -1 2 70.61810 70.61900 28176 16
--1 -1 2 70.00000 70.00280 28192 16
--1 -1 52 70.00280 70.61920 28208 416
--1 -1 2 70.00000 70.00220 28624 16
--1 -1 86 70.00220 70.68970 28640 688
--1 -1 22 70.68690 70.92000 29328 176
--1 -1 6 70.81470 70.83030 29504 48
--1 -1 11 70.86030 70.90940 29552 88
--1 -1 2 70.83030 70.83050 29640 16
--1 -1 2 70.00000 70.00280 29656 16
--1 -1 20 70.00280 70.10670 29672 160
--1 -1 4 70.12000 70.14780 29832 32
--1 -1 10 70.23110 70.43640 29864 80
--1 -1 3 70.10670 70.12000 29944 24
--1 -1 10 70.14780 70.41140 29968 80
--1 -1 4 70.22780 70.23440 30048 32
--1 -1 15 70.25830 70.45470 30080 120
--1 -1 11 70.32780 70.43940 30200 88
--1 -1 5 70.38690 70.47060 30288 40
--1 -1 2 70.00000 70.00470 30328 16
--1 -1 2 70.00000 70.00220 30344 16
--1 -1 13 70.00470 70.35390 30360 104
--1 -1 8 70.15780 70.31810 30464 64
--1 -1 10 70.00220 70.20570 30528 80
--1 -1 2 70.20570 70.20780 30608 16
--1 -1 6 70.20780 70.30970 30624 48
--1 -1 4 70.22500 70.25560 30672 32
--1 -1 14 71.64030 72.00000 30704 112
--1 -1 2 71.09850 71.09890 30816 16
--1 -1 22 71.77580 71.97670 30832 176
--1 -1 6 71.96640 71.99300 31008 48
--1 -1 10 71.09110 71.16690 31056 80
--1 -1 9 71.22500 71.27440 31136 72
--1 -1 5 71.89830 71.96640 31208 40
--1 -1 3 71.99170 72.00000 31248 24
--1 -1 2 71.21440 71.21540 31272 16
--1 -1 16 71.16060 71.22610 31288 128
--1 -1 10 71.08890 71.16420 31416 80
--1 -1 2 71.57420 71.57500 31496 16
--1 -1 18 71.43280 71.57420 31512 144
--1 -1 22 71.21540 71.47550 31656 176
--1 -1 22 71.49580 71.92500 31832 176
--1 -1 9 71.02440 71.06630 32008 72
--1 -1 13 71.49390 71.61560 32080 104
--1 -1 10 70.80080 70.99560 32184 80
--1 -1 3 70.74890 70.80080 32264 24
--1 -1 6 70.83700 71.00000 32288 48
--1 -1 8 71.00000 71.17940 32336 64
--1 -1 17 70.99560 71.11110 32400 136
--1 -1 2 71.06630 71.06640 32536 16
--1 -1 9 71.18280 71.40080 32552 72
--1 -1 4 71.51530 71.61170 32624 32
--1 -1 2 71.17940 71.18280 32656 16
--1 -1 4 68.00000 68.10330 32672 32
--1 -1 3 68.99470 69.00140 32704 24
--1 -1 6 68.99860 69.02670 32728 48
--1 -1 3 69.00140 69.01670 32776 24
--1 -1 10 69.00610 69.04420 32800 80
--1 -1 7 69.04420 69.23470 32880 56
--1 -1 6 68.87860 68.92580 32936 48
--1 -1 11 68.57800 68.72640 32984 88
--1 -1 25 68.52160 68.87860 33072 200
--1 -1 43 68.02670 68.57800 33272 344
--1 -1 3 68.00160 68.01610 33616 24
--1 -1 2 68.01610 68.02780 33640 16
--1 -1 2 69.30980 69.31140 33656 16
--1 -1 25 69.31140 69.78300 33672 200
--1 -1 2 68.51940 68.52160 33872 16
--1 -1 2 68.00050 68.00160 33888 16
--1 -1 24 68.85550 68.99970 33904 192
--1 -1 33 68.30280 68.51940 34096 264
--1 -1 3 68.97140 69.00250 34360 24
--1 -1 14 68.28420 68.38280 34384 112
--1 -1 23 68.00000 68.30280 34496 184
--1 -1 40 69.00250 69.93950 34680 320
--1 -1 23 69.34190 69.51420 35000 184
--1 -1 8 69.05170 69.07300 35184 64
--1 -1 2 68.99970 69.04220 35248 16
--1 -1 5 69.51420 69.63470 35264 40
--1 -1 4 69.04000 69.06140 35304 32
--1 -1 14 69.20000 69.36170 35336 112
--1 -1 2 68.28330 68.28420 35448 16
--1 -1 2 68.41080 68.46110 35464 16
--1 -1 15 68.00000 68.28330 35480 120
--1 -1 4 68.73080 68.76390 35600 32
--1 -1 10 68.75470 68.79800 35632 80
--1 -1 20 68.34030 68.41080 35712 160
--1 -1 14 68.79800 68.91470 35872 112
--1 -1 4 68.89970 69.00140 35984 32
--1 -1 28 69.00140 69.70970 36016 224
--1 -1 2 68.36800 68.36800 36240 16
--1 -1 25 68.36800 68.52030 36256 200
--1 -1 17 68.52030 68.69720 36456 136
--1 -1 12 69.90800 69.99970 36592 96
--1 -1 20 69.71330 69.95190 36688 160
--1 -1 2 69.70970 69.71330 36848 16
--1 -1 8 68.89330 69.00310 36864 64
--1 -1 5 68.00000 68.09920 36928 40
--1 -1 21 68.46560 68.66170 36968 168
--1 -1 11 68.53220 68.66410 37136 88
--1 -1 10 69.02830 69.23280 37224 80
--1 -1 9 69.31530 69.43310 37304 72
--1 -1 3 69.00310 69.03390 37376 24
--1 -1 2 68.66410 68.66580 37400 16
--1 -1 21 68.65440 68.71330 37416 168
--1 -1 4 68.61860 68.65440 37584 32
--1 -1 8 68.62360 68.68890 37616 64
--1 -1 3 69.68000 69.73940 37680 24
--1 -1 11 69.47700 69.68500 37704 88
--1 -1 19 68.68670 68.89300 37792 152
--1 -1 30 68.35330 68.96110 37944 240
--1 -1 2 68.89300 68.89470 38184 16
--1 -1 40 68.09450 69.00390 38200 320
--1 -1 9 69.00390 69.19690 38520 72
--1 -1 4 68.00000 68.06170 38592 32
--1 -1 2 68.00000 68.00080 38624 16
--1 -1 2 68.00000 68.00530 38640 16
--1 -1 2 68.00000 68.00580 38656 16
--1 -1 2 68.00000 68.00200 38672 16
--1 -1 3 68.00530 68.05040 38688 24
--1 -1 10 68.00580 68.24440 38712 80
--1 -1 12 68.00200 68.21640 38792 96
--1 -1 2 68.05040 68.05580 38888 16
--1 -1 9 68.00670 68.20560 38904 72
--1 -1 4 68.05580 68.21250 38976 32
--1 -1 2 69.71080 69.71280 39008 16
--1 -1 12 69.75420 69.99530 39024 96
--1 -1 21 69.71280 70.00000 39120 168
--1 -1 7 69.81970 69.87300 39288 56
--1 -1 8 69.85860 69.97530 39344 64
--1 -1 12 69.86860 69.99500 39408 96
--1 -1 4 69.97530 70.00000 39504 32
--1 -1 3 69.97560 70.00000 39536 24
--1 -1 2 69.99500 70.00000 39560 16
--1 -1 2 69.99530 70.00000 39576 16
--1 -1 4 68.83690 68.91280 39592 32
--1 -1 9 68.77330 69.00170 39624 72
--1 -1 2 68.91280 68.91840 39696 16
--1 -1 2 68.77270 68.77330 39712 16
--1 -1 2 69.26250 69.26510 39728 16
--1 -1 2 69.16220 69.16580 39744 16
--1 -1 2 69.47540 69.47800 39760 16
--1 -1 12 69.52440 69.81550 39776 96
--1 -1 5 69.19780 69.26250 39872 40
--1 -1 2 69.00170 69.02290 39912 16
--1 -1 13 69.16580 69.38970 39928 104
--1 -1 15 69.47800 69.76390 40032 120
--1 -1 19 69.64310 69.80170 40152 152
--1 -1 14 69.56280 69.75830 40304 112
--1 -1 2 69.75080 69.75420 40416 16
--1 -1 2 68.00000 68.00110 40432 16
--1 -1 2 68.83640 68.83690 40448 16
--1 -1 3 68.91840 68.99970 40464 24
--1 -1 26 68.00000 68.83640 40488 208
--1 -1 8 68.10170 68.12780 40696 64
--1 -1 26 68.00110 68.77270 40760 208
--1 -1 12 68.07690 68.10940 40968 96
--1 -1 13 69.26510 69.52390 41064 104
--1 -1 7 68.99970 69.19780 41168 56
--1 -1 6 69.02720 69.16220 41224 48
--1 -1 5 69.39470 69.47540 41272 40
--1 -1 2 69.52390 69.52440 41312 16
--1 -1 2 69.02290 69.02720 41328 16
--1 -1 2 69.38970 69.39470 41344 16
--1 -1 5 68.37140 68.42720 41360 40
--1 -1 23 68.79360 69.00220 41400 184
--1 -1 3 69.00220 69.04830 41584 24
--1 -1 15 69.33780 69.45310 41608 120
--1 -1 15 69.04830 69.33190 41728 120
--1 -1 7 69.83310 69.92790 41848 56
--1 -1 2 68.37420 68.41920 41904 16
--1 -1 2 68.37390 68.37420 41920 16
--1 -1 14 69.81440 69.91060 41936 112
--1 -1 20 69.33720 69.82170 42048 160
--1 -1 17 69.91060 69.97830 42208 136
--1 -1 2 69.92790 69.92860 42344 16
--1 -1 2 68.00000 68.00280 42360 16
--1 -1 19 68.00280 68.38780 42376 152
--1 -1 12 68.83090 68.99860 42528 96
--1 -1 4 68.99860 69.06890 42624 32
--1 -1 2 69.97700 70.00000 42656 16
--1 -1 2 69.06890 69.08780 42672 16
--1 -1 13 69.81330 69.97700 42688 104
--1 -1 2 69.81390 69.81440 42792 16
--1 -1 2 68.82830 68.83090 42808 16
--1 -1 14 68.71280 68.82830 42824 112
--1 -1 21 68.00000 68.51280 42936 168
--1 -1 21 68.29070 68.78560 43104 168
--1 -1 2 68.29060 68.29070 43272 16
--1 -1 19 68.00000 68.29060 43288 152
--1 -1 16 68.01330 68.19200 43440 128
--1 -1 2 68.00000 68.00110 43568 16
--1 -1 5 68.00000 68.01530 43584 40
--1 -1 4 68.00000 68.13060 43624 32
--1 -1 47 68.13060 69.00440 43656 376
--1 -1 2 69.12730 69.12890 44032 16
--1 -1 2 69.17030 69.17330 44048 16
--1 -1 8 69.00440 69.05610 44064 64
--1 -1 2 69.12890 69.14250 44128 16
--1 -1 53 69.17330 69.75830 44144 424
--1 -1 5 69.88890 69.95440 44568 40
--1 -1 3 69.97220 70.00000 44608 24
--1 -1 11 69.75830 69.85030 44632 88
--1 -1 3 69.85220 69.88890 44720 24
--1 -1 3 69.95440 69.97220 44744 24
--1 -1 9 69.04030 69.12730 44768 72
--1 -1 3 69.14530 69.17030 44840 24
--1 -1 2 69.04080 69.04120 44864 16
--1 -1 2 69.14250 69.14530 44880 16
--1 -1 24 69.40640 69.47110 44896 192
--1 -1 16 69.30500 69.40640 45088 128
--1 -1 19 69.44220 69.61060 45216 152
--1 -1 22 69.36310 69.45060 45368 176
--1 -1 2 69.41170 69.41170 45544 16
--1 -1 5 68.07920 68.13390 45560 40
--1 -1 2 68.07890 68.07920 45600 16
--1 -1 7 69.95860 70.00000 45616 56
--1 -1 4 69.98720 70.00000 45672 32
--1 -1 8 69.94190 69.99750 45704 64
--1 -1 36 69.60890 69.97470 45768 288
--1 -1 2 69.99550 70.00000 46056 16
--1 -1 2 69.99750 70.00000 46072 16
--1 -1 2 68.00000 68.00030 46088 16
--1 -1 2 68.13390 68.13830 46104 16
--1 -1 6 68.00030 68.07890 46120 48
--1 -1 49 68.13830 68.57580 46168 392
--1 -1 7 68.89140 68.99420 46560 56
--1 -1 20 68.39610 68.53300 46616 160
--1 -1 17 68.84890 68.97710 46776 136
--1 -1 17 69.89610 70.00000 46912 136
--1 -1 14 68.99420 69.27720 47048 112
--1 -1 2 69.93670 69.94190 47160 16
--1 -1 2 68.53300 68.53470 47176 16
--1 -1 2 68.97710 68.97920 47192 16
--1 -1 27 68.35610 68.53470 47208 216
--1 -1 2 68.97920 69.00060 47424 16
--1 -1 43 68.11280 68.54530 47440 344
--1 -1 67 69.00060 70.00000 47784 536
--1 -1 2 68.11870 68.11920 48320 16
--1 -1 9 68.00000 68.11920 48336 72
--1 -1 56 68.00310 68.61500 48408 448
--1 -1 8 68.68750 68.73560 48856 64
--1 -1 2 68.99280 69.00170 48920 16
--1 -1 2 68.99940 69.00030 48936 16
--1 -1 2 68.69690 68.69760 48952 16
--1 -1 2 68.99270 68.99280 48968 16
--1 -1 3 68.99940 69.01190 48984 24
--1 -1 7 69.00030 69.07840 49008 56
--1 -1 2 68.55190 68.55280 49064 16
--1 -1 2 68.73560 68.73720 49080 16
--1 -1 8 68.55280 68.70950 49096 64
--1 -1 45 68.70080 68.99270 49160 360
--1 -1 10 69.74720 70.00000 49520 80
--1 -1 42 69.07950 69.74720 49600 336
--1 -1 2 69.07840 69.07950 49936 16
--1 -1 2 68.00000 68.00360 49952 16
--1 -1 13 68.00360 68.08860 49968 104
--1 -1 41 68.00000 68.16080 50072 328
--1 -1 8 68.00000 68.06860 50400 64
--1 -1 2 68.00000 68.00360 50464 16
--1 -1 2 68.00000 68.00030 50480 16
--1 -1 2 68.06530 68.06610 50496 16
--1 -1 12 68.00000 68.07860 50512 96
--1 -1 2 68.00000 68.00030 50608 16
--1 -1 3 68.73240 68.80470 50624 24
--1 -1 22 68.00000 68.69500 50648 176
--1 -1 36 68.00360 69.00560 50824 288
--1 -1 2 68.80470 68.81030 51112 16
--1 -1 2 68.69500 68.70980 51128 16
--1 -1 4 69.00560 69.05550 51144 32
--1 -1 2 68.72750 68.73240 51176 16
--1 -1 5 68.81030 68.99780 51192 40
--1 -1 2 68.70980 68.72750 51232 16
--1 -1 18 69.61670 69.99830 51248 144
--1 -1 12 69.75610 70.00000 51392 96
--1 -1 18 68.99780 69.61670 51488 144
--1 -1 22 69.06030 69.75610 51632 176
--1 -1 2 69.05550 69.06030 51808 16
--1 -1 2 69.99830 70.00000 51824 16
--1 -1 2 68.00000 68.00580 51840 16
--1 -1 9 68.00580 68.29630 51856 72
--1 -1 2 68.29630 68.29750 51928 16
--1 -1 18 68.29750 68.65440 51944 144
--1 -1 28 68.55280 68.69360 52088 224
--1 -1 2 68.00000 68.00330 52312 16
--1 -1 2 68.00000 68.00330 52328 16
--1 -1 2 68.58170 68.58250 52344 16
--1 -1 58 68.00330 69.00110 52360 464
--1 -1 22 68.58250 68.75690 52824 176
--1 -1 20 68.07640 68.22560 53000 160
--1 -1 4 68.00330 68.07640 53160 32
--1 -1 21 69.65110 70.00000 53192 168
--1 -1 28 69.00110 69.65110 53360 224
--1 -1 28 69.13010 69.59190 53584 224
--1 -1 3 69.56030 69.59190 53808 24
--1 -1 27 68.59500 68.99750 53832 216
--1 -1 46 68.00000 68.59500 54048 368
--1 -1 13 68.99750 69.12440 54416 104
--1 -1 2 69.12440 69.13010 54520 16
--1 -1 2 68.00000 68.00140 54536 16
--1 -1 2 68.00000 68.00110 54552 16
--1 -1 5 68.00000 68.01190 54568 40
--1 -1 5 68.00000 68.01170 54608 40
--1 -1 2 68.00000 68.00450 54648 16
--1 -1 46 68.00450 68.34330 54664 368
--1 -1 10 68.36470 68.53060 55032 80
--1 -1 2 68.36010 68.36470 55112 16
--1 -1 2 68.31970 68.32050 55128 16
--1 -1 2 68.53060 68.53220 55144 16
--1 -1 5 68.31970 68.36010 55160 40
--1 -1 17 68.52950 68.58580 55200 136
--1 -1 3 68.60190 68.62080 55336 24
--1 -1 3 68.57000 68.60190 55360 24
--1 -1 3 68.62080 68.67170 55384 24
--1 -1 32 68.67780 69.00470 55408 256
--1 -1 51 69.02330 69.99470 55664 408
--1 -1 46 69.01810 70.00000 56072 368
--1 -1 2 69.00470 69.01810 56440 16
--1 -1 2 69.99470 70.00000 56456 16
--1 -1 17 68.00000 68.10810 56472 136
--1 -1 35 68.13440 68.24360 56608 280
--1 -1 5 68.10420 68.14560 56888 40
--1 -1 2 68.00000 68.00030 56928 16
--1 -1 2 68.22060 68.22200 56944 16
--1 -1 29 68.00000 68.25250 56960 232
--1 -1 15 68.00030 68.13500 57192 120
--1 -1 2 68.13280 68.13350 57312 16
--1 -1 34 68.12110 68.49950 57328 272
--1 -1 41 68.40140 68.77530 57600 328
--1 -1 2 68.77530 68.78250 57928 16
--1 -1 21 68.78250 69.00390 57944 168
--1 -1 10 69.37830 69.50780 58112 80
--1 -1 3 69.51920 69.54030 58192 24
--1 -1 10 69.55640 69.59720 58216 80
--1 -1 27 69.75810 69.95970 58296 216
--1 -1 30 69.00390 69.37830 58512 240
--1 -1 2 69.50780 69.51920 58752 16
--1 -1 2 69.54030 69.55780 58768 16
--1 -1 16 69.59610 69.78720 58784 128
--1 -1 8 69.95640 70.00000 58912 64
--1 -1 2 68.00000 68.00330 58976 16
--1 -1 2 68.00000 68.00780 58992 16
--1 -1 4 68.00330 68.02550 59008 32
--1 -1 3 68.59640 68.63030 59040 24
--1 -1 22 68.00780 68.42390 59064 176
--1 -1 20 68.02550 68.49020 59240 160
--1 -1 11 68.52470 68.67610 59400 88
--1 -1 2 68.63030 68.63490 59488 16
--1 -1 2 68.42390 68.42420 59504 16
--1 -1 2 68.52400 68.52470 59520 16
--1 -1 2 68.00000 68.00280 59536 16
--1 -1 2 68.59080 68.59640 59552 16
--1 -1 2 68.49020 68.49200 59568 16
--1 -1 2 68.66940 68.66990 59584 16
--1 -1 5 68.66920 68.71280 59600 40
--1 -1 23 68.63490 68.79640 59640 184
--1 -1 6 68.42420 68.59080 59824 48
--1 -1 3 68.49200 68.52400 59872 24
--1 -1 20 68.65690 68.81310 59896 160
--1 -1 42 68.00280 68.72690 60056 336
--1 -1 17 68.55390 68.66920 60392 136
--1 -1 11 68.71280 68.76800 60528 88
--1 -1 22 68.57010 68.78560 60616 176
--1 -1 2 68.55330 68.55390 60792 16
--1 -1 2 68.00000 68.00280 60808 16
--1 -1 2 68.56970 68.57010 60824 16
--1 -1 14 68.48640 68.55330 60840 112
--1 -1 15 68.50470 68.56970 60952 120
--1 -1 27 68.24280 68.51890 61072 216
--1 -1 21 68.00280 68.24810 61288 168
--1 -1 2 69.18310 69.18670 61456 16
--1 -1 20 69.26140 69.65170 61472 160
--1 -1 5 69.13890 69.26170 61632 40
--1 -1 3 69.18670 69.20110 61672 24
--1 -1 7 68.72140 68.80500 61696 56
--1 -1 10 68.72330 68.74890 61752 80
--1 -1 17 68.70050 68.79890 61832 136
--1 -1 2 68.79890 68.80010 61968 16
--1 -1 14 68.80010 68.91610 61984 112
--1 -1 21 68.56440 68.91360 62096 168
--1 -1 2 68.56310 68.56440 62264 16
--1 -1 15 68.39890 68.56310 62280 120
--1 -1 16 68.23030 68.39890 62400 128
--1 -1 2 68.23000 68.23030 62528 16
--1 -1 2 68.00000 68.00280 62544 16
--1 -1 14 68.03420 68.23000 62560 112
--1 -1 3 68.00280 68.03420 62672 24
--1 -1 2 68.00000 68.00390 62696 16
--1 -1 2 68.00000 68.00200 62712 16
--1 -1 9 68.00200 68.22200 62728 72
--1 -1 3 68.00000 68.08530 62800 24
--1 -1 8 68.00390 68.13220 62824 64
--1 -1 2 68.00000 68.00360 62888 16
--1 -1 8 68.00000 68.02030 62904 64
--1 -1 7 68.00000 68.01220 62968 56
--1 -1 9 68.00000 68.11360 63024 72
--1 -1 21 68.64890 68.98510 63096 168
--1 -1 2 68.11360 68.11440 63264 16
--1 -1 2 68.00000 68.00420 63280 16
--1 -1 2 68.98510 68.98580 63296 16
--1 -1 21 68.03360 68.13110 63312 168
--1 -1 3 68.98580 69.00030 63480 24
--1 -1 25 68.00420 68.05360 63504 200
--1 -1 7 68.97420 68.99830 63704 56
--1 -1 19 68.99830 69.03830 63760 152
--1 -1 17 69.26470 69.58310 63912 136
--1 -1 22 69.00030 69.05500 64048 176
--1 -1 2 68.00000 68.00030 64224 16
--1 -1 2 68.98440 68.98550 64240 16
--1 -1 5 68.00000 68.01000 64256 40
--1 -1 25 68.88110 68.99970 64296 200
--1 -1 28 68.87470 68.97030 64496 224
--1 -1 44 69.53330 70.00000 64720 352
--1 -1 2 69.56610 69.56630 65072 16
--1 -1 2 68.97030 68.97060 65088 16
--1 -1 19 68.95560 69.00000 65104 152
--1 -1 3 68.99050 68.99530 65256 24
--1 -1 20 68.99530 69.09610 65280 160
--1 -1 22 69.00000 69.07420 65440 176
--1 -1 2 68.99030 68.99050 65616 16
--1 -1 5 68.98750 69.00390 65632 40
--1 -1 8 68.11500 68.20360 65672 64
--1 -1 28 68.30440 68.85700 65736 224
--1 -1 23 69.21640 69.39470 65960 184
--1 -1 25 69.00390 69.21640 66144 200
--1 -1 2 68.85700 68.85860 66344 16
--1 -1 7 68.85860 69.00000 66360 56
--1 -1 8 68.00000 68.10640 66416 64
--1 -1 40 69.39030 70.00000 66480 320
--1 -1 34 69.00000 69.45360 66800 272
--1 -1 2 69.39220 69.39290 67072 16
--1 -1 12 68.44670 68.67920 67088 96
--1 -1 8 68.17720 68.44670 67184 64
--1 -1 21 68.67920 69.00330 67248 168
--1 -1 40 69.00330 70.00000 67416 320
--1 -1 7 69.63810 69.84280 67736 56
--1 -1 2 69.98190 70.00000 67792 16
--1 -1 57 68.00000 68.59200 67808 456
--1 -1 17 68.59200 68.99530 68264 136
--1 -1 2 68.99530 69.00780 68400 16
--1 -1 7 68.95000 68.97800 68416 56
--1 -1 12 68.93750 69.00330 68472 96
--1 -1 4 69.00330 69.07450 68568 32
--1 -1 10 68.13470 68.19390 68600 80
--1 -1 43 68.16780 68.28970 68680 344
--1 -1 30 69.07700 69.78670 69024 240
--1 -1 7 69.63050 69.81080 69264 56
--1 -1 4 69.69220 69.75670 69320 32
--1 -1 2 69.07450 69.07700 69352 16
--1 -1 2 68.17940 68.18100 69368 16
--1 -1 14 68.80830 68.87500 69384 112
--1 -1 38 68.00000 68.17940 69496 304
--1 -1 6 68.87500 69.00280 69800 48
--1 -1 8 69.00280 69.23280 69848 64
--1 -1 10 68.05670 68.22470 69912 80
--1 -1 7 68.80080 68.88500 69992 56
--1 -1 4 68.00000 68.05670 70048 32
--1 -1 2 68.79760 68.80080 70080 16
--1 -1 2 68.00000 68.00050 70096 16
--1 -1 2 68.00000 68.00450 70112 16
--1 -1 2 68.00000 68.00140 70128 16
--1 -1 2 68.00000 68.00390 70144 16
--1 -1 3 68.97720 69.00280 70160 24
--1 -1 6 68.90780 68.96330 70184 48
--1 -1 6 68.91080 68.99220 70232 48
--1 -1 32 68.02000 68.23420 70280 256
--1 -1 28 68.24440 68.66580 70536 224
--1 -1 5 68.63500 68.66360 70760 40
--1 -1 2 68.25530 68.26190 70800 16
--1 -1 36 68.30640 68.79760 70816 288
--1 -1 4 68.98450 69.00140 71104 32
--1 -1 42 68.00050 68.48980 71136 336
--1 -1 5 68.54470 68.69330 71472 40
--1 -1 42 68.00000 68.68450 71512 336
--1 -1 4 68.00000 68.00860 71848 32
--1 -1 11 68.00140 68.08080 71880 88
--1 -1 3 68.37060 68.39280 71968 24
--1 -1 2 68.46030 68.48110 71992 16
--1 -1 3 68.00390 68.02000 72008 24
--1 -1 2 68.23420 68.24440 72032 16
--1 -1 20 68.42470 68.63500 72048 160
--1 -1 25 68.08550 68.27700 72208 200
--1 -1 2 68.56030 68.56560 72408 16
--1 -1 13 68.60970 68.77170 72424 104
--1 -1 5 68.96470 69.00310 72528 40
--1 -1 2 68.54190 68.54470 72568 16
--1 -1 2 68.37000 68.37060 72584 16
--1 -1 2 68.45710 68.46030 72600 16
--1 -1 2 68.60860 68.60970 72616 16
--1 -1 6 69.00140 69.05000 72632 48
--1 -1 4 69.12610 69.17530 72680 32
--1 -1 2 69.00310 69.02110 72712 16
--1 -1 3 69.00280 69.02530 72728 24
--1 -1 9 69.05000 69.12610 72752 72
--1 -1 10 69.17530 69.25860 72824 80
--1 -1 2 68.48980 68.49140 72904 16
--1 -1 2 68.08080 68.08110 72920 16
--1 -1 2 68.39280 68.39690 72936 16
--1 -1 2 68.56560 68.56610 72952 16
--1 -1 4 68.49140 68.54190 72968 32
--1 -1 21 68.08110 68.37000 73000 168
--1 -1 5 68.39690 68.45710 73168 40
--1 -1 4 68.56610 68.60860 73208 32
--1 -1 60 68.32530 69.00360 73240 480
--1 -1 2 68.39210 68.39390 73720 16
--1 -1 59 69.00360 69.68390 73736 472
--1 -1 33 68.35830 68.56940 74208 264
--1 -1 21 68.36030 68.60190 74472 168
--1 -1 2 68.35570 68.36030 74640 16
--1 -1 2 69.02970 69.03030 74656 16
--1 -1 48 69.02360 69.52580 74672 384
--1 -1 9 69.54110 69.64780 75056 72
--1 -1 36 69.66310 69.87530 75128 288
--1 -1 6 69.91690 69.95060 75416 48
--1 -1 2 69.52440 69.54110 75464 16
--1 -1 3 69.64780 69.66310 75480 24
--1 -1 5 69.87530 69.91690 75504 40
--1 -1 2 68.00000 68.00330 75544 16
--1 -1 32 68.03970 68.35570 75560 256
--1 -1 26 68.74860 69.00170 75816 208
--1 -1 4 68.00330 68.03970 76024 32
--1 -1 32 68.62000 68.77470 76056 256
--1 -1 2 68.61910 68.62000 76312 16
--1 -1 21 69.00170 69.10170 76328 168
--1 -1 2 68.00000 68.00200 76496 16
--1 -1 4 68.00000 68.01140 76512 32
--1 -1 69 68.00200 68.61910 76544 552
--1 -1 31 68.32920 69.00170 77096 248
--1 -1 2 68.32740 68.32920 77344 16
--1 -1 11 69.00170 69.15420 77360 88
--1 -1 21 69.15080 69.36250 77448 168
--1 -1 3 69.31000 69.34780 77616 24
--1 -1 2 68.00000 68.00080 77640 16
--1 -1 2 68.00000 68.00280 77656 16
--1 -1 3 68.00000 68.01580 77672 24
--1 -1 13 68.00280 68.32740 77696 104
--1 -1 2 68.00000 68.01360 77800 16
--1 -1 3 68.00080 68.01580 77816 24
--1 -1 2 68.01360 68.01430 77840 16
--1 -1 3 68.01430 68.04280 77856 24
--1 -1 2 68.00000 68.00450 77880 16
--1 -1 2 68.00450 68.02430 77896 16
--1 -1 2 68.02430 68.02780 77912 16
--1 -1 2 68.02780 68.04110 77928 16
--1 -1 2 68.00000 68.00390 77944 16
--1 -1 12 68.41390 68.55970 77960 96
--1 -1 23 68.00390 68.43920 78056 184
--1 -1 3 68.33000 68.33670 78240 24
--1 -1 2 68.33660 68.33670 78264 16
--1 -1 2 68.00000 68.00330 78280 16
--1 -1 24 68.00330 68.33660 78296 192
--1 -1 2 68.00000 68.00330 78488 16
--1 -1 12 68.00330 68.06110 78504 96
--1 -1 2 68.00000 68.00110 78600 16
--1 -1 2 68.03450 68.03520 78616 16
--1 -1 3 68.00000 68.03450 78632 24
--1 -1 19 68.00110 68.26560 78656 152
--1 -1 15 68.26560 68.40420 78808 120
--1 -1 22 66.36750 66.51140 78928 176
--1 -1 6 66.31560 66.36580 79104 48
--1 -1 23 66.57530 67.00330 79152 184
--1 -1 15 66.44280 66.55300 79336 120
--1 -1 25 66.14800 66.35360 79456 200
--1 -1 5 67.00330 67.07440 79656 40
--1 -1 2 66.14500 66.14800 79696 16
--1 -1 3 66.99670 67.00080 79712 24
--1 -1 5 66.93280 66.98890 79736 40
--1 -1 8 66.62030 66.80310 79776 64
--1 -1 3 66.42440 66.44060 79840 24
--1 -1 9 66.00000 66.14500 79864 72
--1 -1 11 66.93330 66.99580 79936 88
--1 -1 4 66.84440 66.93280 80024 32
--1 -1 3 66.73920 66.75860 80056 24
--1 -1 2 66.43360 66.45170 80080 16
--1 -1 9 67.56300 67.63470 80096 72
--1 -1 9 66.99580 67.11750 80168 72
--1 -1 2 67.79560 67.81280 80240 16
--1 -1 2 66.99860 67.00310 80256 16
--1 -1 15 67.00080 67.14170 80272 120
--1 -1 5 67.81280 67.89690 80392 40
--1 -1 6 66.89970 66.98700 80432 48
--1 -1 5 66.58830 66.64640 80480 40
--1 -1 15 66.04750 66.29860 80520 120
--1 -1 12 66.76210 66.99500 80640 96
--1 -1 3 66.57330 66.64140 80736 24
--1 -1 18 66.54470 66.60500 80760 144
--1 -1 7 66.00000 66.04810 80904 56
--1 -1 2 67.74210 67.74530 80960 16
--1 -1 2 67.83890 67.84110 80976 16
--1 -1 3 67.46580 67.49580 80992 24
--1 -1 8 67.84110 67.99780 81016 64
--1 -1 2 67.99780 68.00000 81080 16
--1 -1 2 66.76190 66.76210 81096 16
--1 -1 2 66.57310 66.57330 81112 16
--1 -1 26 66.04250 66.76190 81128 208
--1 -1 17 66.42690 66.57310 81336 136
--1 -1 3 66.00000 66.04250 81472 24
--1 -1 21 67.60880 67.72890 81496 168
--1 -1 26 67.34250 67.52030 81664 208
--1 -1 6 67.72890 67.78550 81872 48
--1 -1 16 67.52030 67.74110 81920 128
--1 -1 2 67.74110 67.74210 82048 16
--1 -1 33 66.00000 66.99920 82064 264
--1 -1 6 66.81120 66.99610 82328 48
--1 -1 36 66.05560 66.79140 82376 288
--1 -1 2 66.79140 66.79170 82664 16
--1 -1 51 67.16780 67.99670 82680 408
--1 -1 7 66.99610 67.16780 83088 56
--1 -1 10 67.17080 67.25440 83144 80
--1 -1 24 67.24000 67.60830 83224 192
--1 -1 39 67.35830 67.99610 83416 312
--1 -1 22 66.99920 67.34080 83728 176
--1 -1 2 67.60830 67.60880 83904 16
--1 -1 2 67.34080 67.34250 83920 16
--1 -1 2 67.99670 68.00000 83936 16
--1 -1 2 66.81030 66.81120 83952 16
--1 -1 2 66.05280 66.05560 83968 16
--1 -1 9 66.00000 66.11970 83984 72
--1 -1 3 66.79170 66.81030 84056 24
--1 -1 2 66.00000 66.05280 84080 16
--1 -1 28 66.11970 66.52280 84096 224
--1 -1 24 66.52080 66.99750 84320 192
--1 -1 2 66.49410 66.49750 84512 16
--1 -1 4 67.53440 67.60390 84528 32
--1 -1 6 66.99750 67.13470 84560 48
--1 -1 22 67.60390 67.99970 84608 176
--1 -1 26 67.13470 67.53440 84784 208
--1 -1 2 67.99970 68.00000 84992 16
--1 -1 20 66.33030 66.49410 85008 160
--1 -1 18 66.32830 66.45970 85168 144
--1 -1 8 66.76580 66.99970 85312 64
--1 -1 2 67.21060 67.21070 85376 16
--1 -1 11 67.12250 67.21440 85392 88
--1 -1 60 67.13390 67.82640 85480 480
--1 -1 7 66.99970 67.13390 85960 56
--1 -1 48 67.21070 67.99800 86016 384
--1 -1 2 67.99800 68.00000 86400 16
--1 -1 6 66.27780 66.31500 86416 48
--1 -1 3 67.62970 67.63420 86464 24
--1 -1 2 67.96000 67.98110 86488 16
--1 -1 10 67.13440 67.40610 86504 80
--1 -1 7 66.78720 66.95030 86584 56
--1 -1 2 66.95030 66.95060 86640 16
--1 -1 2 67.81500 67.81660 86656 16
--1 -1 6 67.66700 67.81500 86672 48
--1 -1 2 66.78530 66.78720 86720 16
--1 -1 25 66.85030 66.97170 86736 200
--1 -1 27 66.27110 66.78530 86936 216
--1 -1 20 66.83110 66.99530 87152 160
--1 -1 8 66.99530 67.05500 87312 64
--1 -1 32 67.08610 67.37420 87376 256
--1 -1 4 67.15280 67.20500 87632 32
--1 -1 20 67.81750 67.91330 87664 160
--1 -1 15 67.05500 67.19860 87824 120
--1 -1 5 67.78360 67.82060 87944 40
--1 -1 24 67.37280 67.66310 87984 192
--1 -1 19 67.80750 67.90920 88176 152
--1 -1 2 67.66310 67.66700 88328 16
--1 -1 17 67.01780 67.17700 88344 136
--1 -1 14 67.94640 68.00000 88480 112
--1 -1 16 67.00470 67.12970 88592 128
--1 -1 32 67.73750 67.94920 88720 256
--1 -1 2 67.09790 67.09810 88976 16
--1 -1 2 67.85050 67.85280 88992 16
--1 -1 9 67.00000 67.15830 89008 72
--1 -1 28 67.02200 67.16000 89080 224
--1 -1 2 67.15470 67.15670 89304 16
--1 -1 2 67.32200 67.32360 89320 16
--1 -1 12 67.32360 67.55870 89336 96
--1 -1 2 66.00000 66.00250 89432 16
--1 -1 2 66.00000 66.00200 89448 16
--1 -1 2 66.00000 66.00530 89464 16
--1 -1 31 66.00250 67.00560 89480 248
--1 -1 31 66.00200 67.00000 89728 248
--1 -1 5 66.00530 66.05640 89976 40
--1 -1 17 67.65860 68.00000 90016 136
--1 -1 16 67.67920 68.00000 90152 128
--1 -1 16 67.80470 68.00000 90280 128
--1 -1 6 67.87190 68.00000 90408 48
--1 -1 3 67.87170 67.88470 90456 24
--1 -1 43 67.00560 67.68000 90480 344
--1 -1 41 67.00000 67.70190 90824 328
--1 -1 3 67.29890 67.32200 91152 24
--1 -1 2 67.56000 67.58080 91176 16
--1 -1 6 67.70360 67.80470 91192 48
--1 -1 2 67.55870 67.56000 91240 16
--1 -1 15 66.00000 66.32500 91256 120
--1 -1 13 66.00000 66.30970 91376 104
--1 -1 2 66.32250 66.32310 91480 16
--1 -1 2 66.30670 66.30820 91496 16
--1 -1 2 66.00000 66.00360 91512 16
--1 -1 2 66.00000 66.00310 91528 16
--1 -1 20 66.00360 66.34060 91544 160
--1 -1 16 66.00310 66.31920 91704 128
--1 -1 6 66.00330 66.07890 91832 48
--1 -1 24 66.00000 66.42780 91880 192
--1 -1 24 66.31500 66.59360 92072 192
--1 -1 2 66.37170 66.37410 92264 16
--1 -1 18 66.37410 66.53970 92280 144
--1 -1 15 66.48440 66.56000 92424 120
--1 -1 2 66.52300 66.52550 92544 16
--1 -1 42 66.52550 66.98750 92560 336
--1 -1 2 66.98750 66.99920 92896 16
--1 -1 2 67.20530 67.20850 92912 16
--1 -1 2 67.05380 67.05420 92928 16
--1 -1 6 67.10160 67.20530 92944 48
--1 -1 21 66.99920 67.09110 92992 168
--1 -1 2 66.00000 66.00170 93160 16
--1 -1 2 66.00000 66.00280 93176 16
--1 -1 2 66.00000 66.00280 93192 16
--1 -1 14 66.00170 66.23810 93208 112
--1 -1 12 66.00280 66.27850 93320 96
--1 -1 3 66.00280 66.12390 93416 24
--1 -1 2 67.74730 67.74750 93440 16
--1 -1 2 67.50750 67.51380 93456 16
--1 -1 23 67.58220 67.79200 93472 184
--1 -1 22 67.39780 67.50750 93656 176
--1 -1 20 67.20850 67.58220 93832 160
--1 -1 7 67.05030 67.09970 93992 56
--1 -1 6 67.47220 67.48310 94048 48
--1 -1 2 67.09970 67.10160 94096 16
--1 -1 2 66.23810 66.23940 94112 16
--1 -1 2 66.27850 66.28310 94128 16
--1 -1 25 66.23940 66.61890 94144 200
--1 -1 17 66.28310 66.65810 94344 136
--1 -1 16 66.49290 66.62830 94480 128
--1 -1 19 66.54530 66.67080 94608 152
--1 -1 15 66.66690 66.78670 94760 120
--1 -1 7 67.70890 67.75360 94880 56
--1 -1 3 67.51380 67.54640 94936 24
--1 -1 2 66.49200 66.49290 94960 16
--1 -1 2 66.54190 66.54530 94976 16
--1 -1 2 66.77500 66.77700 94992 16
--1 -1 16 66.48920 66.77750 95008 128
--1 -1 33 66.52860 66.80700 95136 264
--1 -1 11 66.76550 66.82360 95400 88
--1 -1 7 66.75720 66.81190 95488 56
--1 -1 4 66.07360 66.10130 95544 32
--1 -1 2 66.18610 66.21720 95576 16
--1 -1 9 66.81000 66.89530 95592 72
--1 -1 2 66.07030 66.07360 95664 16
--1 -1 2 66.18390 66.18610 95680 16
--1 -1 2 66.00000 66.00250 95696 16
--1 -1 2 66.10130 66.10280 95712 16
--1 -1 5 66.00250 66.07030 95728 40
--1 -1 4 66.10280 66.18390 95768 32
--1 -1 3 66.31670 66.33190 95800 24
--1 -1 19 66.60310 66.96900 95824 152
--1 -1 2 66.31530 66.31670 95976 16
--1 -1 2 66.59850 66.60310 95992 16
--1 -1 2 67.21550 67.21670 96008 16
--1 -1 15 67.21670 67.55670 96024 120
--1 -1 2 66.00000 66.00530 96144 16
--1 -1 2 66.33190 66.33580 96160 16
--1 -1 2 66.96900 66.96920 96176 16
--1 -1 15 66.00530 66.31530 96192 120
--1 -1 12 66.33580 66.59850 96312 96
--1 -1 5 66.96920 67.00000 96408 40
--1 -1 2 67.13630 67.14250 96448 16
--1 -1 29 67.14250 67.39670 96464 232
--1 -1 7 67.39670 67.57750 96696 56
--1 -1 14 67.00000 67.21550 96752 112
--1 -1 11 66.83830 67.00140 96864 88
--1 -1 2 66.83270 66.83830 96952 16
--1 -1 11 67.00140 67.08610 96968 88
--1 -1 35 67.04920 67.13950 97056 280
--1 -1 2 66.00000 66.00420 97336 16
--1 -1 43 66.00420 66.83270 97352 344
--1 -1 2 66.00000 66.00750 97696 16
--1 -1 31 66.56580 66.99750 97712 248
--1 -1 30 66.52700 67.00420 97960 240
--1 -1 6 66.48580 66.58610 98200 48
--1 -1 25 66.00000 66.48580 98248 200
--1 -1 27 66.00750 66.52700 98448 216
--1 -1 20 66.48670 66.67640 98664 160
--1 -1 2 66.67640 66.67650 98824 16
--1 -1 35 66.99750 67.99780 98840 280
--1 -1 34 67.00420 68.00000 99120 272
--1 -1 2 67.99780 68.00000 99392 16
--1 -1 20 66.67650 66.99750 99408 160
--1 -1 2 67.18860 67.19110 99568 16
--1 -1 16 67.03390 67.18860 99584 128
--1 -1 10 66.99750 67.05420 99712 80
--1 -1 16 67.46190 67.72110 99792 128
--1 -1 19 67.19110 67.46190 99920 152
--1 -1 2 67.00790 67.00920 100072 16
--1 -1 25 67.00920 67.61780 100088 200
--1 -1 12 67.61780 68.00000 100288 96
--1 -1 3 66.99610 67.00110 100384 24
--1 -1 38 66.99810 67.99670 100408 304
--1 -1 2 67.00110 67.00790 100712 16
--1 -1 2 67.99670 68.00000 100728 16
--1 -1 45 67.25680 67.95580 100744 360
--1 -1 5 67.95580 67.99610 101104 40
--1 -1 2 67.99610 68.00000 101144 16
--1 -1 5 66.98610 67.00080 101160 40
--1 -1 55 67.22440 67.87470 101200 440
--1 -1 13 66.99890 67.25170 101640 104
--1 -1 17 67.00080 67.22440 101744 136
--1 -1 2 67.25170 67.25680 101880 16
--1 -1 2 66.00000 66.00250 101896 16
--1 -1 6 66.00000 66.01110 101912 48
--1 -1 9 67.85890 68.00000 101960 72
--1 -1 3 67.99440 68.00000 102032 24
--1 -1 2 67.86500 67.86540 102056 16
--1 -1 2 67.99670 68.00000 102072 16
--1 -1 2 67.56700 67.56830 102088 16
--1 -1 35 67.45500 67.57700 102104 280
--1 -1 3 67.56830 67.59450 102384 24
--1 -1 2 67.54000 67.55060 102408 16
--1 -1 27 67.20630 67.29920 102424 216
--1 -1 5 67.52670 67.56700 102640 40
--1 -1 32 67.29920 67.60170 102680 256
--1 -1 2 67.52670 67.52690 102936 16
--1 -1 2 67.59450 67.60140 102952 16
--1 -1 22 67.10470 67.17260 102968 176
--1 -1 25 67.09830 67.21940 103144 200
--1 -1 2 67.20580 67.20630 103344 16
--1 -1 2 66.00000 66.11000 103360 16
--1 -1 5 67.58420 67.60890 103376 40
--1 -1 33 67.78920 67.91030 103416 264
--1 -1 36 67.17420 67.58420 103680 288
--1 -1 18 67.60890 67.79690 103968 144
--1 -1 2 67.17260 67.17420 104112 16
--1 -1 32 66.00000 66.21780 104128 256
--1 -1 37 66.19310 66.45310 104384 296
--1 -1 2 66.98860 67.00580 104680 16
--1 -1 6 67.00580 67.17040 104696 48
--1 -1 16 67.80170 68.00000 104744 128
--1 -1 2 67.82050 67.82060 104872 16
--1 -1 2 66.38350 66.38360 104888 16
--1 -1 39 66.00000 66.38830 104904 312
--1 -1 9 66.81860 66.96080 105216 72
--1 -1 23 66.54170 66.81860 105288 184
--1 -1 17 67.28530 67.36890 105472 136
--1 -1 5 67.26890 67.33110 105608 40
--1 -1 24 67.17250 67.37420 105648 192
--1 -1 17 67.00140 67.26890 105840 136
--1 -1 2 67.17040 67.17250 105976 16
--1 -1 2 66.54810 66.54830 105992 16
--1 -1 27 66.53280 66.60830 106008 216
--1 -1 43 66.58470 66.66420 106224 344
--1 -1 4 67.88310 67.91330 106568 32
--1 -1 19 67.21610 67.39810 106600 152
--1 -1 35 67.72250 67.99190 106752 280
--1 -1 5 67.91330 67.99500 107032 40
--1 -1 16 67.22440 67.28530 107072 128
--1 -1 2 67.28530 67.28530 107200 16
--1 -1 2 67.99190 68.00000 107216 16
--1 -1 2 66.59660 66.59670 107232 16
--1 -1 49 66.41000 66.60750 107248 392
--1 -1 43 66.00000 66.45550 107640 344
--1 -1 30 67.62140 67.72810 107984 240
--1 -1 26 67.40000 67.65610 108224 208
--1 -1 2 67.39810 67.40000 108432 16
--1 -1 3 67.99500 68.00000 108448 24
--1 -1 33 67.70390 68.00000 108472 264
--1 -1 2 67.72810 67.72890 108736 16
--1 -1 2 67.99720 68.00000 108752 16
--1 -1 2 66.00000 66.00450 108768 16
--1 -1 33 66.15760 66.99920 108784 264
--1 -1 30 66.00450 67.00030 109048 240
--1 -1 10 66.55860 66.77390 109288 80
--1 -1 8 66.77390 66.90530 109368 64
--1 -1 4 66.97060 67.00140 109432 32
--1 -1 30 66.99920 67.99920 109464 240
--1 -1 15 67.00030 67.47110 109704 120
--1 -1 9 67.61580 68.00000 109824 72
--1 -1 4 67.00140 67.08610 109896 32
--1 -1 3 67.04170 67.12250 109928 24
--1 -1 8 67.20110 67.36610 109952 64
--1 -1 6 67.46890 67.57720 110016 48
--1 -1 4 67.87280 67.88470 110064 32
--1 -1 5 67.47110 67.61580 110096 40
--1 -1 2 67.99920 68.00000 110136 16
--1 -1 14 67.87580 67.99800 110152 112
--1 -1 2 67.99920 68.00000 110264 16
--1 -1 2 67.99800 68.00000 110280 16
--1 -1 2 67.99920 68.00000 110296 16
--1 -1 2 66.00000 66.00250 110312 16
--1 -1 2 66.15670 66.15760 110328 16
--1 -1 7 66.00000 66.15670 110344 56
--1 -1 17 66.19330 66.39500 110400 136
--1 -1 45 66.39500 66.88290 110536 360
--1 -1 8 66.91440 67.00310 110896 64
--1 -1 2 66.90980 66.91440 110960 16
--1 -1 4 67.00310 67.06170 110976 32
--1 -1 2 66.00000 66.00580 111008 16
--1 -1 2 66.88290 66.88580 111024 16
--1 -1 4 66.88580 66.90980 111040 32
--1 -1 38 66.00580 67.00220 111072 304
--1 -1 20 67.63200 68.00000 111376 160
--1 -1 4 67.00220 67.05310 111536 32
--1 -1 27 67.06470 67.63200 111568 216
--1 -1 2 67.06170 67.06470 111784 16
--1 -1 2 66.00000 66.00470 111800 16
--1 -1 10 66.00470 66.23530 111816 80
--1 -1 52 66.34360 67.00190 111896 416
--1 -1 7 66.23530 66.34360 112312 56
--1 -1 44 67.27860 67.60050 112368 352
--1 -1 10 67.47420 67.52610 112720 80
--1 -1 23 67.00190 67.27860 112800 184
--1 -1 47 67.05470 67.54140 112984 376
--1 -1 2 67.05310 67.05470 113360 16
--1 -1 2 67.02070 67.02200 113376 16
--1 -1 89 67.02200 68.00000 113392 712
--1 -1 49 67.55330 68.00000 114104 392
--1 -1 2 67.57360 67.57400 114496 16
--1 -1 55 66.13970 67.00330 114512 440
--1 -1 8 66.00000 66.13970 114952 64
--1 -1 14 67.00330 67.06830 115016 112
--1 -1 28 67.72110 67.99640 115128 224
--1 -1 2 67.99640 68.00000 115352 16
--1 -1 16 67.72530 67.91790 115368 128
--1 -1 25 67.66830 67.73280 115496 200
--1 -1 2 67.72000 67.72110 115696 16
--1 -1 2 66.00000 66.00500 115712 16
--1 -1 14 66.61050 67.00330 115728 112
--1 -1 31 66.00500 66.61080 115840 248
--1 -1 25 66.07030 66.44940 116088 200
--1 -1 2 66.06990 66.07030 116288 16
--1 -1 18 67.52640 67.64690 116304 144
--1 -1 2 67.99440 68.00000 116448 16
--1 -1 9 67.96080 68.00000 116464 72
--1 -1 24 67.93800 67.99800 116536 192
--1 -1 41 67.00330 67.52640 116728 328
--1 -1 18 67.91830 67.99440 117056 144
--1 -1 2 67.91790 67.91830 117200 16
--1 -1 2 67.99970 68.00000 117216 16
--1 -1 2 67.99800 68.00000 117232 16
--1 -1 2 66.00000 66.00250 117248 16
--1 -1 20 66.00250 66.08890 117264 160
--1 -1 26 66.33530 66.69340 117424 208
--1 -1 9 67.85780 67.97220 117632 72
--1 -1 8 67.96800 68.00000 117704 64
--1 -1 41 67.60860 67.85780 117768 328
--1 -1 4 67.97220 67.98940 118096 32
--1 -1 47 67.85110 67.97830 118128 376
--1 -1 2 67.62310 67.62330 118504 16
--1 -1 2 67.95420 67.95490 118520 16
--1 -1 2 66.69340 66.69420 118536 16
--1 -1 18 66.69420 66.87470 118552 144
--1 -1 44 66.81890 66.93110 118696 352
--1 -1 11 67.71000 67.90020 119048 88
--1 -1 2 66.82210 66.82300 119136 16
--1 -1 40 66.59170 66.82830 119152 320
--1 -1 41 66.35000 66.59970 119472 328
--1 -1 8 67.90170 68.00000 119800 64
--1 -1 2 67.90020 67.90170 119864 16
--1 -1 2 66.00000 66.00110 119880 16
--1 -1 2 66.34970 66.35000 119896 16
--1 -1 25 66.00110 66.16530 119912 200
--1 -1 58 66.18860 66.38310 120112 464
--1 -1 35 66.13080 66.54820 120576 280
--1 -1 4 66.22890 66.25360 120856 32
--1 -1 15 67.95360 68.00000 120888 120
--1 -1 2 67.98940 67.99830 121008 16
--1 -1 2 67.99830 68.00000 121024 16
--1 -1 2 66.54820 66.54830 121040 16
--1 -1 28 66.54830 67.00420 121056 224
--1 -1 2 67.53610 67.53850 121280 16
--1 -1 3 67.49360 67.53610 121296 24
--1 -1 2 67.50640 67.54480 121320 16
--1 -1 32 67.02640 67.49330 121336 256
--1 -1 2 67.00420 67.02640 121592 16
--1 -1 2 67.61860 67.61880 121608 16
--1 -1 15 67.57610 67.65280 121624 120
--1 -1 14 67.59170 67.66970 121744 112
--1 -1 14 67.53550 67.61390 121856 112
--1 -1 14 67.54690 67.63450 121968 112
--1 -1 2 67.54480 67.54690 122080 16
--1 -1 37 67.61880 67.99800 122096 296
--1 -1 31 67.63920 68.00000 122392 248
--1 -1 4 67.69890 67.78610 122640 32
--1 -1 2 67.63640 67.63920 122672 16
--1 -1 2 67.99800 68.00000 122688 16
--1 -1 2 66.00000 66.00470 122704 16
--1 -1 10 66.32580 66.48780 122720 80
--1 -1 42 66.00470 67.00670 122800 336
--1 -1 2 66.32340 66.32580 123136 16
--1 -1 21 67.00670 67.30830 123152 168
--1 -1 41 67.30830 68.00000 123320 328
--1 -1 2 66.00000 66.00200 123648 16
--1 -1 18 66.00200 66.32340 123664 144
--1 -1 2 67.78240 67.78550 123808 16
--1 -1 17 67.78140 68.00000 123824 136
--1 -1 3 66.97860 67.00310 123960 24
--1 -1 18 66.86970 66.97940 123984 144
--1 -1 2 66.86870 66.86970 124128 16
--1 -1 51 67.00310 67.78240 124144 408
--1 -1 23 66.70110 66.86870 124552 184
--1 -1 23 66.58300 66.70110 124736 184
--1 -1 2 66.58300 66.58370 124920 16
--1 -1 8 66.56610 66.58810 124936 64
--1 -1 9 66.57890 66.67440 125000 72
--1 -1 22 66.65220 66.70170 125072 176
--1 -1 2 66.66180 66.66190 125248 16
--1 -1 16 66.62940 66.74610 125264 128
--1 -1 12 66.00000 66.25720 125392 96
--1 -1 3 66.74610 66.78310 125488 24
--1 -1 2 66.25720 66.25730 125512 16
--1 -1 23 66.25730 66.58330 125528 184
--1 -1 26 66.58330 66.99640 125712 208
--1 -1 3 66.99640 67.04280 125920 24
--1 -1 6 67.04280 67.12390 125944 48
--1 -1 20 66.00000 66.48890 125992 160
--1 -1 2 66.48890 66.49040 126152 16
--1 -1 32 66.49040 66.88830 126168 256
--1 -1 15 66.88830 66.99640 126424 120
--1 -1 2 67.35950 67.36280 126544 16
--1 -1 17 66.99640 67.35950 126560 136
--1 -1 11 67.80170 68.00000 126696 88
--1 -1 19 67.21210 67.75300 126784 152
--1 -1 24 67.36280 67.80220 126936 192
--1 -1 21 66.93920 66.99830 127128 168
--1 -1 11 66.92470 66.95750 127296 88
--1 -1 7 66.99830 67.21190 127384 56
--1 -1 2 67.21190 67.21210 127440 16
--1 -1 14 66.91640 67.00080 127456 112
--1 -1 50 67.02780 67.80640 127568 400
--1 -1 11 67.00080 67.02890 127968 88
--1 -1 2 67.72720 67.72720 128056 16
--1 -1 27 67.63530 67.86580 128072 216
--1 -1 5 67.72720 67.74390 128288 40
--1 -1 18 67.89670 68.00000 128328 144
--1 -1 18 67.80530 68.00000 128472 144
--1 -1 2 67.80530 67.80560 128616 16
--1 -1 2 67.99690 68.00000 128632 16
--1 -1 40 67.51580 67.72720 128648 320
--1 -1 7 67.74440 67.82780 128968 56
--1 -1 2 67.64010 67.64080 129024 16
--1 -1 2 67.74390 67.74440 129040 16
--1 -1 2 67.95530 67.95780 129056 16
--1 -1 37 67.46420 67.95530 129072 296
--1 -1 23 67.13580 67.28580 129368 184
--1 -1 3 67.07000 67.10750 129552 24
--1 -1 6 67.04670 67.07470 129576 48
--1 -1 4 67.49560 67.57250 129624 32
--1 -1 12 67.51690 67.73190 129656 96
--1 -1 5 67.70330 67.81390 129752 40
--1 -1 7 67.83390 67.91690 129792 56
--1 -1 3 67.43440 67.46420 129848 24
--1 -1 10 67.28580 67.42970 129872 80
--1 -1 10 67.39280 67.49560 129952 80
--1 -1 20 66.80450 66.93640 130032 160
--1 -1 23 66.56360 66.85440 130192 184
--1 -1 26 66.69140 66.82360 130376 208
--1 -1 5 66.59060 66.64580 130584 40
--1 -1 13 66.53470 66.77220 130624 104
--1 -1 29 66.92110 66.99640 130728 232
--1 -1 20 66.84640 66.92110 130960 160
--1 -1 2 67.01630 67.01640 131120 16
--1 -1 3 66.99640 67.01640 131136 24
--1 -1 24 67.89640 67.99800 131160 192
--1 -1 8 67.93000 68.00000 131352 64
--1 -1 12 67.93800 67.99890 131416 96
--1 -1 2 67.99890 68.00000 131512 16
--1 -1 2 67.99800 68.00000 131528 16
--1 -1 2 67.06910 67.07110 131544 16
--1 -1 2 67.98170 67.98210 131560 16
--1 -1 33 67.07110 67.20610 131576 264
--1 -1 29 67.86310 68.00000 131840 232
--1 -1 36 67.00830 67.19670 132072 288
--1 -1 2 66.00000 66.00530 132360 16
--1 -1 2 66.00000 66.00420 132376 16
--1 -1 2 66.00000 66.00200 132392 16
--1 -1 32 66.85330 67.00060 132408 256
--1 -1 22 66.77830 66.92390 132664 176
--1 -1 10 66.87750 66.91640 132840 80
--1 -1 5 66.00000 66.02780 132920 40
--1 -1 6 66.00000 66.02470 132960 48
--1 -1 4 66.00000 66.00450 133008 32
--1 -1 2 66.77790 66.77830 133040 16
--1 -1 2 67.70360 67.70360 133056 16
--1 -1 26 67.70280 67.91140 133072 208
--1 -1 20 67.00060 67.09280 133280 160
--1 -1 22 67.89720 68.00000 133440 176
--1 -1 4 67.98210 67.99860 133616 32
--1 -1 2 67.99860 68.00000 133648 16
--1 -1 2 66.00000 66.00170 133664 16
--1 -1 2 66.00000 66.00140 133680 16
--1 -1 2 66.00000 66.00110 133696 16
--1 -1 24 66.75690 66.82420 133712 192
--1 -1 5 66.00000 66.01060 133904 40
--1 -1 4 66.00000 66.01080 133944 32
--1 -1 9 66.00000 66.02360 133976 72
--1 -1 22 66.79390 66.99690 134048 176
--1 -1 23 66.00000 66.27390 134224 184
--1 -1 2 66.27390 66.27430 134408 16
--1 -1 26 66.99690 67.36110 134424 208
--1 -1 2 67.03280 67.07550 134632 16
--1 -1 10 67.41110 67.53950 134648 80
--1 -1 12 67.53950 67.70390 134728 96
--1 -1 31 66.27430 66.46920 134824 248
--1 -1 35 66.46140 66.60190 135072 280
--1 -1 2 66.60040 66.60190 135352 16
--1 -1 32 66.58610 66.99830 135368 256
--1 -1 30 66.57750 66.87060 135624 240
--1 -1 16 66.87060 66.99940 135864 128
--1 -1 2 67.05750 67.05780 135992 16
--1 -1 11 67.72170 67.99950 136008 88
--1 -1 29 67.07830 67.53690 136096 232
--1 -1 13 66.99940 67.07580 136328 104
--1 -1 14 67.53690 67.72170 136432 112
--1 -1 13 66.99830 67.07830 136544 104
--1 -1 2 67.99950 68.00000 136648 16
--1 -1 3 66.03670 66.06830 136664 24
--1 -1 9 66.00000 66.01690 136688 72
--1 -1 38 66.04830 66.26940 136760 304
--1 -1 5 66.00670 66.03670 137064 40
--1 -1 6 66.17720 66.21000 137104 48
--1 -1 2 66.25790 66.25920 137152 16
--1 -1 34 67.05780 67.47050 137168 272
--1 -1 41 66.23640 66.44170 137440 328
--1 -1 26 66.21000 66.27190 137768 208
--1 -1 6 66.37220 66.42250 137976 48
--1 -1 5 66.41060 66.45470 138024 40
--1 -1 17 66.44170 66.57500 138064 136
--1 -1 46 66.00000 66.28890 138200 368
--1 -1 2 66.45470 66.45640 138568 16
--1 -1 10 66.47690 66.52640 138584 80
--1 -1 5 66.49970 66.53220 138664 40
--1 -1 17 66.76500 66.99640 138704 136
--1 -1 6 66.68670 66.75610 138840 48
--1 -1 2 66.57500 66.57690 138888 16
--1 -1 2 67.97700 67.97790 138904 16
--1 -1 30 67.29970 67.97700 138920 240
--1 -1 14 66.99640 67.08080 139160 112
--1 -1 20 67.08080 67.30000 139272 160
--1 -1 2 66.00000 66.00360 139432 16
--1 -1 2 66.76220 66.76500 139448 16
--1 -1 2 66.68610 66.68670 139464 16
--1 -1 18 66.43780 66.61050 139480 144
--1 -1 6 66.57690 66.61030 139624 48
--1 -1 6 66.55280 66.58300 139672 48
--1 -1 7 66.46970 66.56530 139720 56
--1 -1 6 66.41420 66.46830 139776 48
--1 -1 7 66.60720 66.68610 139824 56
--1 -1 17 66.58420 66.66330 139880 136
--1 -1 30 66.00360 66.43780 140016 240
--1 -1 8 66.32110 66.41420 140256 64
--1 -1 21 66.04670 66.30890 140320 168
--1 -1 5 66.02860 66.07030 140488 40
--1 -1 49 66.63690 66.82690 140528 392
--1 -1 2 66.82560 66.82640 140920 16
--1 -1 2 67.97790 67.99970 140936 16
--1 -1 2 67.99970 68.00000 140952 16
--1 -1 2 66.99670 67.00190 140968 16
--1 -1 5 66.98780 67.00060 140984 40
--1 -1 37 66.80860 66.99920 141024 296
--1 -1 5 66.98250 66.99920 141320 40
--1 -1 2 67.18060 67.18080 141360 16
--1 -1 25 66.99920 67.22190 141376 200
--1 -1 5 66.99890 67.01190 141576 40
--1 -1 3 66.99920 67.00390 141616 24
--1 -1 2 67.54080 67.54200 141640 16
--1 -1 29 67.41810 67.54420 141656 232
--1 -1 25 67.15640 67.41810 141888 200
--1 -1 2 66.00000 66.00030 142088 16
--1 -1 4 66.00030 66.05000 142104 32
--1 -1 33 66.05000 66.69320 142136 264
--1 -1 2 67.46640 67.46720 142400 16
--1 -1 29 67.46330 67.65220 142416 232
--1 -1 33 67.49920 67.59170 142648 264
--1 -1 48 67.57670 67.99670 142912 384
--1 -1 2 67.99670 68.00000 143296 16
--1 -1 2 66.69320 66.69440 143312 16
--1 -1 32 66.69440 67.00140 143328 256
--1 -1 4 66.98360 67.00250 143584 32
--1 -1 39 67.38920 67.99750 143616 312
--1 -1 4 67.31830 67.36750 143928 32
--1 -1 4 66.99920 67.00500 143960 32
--1 -1 43 67.00250 67.47720 143992 344
--1 -1 3 67.36750 67.38920 144336 24
--1 -1 17 67.29450 67.38920 144360 136
--1 -1 2 67.99750 68.00000 144496 16
--1 -1 2 66.00000 66.00030 144512 16
--1 -1 2 66.00000 66.00050 144528 16
--1 -1 8 66.89640 67.00110 144544 64
--1 -1 3 66.00000 66.00560 144608 24
--1 -1 13 66.00050 66.21570 144632 104
--1 -1 33 66.49530 66.89640 144736 264
--1 -1 2 66.49510 66.49530 145000 16
--1 -1 2 67.60610 67.60700 145016 16
--1 -1 2 67.58250 67.58360 145032 16
--1 -1 15 67.60700 68.00000 145048 120
--1 -1 22 67.58360 68.00000 145168 176
--1 -1 9 67.92610 68.00000 145344 72
--1 -1 5 67.98220 68.00000 145416 40
--1 -1 10 67.66450 67.85110 145456 80
--1 -1 11 67.84220 67.96440 145536 88
--1 -1 9 67.00110 67.15030 145624 72
--1 -1 34 67.16690 67.70530 145696 272
--1 -1 9 67.65250 67.72530 145968 72
--1 -1 25 67.71940 68.00000 146040 200
--1 -1 7 67.76200 67.87170 146240 56
--1 -1 2 67.15030 67.16690 146296 16
--1 -1 2 67.99720 68.00000 146312 16
--1 -1 2 66.21570 66.21830 146328 16
--1 -1 10 66.21830 66.49510 146344 80
--1 -1 28 66.46950 67.00000 146424 224
--1 -1 23 66.07920 66.46950 146648 184
--1 -...
 
[truncated message content]

Revision: 4357
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4357&view=rev
Author: jswhit
Date: 2007年11月17日 07:25:15 -0800 (2007年11月17日)
Log Message:
-----------
remove duplicate show()
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/examples/geos_demo.py
Modified: trunk/toolkits/basemap-testing/examples/geos_demo.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/geos_demo.py	2007年11月17日 15:17:30 UTC (rev 4356)
+++ trunk/toolkits/basemap-testing/examples/geos_demo.py	2007年11月17日 15:25:15 UTC (rev 4357)
@@ -32,4 +32,3 @@
 m.drawmapboundary()
 title('Geostationary Map Centered on Lon=%s, Satellite Height=%s' % (lon_0,h))
 show()
-show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4356
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4356&view=rev
Author: jswhit
Date: 2007年11月17日 07:17:30 -0800 (2007年11月17日)
Log Message:
-----------
fix orthographic bug
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 14:40:01 UTC (rev 4355)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 15:17:30 UTC (rev 4356)
@@ -766,7 +766,8 @@
 containsPole = True
 lon_0=self.projparams['lon_0']
 lat_0=self.projparams['lat_0']
- maptran = pyproj.Proj(proj='stere',lon_0=lon_0,lat_0=lat_0)
+ re = self.projparams['R']
+ maptran = pyproj.Proj(proj='stere',lon_0=lon_0,lat_0=lat_0,R=re)
 # boundary polygon for orthographic projection
 # in stereographic coorindates.
 b = self._boundarypolyll.boundary
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4351
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4351&view=rev
Author: jswhit
Date: 2007年11月17日 05:29:15 -0800 (2007年11月17日)
Log Message:
-----------
fix omerc projection parameter checking
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 13:22:47 UTC (rev 4350)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 13:29:15 UTC (rev 4351)
@@ -540,14 +540,7 @@
 projparams['lat_2'] = lat_2
 projparams['lon_2'] = lon_2
 if None in [llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat]:
- if width is None or height is None:
- raise ValueError, 'cannot specify map region with width and height keywords for this projection, please specify lat/lon values of corners'
- else:
- if lon_0 is None or lat_0 is None:
- raise ValueError, 'must specify lon_0 and lat_0 when using width, height to specify projection region'
- llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat = _choosecorners(width,height,**projparams)
- self.llcrnrlon = llcrnrlon; self.llcrnrlat = llcrnrlat
- self.urcrnrlon = urcrnrlon; self.urcrnrlat = urcrnrlat
+ raise ValueError, 'cannot specify map region with width and height keywords for this projection, please specify lat/lon values of corners'
 elif projection == 'aeqd':
 if lat_0 is None or lon_0 is None:
 raise ValueError, 'must specify lat_0 and lon_0 for Azimuthal Equidistant basemap'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4350
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4350&view=rev
Author: jswhit
Date: 2007年11月17日 05:22:47 -0800 (2007年11月17日)
Log Message:
-----------
raise exception if width, height keywords used with omerc.
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 13:08:05 UTC (rev 4349)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月17日 13:22:47 UTC (rev 4350)
@@ -541,7 +541,7 @@
 projparams['lon_2'] = lon_2
 if None in [llcrnrlon,llcrnrlat,urcrnrlon,urcrnrlat]:
 if width is None or height is None:
- raise ValueError, 'must either specify lat/lon values of corners (llcrnrlon,llcrnrlat,ucrnrlon,urcrnrlat) in degrees or width and height in meters'
+ raise ValueError, 'cannot specify map region with width and height keywords for this projection, please specify lat/lon values of corners'
 else:
 if lon_0 is None or lat_0 is None:
 raise ValueError, 'must specify lon_0 and lat_0 when using width, height to specify projection region'
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4355
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4355&view=rev
Author: jswhit
Date: 2007年11月17日 06:40:01 -0800 (2007年11月17日)
Log Message:
-----------
instructions for installing full-res data
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/README
Modified: trunk/toolkits/basemap-testing/README
===================================================================
--- trunk/toolkits/basemap-testing/README	2007年11月17日 14:10:29 UTC (rev 4354)
+++ trunk/toolkits/basemap-testing/README	2007年11月17日 14:40:01 UTC (rev 4355)
@@ -84,6 +84,10 @@
 3) cd back to the top level basemap directory (basemap-X.Y.Z) and
 run the usual 'python setup.py install'.
 
+4) if you want the full-resolution coastlines, download 
+basemap-data-fullres-X.Y.Z.tar.gz (about 70 mb), untar
+it in the top level basemap directory and run setup.py install again.
+
 **Contact**
 
 Jeff Whitaker <jef...@no...>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4354
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4354&view=rev
Author: jswhit
Date: 2007年11月17日 06:10:29 -0800 (2007年11月17日)
Log Message:
-----------
fix output of full-res rivers
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/utils/dumpbounds.sh
Modified: trunk/toolkits/basemap-testing/utils/dumpbounds.sh
===================================================================
--- trunk/toolkits/basemap-testing/utils/dumpbounds.sh	2007年11月17日 14:08:34 UTC (rev 4353)
+++ trunk/toolkits/basemap-testing/utils/dumpbounds.sh	2007年11月17日 14:10:29 UTC (rev 4354)
@@ -15,4 +15,4 @@
 pscoast -M -Dl -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_l.txt
 pscoast -M -Di -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_i.txt
 pscoast -M -Dh -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_h.txt
-pscoast -M -Dh -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_f.txt
+pscoast -M -Df -R0/360/-90/90 -Ir -JQ180/4.5i -W -A${area} > rivers_f.txt
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4353
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4353&view=rev
Author: jswhit
Date: 2007年11月17日 06:08:34 -0800 (2007年11月17日)
Log Message:
-----------
fix full-res rivers
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/rivers_f.dat
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/data/rivers_f.dat
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4352
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4352&view=rev
Author: jswhit
Date: 2007年11月17日 05:32:17 -0800 (2007年11月17日)
Log Message:
-----------
change NetCDFFile docstring.
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/pupynere.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/pupynere.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/pupynere.py	2007年11月17日 13:29:15 UTC (rev 4351)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/pupynere.py	2007年11月17日 13:32:17 UTC (rev 4352)
@@ -48,7 +48,7 @@
 
 
 class NetCDFFile(object):
- """A NetCDF file parser."""
+ """A NetCDF file reader. API is the same as Scientific.IO.NetCDF."""
 
 def __init__(self, file):
 self._buffer = open(file, 'rb')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4349
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4349&view=rev
Author: jswhit
Date: 2007年11月17日 05:08:05 -0800 (2007年11月17日)
Log Message:
-----------
plot two maps
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/examples/geos_demo.py
 trunk/toolkits/basemap-testing/examples/ortho_demo.py
Modified: trunk/toolkits/basemap-testing/examples/geos_demo.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/geos_demo.py	2007年11月17日 12:55:16 UTC (rev 4348)
+++ trunk/toolkits/basemap-testing/examples/geos_demo.py	2007年11月17日 13:08:05 UTC (rev 4349)
@@ -1,9 +1,14 @@
 from matplotlib.toolkits.basemap import Basemap
-from pylab import title, show, arange
+from pylab import title, show, arange, figure
+
 # create Basemap instance for Geostationary (satellite view) projection.
 lon_0 = float(raw_input('enter reference longitude (lon_0):'))
-h = float(raw_input('enter satellite height above equator in meters (satellite_height):'))
-m = Basemap(projection='geos',lon_0=lon_0,satellite_height=h,rsphere=(6378137.00,6356752.3142),)
+#h = float(raw_input('enter satellite height above equator in meters (satellite_height):'))
+h = 35785831.0
+
+# map with land/sea mask plotted
+fig=figure()
+m = Basemap(projection='geos',lon_0=lon_0,satellite_height=h,rsphere=(6378137.00,6356752.3142),resolution=None)
 # plot land-sea mask.
 rgba_land = (0,255,0,255) # land green.
 rgba_ocean = (0,0,255,255) # ocean blue.
@@ -14,4 +19,17 @@
 m.drawmeridians(arange(0.,420.,60.))
 m.drawmapboundary()
 title('Geostationary Map Centered on Lon=%s, Satellite Height=%s' % (lon_0,h))
+
+# map with continents drawn and filled.
+fig = figure()
+m = Basemap(projection='geos',lon_0=lon_0,satellite_height=h,rsphere=(6378137.00,6356752.3142),resolution='l')
+m.drawcoastlines()
+m.fillcontinents(color='coral')
+m.drawcountries()
+# draw parallels and meridians.
+m.drawparallels(arange(-90.,120.,30.))
+m.drawmeridians(arange(0.,420.,60.))
+m.drawmapboundary()
+title('Geostationary Map Centered on Lon=%s, Satellite Height=%s' % (lon_0,h))
 show()
+show()
Modified: trunk/toolkits/basemap-testing/examples/ortho_demo.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/ortho_demo.py	2007年11月17日 12:55:16 UTC (rev 4348)
+++ trunk/toolkits/basemap-testing/examples/ortho_demo.py	2007年11月17日 13:08:05 UTC (rev 4349)
@@ -1,9 +1,13 @@
 from matplotlib.toolkits.basemap import Basemap
-from pylab import title, show, arange
+from pylab import title, show, arange, figure
+
 # create Basemap instance for Orthographic (satellite view) projection.
 lon_0 = float(raw_input('enter reference longitude (lon_0):'))
 lat_0 = float(raw_input('enter reference latitude (lat_0):'))
-m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0)
+
+# map with land/sea mask plotted
+fig = figure()
+m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution=None)
 # plot land-sea mask.
 rgba_land = (0,255,0,255) # land green.
 rgba_ocean = (0,0,255,255) # ocean blue.
@@ -14,4 +18,16 @@
 m.drawmeridians(arange(0.,420.,60.))
 m.drawmapboundary()
 title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
+
+# map with continents drawn and filled.
+fig = figure()
+m = Basemap(projection='ortho',lon_0=lon_0,lat_0=lat_0,resolution='l')
+m.drawcoastlines()
+m.fillcontinents(color='coral')
+m.drawcountries()
+# draw parallels and meridians.
+m.drawparallels(arange(-90.,120.,30.))
+m.drawmeridians(arange(0.,420.,60.))
+m.drawmapboundary()
+title('Orthographic Map Centered on Lon=%s, Lat=%s' % (lon_0,lat_0))
 show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4348
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4348&view=rev
Author: jswhit
Date: 2007年11月17日 04:55:16 -0800 (2007年11月17日)
Log Message:
-----------
remove ref to pupnyere
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/examples/run_all.py
Modified: trunk/toolkits/basemap-testing/examples/run_all.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/run_all.py	2007年11月17日 12:44:52 UTC (rev 4347)
+++ trunk/toolkits/basemap-testing/examples/run_all.py	2007年11月17日 12:55:16 UTC (rev 4348)
@@ -5,7 +5,6 @@
 test_files.remove('testgdal.py')
 test_files.remove('pnganim.py')
 test_files.remove('warpimage.py')
-test_files.remove('pupynere.py')
 test_files.remove('geos_demo_2.py')
 print test_files
 py_path = os.environ.get('PYTHONPATH')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4347
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4347&view=rev
Author: mdboom
Date: 2007年11月17日 04:44:52 -0800 (2007年11月17日)
Log Message:
-----------
Bugfix: [1655313] axis label disappears when minor tick labels are hidden
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/axis.py
Modified: trunk/matplotlib/lib/matplotlib/axis.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/axis.py	2007年11月16日 21:47:17 UTC (rev 4346)
+++ trunk/matplotlib/lib/matplotlib/axis.py	2007年11月17日 12:44:52 UTC (rev 4347)
@@ -612,10 +612,10 @@
 tick.set_label2(label)
 
 tick.draw(renderer)
- if tick.label1On:
+ if tick.label1On and tick.label1.get_visible():
 extent = tick.label1.get_window_extent(renderer)
 ticklabelBoxes.append(extent)
- if tick.label2On:
+ if tick.label2On and tick.label2.get_visible():
 extent = tick.label2.get_window_extent(renderer)
 ticklabelBoxes2.append(extent)
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4346
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4346&view=rev
Author: dsdale
Date: 2007年11月16日 13:47:17 -0800 (2007年11月16日)
Log Message:
-----------
fixed version checking for traits-3
Modified Paths:
--------------
 trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py	2007年11月16日 20:29:51 UTC (rev 4345)
+++ trunk/matplotlib/setupext.py	2007年11月16日 21:47:17 UTC (rev 4346)
@@ -465,11 +465,16 @@
 print_status("enthought.traits", "unknown and incompatible version: < 2.0")
 return False
 else:
- if version.version.endswith('mpl'):
+ # traits 2 and 3 store their version strings in different places:
+ try:
+ version = version.version
+ except AttributeError:
+ version = version.__version__
+ if version.endswith('mpl'):
 print_status("enthought.traits", "matplotlib will provide")
 return True
 else:
- print_status("enthought.traits", version.version)
+ print_status("enthought.traits", version)
 return False
 except ImportError:
 if options['provide_traits']:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4345
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4345&view=rev
Author: mdboom
Date: 2007年11月16日 12:29:51 -0800 (2007年11月16日)
Log Message:
-----------
Minor speed improvement.
Modified Paths:
--------------
 branches/transforms/lib/matplotlib/transforms.py
Modified: branches/transforms/lib/matplotlib/transforms.py
===================================================================
--- branches/transforms/lib/matplotlib/transforms.py	2007年11月16日 20:17:05 UTC (rev 4344)
+++ branches/transforms/lib/matplotlib/transforms.py	2007年11月16日 20:29:51 UTC (rev 4345)
@@ -1215,8 +1215,8 @@
 def transform(self, points):
 mtx = self.get_matrix()
 if isinstance(points, MaskedArray):
- points = ma.dot(mtx[0:2, 0:2], points.transpose()) + mtx[0:2, 2:]
- return points.transpose()
+ tpoints = affine_transform(points.data, mtx)
+ return ma.MaskedArray(tpoints, mask=ma.getmask(points))
 return affine_transform(points, mtx)
 
 def transform_point(self, point):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4344
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4344&view=rev
Author: jswhit
Date: 2007年11月16日 12:17:05 -0800 (2007年11月16日)
Log Message:
-----------
fixed tmerc bug
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/Changelog
Modified: trunk/toolkits/basemap-testing/Changelog
===================================================================
--- trunk/toolkits/basemap-testing/Changelog	2007年11月16日 20:16:22 UTC (rev 4343)
+++ trunk/toolkits/basemap-testing/Changelog	2007年11月16日 20:17:05 UTC (rev 4344)
@@ -1,4 +1,8 @@
 version 0.9.7 (not yet released)
+ * fixed a bug in the 'tmerc' projection.
+ * added pure python NetCDFFile reader from Roberto De Almeida 
+ to basemap namespace
+ (from matplotlib.toolkits.basemap import NetCDFFile).
 * added support for full-resolution boundaries (will be
 a separate download). Full-res files (totaling around
 100 mb) available in SVN.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4343
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4343&view=rev
Author: jswhit
Date: 2007年11月16日 12:16:22 -0800 (2007年11月16日)
Log Message:
-----------
workarounds for an a bug in proj4 for tmerc projection.
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
 trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月16日 20:02:16 UTC (rev 4342)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/basemap.py	2007年11月16日 20:16:22 UTC (rev 4343)
@@ -229,8 +229,12 @@
 projparams['a'] = rsphere[1]
 projparams['b'] = rsphere[0]
 except:
- projparams['a'] = rsphere
- projparams['b'] = rsphere
+ if projection == 'tmerc':
+ # use Ra instead of R because of obscure bug
+ # in proj4 for tmerc projection.
+ projparams['Ra'] = rsphere
+ else:
+ projparams['R'] = rsphere
 # set units to meters.
 projparams['units']='m'
 # check for sane values of lon_0, lat_0, lat_ts, lat_1, lat_2
@@ -483,7 +487,7 @@
 self.urcrnrlon = urcrnrlon; self.urcrnrlat = urcrnrlat
 
 elif projection == 'ortho':
- if projparams['a'] != projparams['b']:
+ if not projparams.has_key('R'):
 raise ValueError, 'orthographic projection only works for perfect spheres - not ellipsoids'
 if lat_0 is None or lon_0 is None:
 raise ValueError, 'must specify lat_0 and lon_0 for Orthographic basemap'
@@ -1452,6 +1456,10 @@
 
 if self.projection in ['merc','cyl','mill','moll','robin','sinu']:
 lons = npy.arange(self.llcrnrlon,self.urcrnrlon+0.01,0.01)
+ elif self.projection in ['tmerc']:
+ lon_0 = self.projparams['lon_0']
+ # tmerc only defined within +/- 90 degrees of lon_0
+ lons = npy.arange(lon_0-90,lon_0+90.01,0.01)
 else:
 lons = npy.arange(0,360.01,0.01)
 # make sure latmax degree parallel is drawn if projection not merc or cyl or miller
Modified: trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py
===================================================================
--- trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py	2007年11月16日 20:02:16 UTC (rev 4342)
+++ trunk/toolkits/basemap-testing/lib/matplotlib/toolkits/basemap/proj.py	2007年11月16日 20:16:22 UTC (rev 4343)
@@ -54,7 +54,10 @@
 self.rmajor = projparams['a']
 self.rminor = projparams['b']
 except:
- self.rmajor = projparams['R']
+ try:
+ self.rmajor = projparams['R']
+ except:
+ self.rmajor = projparams['Ra']
 self.rminor = self.rmajor
 if self.rmajor == self.rminor:
 self.ellipsoid = False
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4342
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4342&view=rev
Author: jswhit
Date: 2007年11月16日 12:02:16 -0800 (2007年11月16日)
Log Message:
-----------
specify map with width and height 
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/examples/hires.py
Modified: trunk/toolkits/basemap-testing/examples/hires.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/hires.py	2007年11月16日 18:15:32 UTC (rev 4341)
+++ trunk/toolkits/basemap-testing/examples/hires.py	2007年11月16日 20:02:16 UTC (rev 4342)
@@ -7,8 +7,10 @@
 
 # create Basemap instance. Use 'high' resolution coastlines.
 t1 = time.clock()
-m = Basemap(llcrnrlon=-10.5,llcrnrlat=49.5,urcrnrlon=3.5,urcrnrlat=59.5,
- resolution='h',projection='tmerc',lon_0=-4,lat_0=0)
+#m = Basemap(llcrnrlon=-10.5,llcrnrlat=49.5,urcrnrlon=3.5,urcrnrlat=59.5,
+# resolution='h',projection='tmerc',lon_0=-4,lat_0=0)
+m = Basemap(width=920000,height=1100000,
+ resolution='h',projection='tmerc',lon_0=-4.2,lat_0=54.6)
 # make sure countries and rivers are loaded
 m.drawcountries()
 m.drawrivers()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4341
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4341&view=rev
Author: jdh2358
Date: 2007年11月16日 10:15:32 -0800 (2007年11月16日)
Log Message:
-----------
removed a couple of pyc files
Removed Paths:
-------------
 trunk/matplotlib/lib/enthought/traits/__init__.pyc
 trunk/matplotlib/lib/enthought/traits/ui/__init__.pyc
Deleted: trunk/matplotlib/lib/enthought/traits/__init__.pyc
===================================================================
(Binary files differ)
Deleted: trunk/matplotlib/lib/enthought/traits/ui/__init__.pyc
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4340
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4340&view=rev
Author: mdboom
Date: 2007年11月16日 09:48:05 -0800 (2007年11月16日)
Log Message:
-----------
Merged revisions 4330-4339 via svnmerge from 
http://matplotlib.svn.sf.net/svnroot/matplotlib/trunk/matplotlib
........
 r4331 | mdboom | 2007年11月16日 08:46:59 -0500 (2007年11月16日) | 2 lines
 
 Fix numerals in stixsans mode.
........
 r4336 | jdh2358 | 2007年11月16日 10:58:05 -0500 (2007年11月16日) | 2 lines
 
 fixed bug in polyfit, polyval deprecation
........
Modified Paths:
--------------
 branches/transforms/lib/matplotlib/_mathtext_data.py
 branches/transforms/lib/matplotlib/mlab.py
Property Changed:
----------------
 branches/transforms/
Property changes on: branches/transforms
___________________________________________________________________
Name: svnmerge-integrated
 - /trunk/matplotlib:1-4329
 + /trunk/matplotlib:1-4339
Modified: branches/transforms/lib/matplotlib/_mathtext_data.py
===================================================================
--- branches/transforms/lib/matplotlib/_mathtext_data.py	2007年11月16日 17:09:18 UTC (rev 4339)
+++ branches/transforms/lib/matplotlib/_mathtext_data.py	2007年11月16日 17:48:05 UTC (rev 4340)
@@ -2432,7 +2432,9 @@
 ],
 'it':
 [
- (0x0030, 0x0039, 'it', 0xe1b4), # 0-9
+ # These numerals are actually upright. We don't actually
+ # want italic numerals ever.
+ (0x0030, 0x0039, 'rm', 0x1d7e2), # 0-9
 (0x0041, 0x005a, 'it', 0x1d608), # A-Z
 (0x0061, 0x007a, 'it', 0x1d622), # a-z
 (0x0391, 0x03a9, 'it', 0xe1bf), # \Alpha-\Omega
Modified: branches/transforms/lib/matplotlib/mlab.py
===================================================================
--- branches/transforms/lib/matplotlib/mlab.py	2007年11月16日 17:09:18 UTC (rev 4339)
+++ branches/transforms/lib/matplotlib/mlab.py	2007年11月16日 17:48:05 UTC (rev 4340)
@@ -442,6 +442,7 @@
 kw = dict(rowvar=False)
 return npy.corrcoef(*args, **kw)
 
+
 def polyfit(*args, **kwargs):
 """
 def polyfit(x,y,N)
@@ -482,7 +483,7 @@
 
 """
 warnings.warn("use numpy.poyfit", DeprecationWarning)
- return npy.polyfit(*args, **kw)
+ return npy.polyfit(*args, **kwargs)
 
 
 
@@ -504,9 +505,8 @@
 
 """
 warnings.warn("use numpy.polyval", DeprecationWarning)
- return npy.polyval(*args, **kw)
+ return npy.polyval(*args, **kwargs)
 
-
 def vander(*args, **kwargs):
 """
 X = vander(x,N=None)
@@ -2262,7 +2262,8 @@
 return x
 
 class FormatInt(FormatObj):
- pass
+ def toval(self, x):
+ return x
 
 class FormatPercent(FormatFloat):
 def __init__(self, precision=4):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4339
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4339&view=rev
Author: jswhit
Date: 2007年11月16日 09:09:18 -0800 (2007年11月16日)
Log Message:
-----------
adjust projection bounds
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/examples/hires.py
Modified: trunk/toolkits/basemap-testing/examples/hires.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/hires.py	2007年11月16日 16:55:40 UTC (rev 4338)
+++ trunk/toolkits/basemap-testing/examples/hires.py	2007年11月16日 17:09:18 UTC (rev 4339)
@@ -7,8 +7,8 @@
 
 # create Basemap instance. Use 'high' resolution coastlines.
 t1 = time.clock()
-m = Basemap(llcrnrlon=-11.,llcrnrlat=49.,urcrnrlon=5.,urcrnrlat=59.,
- resolution='h',projection='tmerc',lon_0=-8,lat_0=0)
+m = Basemap(llcrnrlon=-10.5,llcrnrlat=49.5,urcrnrlon=3.5,urcrnrlat=59.5,
+ resolution='h',projection='tmerc',lon_0=-4,lat_0=0)
 # make sure countries and rivers are loaded
 m.drawcountries()
 m.drawrivers()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4338
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4338&view=rev
Author: jswhit
Date: 2007年11月16日 08:55:40 -0800 (2007年11月16日)
Log Message:
-----------
remove ireland.py example
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/MANIFEST.in
Modified: trunk/toolkits/basemap-testing/MANIFEST.in
===================================================================
--- trunk/toolkits/basemap-testing/MANIFEST.in	2007年11月16日 16:54:58 UTC (rev 4337)
+++ trunk/toolkits/basemap-testing/MANIFEST.in	2007年11月16日 16:55:40 UTC (rev 4338)
@@ -37,7 +37,6 @@
 include examples/customticks.py
 include examples/quiver_demo.py
 include examples/nytolondon.py
-include examples/ireland.py
 include examples/ortho_demo.py
 include examples/geos_demo.py
 include examples/geos_demo_2.py
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4337
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4337&view=rev
Author: jswhit
Date: 2007年11月16日 08:54:58 -0800 (2007年11月16日)
Log Message:
-----------
replace ireland.py example with hires.py
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/examples/README
 trunk/toolkits/basemap-testing/examples/hires.py
Removed Paths:
-------------
 trunk/toolkits/basemap-testing/examples/ireland.py
Modified: trunk/toolkits/basemap-testing/examples/README
===================================================================
--- trunk/toolkits/basemap-testing/examples/README	2007年11月16日 15:58:05 UTC (rev 4336)
+++ trunk/toolkits/basemap-testing/examples/README	2007年11月16日 16:54:58 UTC (rev 4337)
@@ -25,15 +25,12 @@
 
 nytolondon.py shows how to draw a great circle on a map (NY to London)
 
-hires.py illustrates the use of the optional high-resolution coastlines, by
-drawing the coastlines, political boundaries and rivers of the British Isles.
+hires.py illustrates the use of the high-resolution coastlines, by
+drawing the coastlines, political boundaries and rivers of the British
+Isles. Shows how to pickle and re-load a Basemap class instance (useful
+for high-res coastlines when you are plotting the same small map region
+many times in different scripts).
 
-ireland.py draws maps of ireland with the crude, low and intermediate
-resolution boundary datasets. Also does high res coastlines if they
-are installed. Shows how to pickle and re-load a
-Basemap class instance (useful for high-res coastlines when you are plotting
-the same small map region many times in different scripts).
-
 quiver_demo.py shows how to plot wind vectors on a map.
 
 randompoints.py demonstrates the use of scatter to plot randomly distributed
Modified: trunk/toolkits/basemap-testing/examples/hires.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/hires.py	2007年11月16日 15:58:05 UTC (rev 4336)
+++ trunk/toolkits/basemap-testing/examples/hires.py	2007年11月16日 16:54:58 UTC (rev 4337)
@@ -1,16 +1,28 @@
 from matplotlib.toolkits.basemap import Basemap
-from pylab import *
-import time
+from pylab import show, title, arange, figure, clf
+import cPickle, time
 
-# create new figure
-fig=figure()
-# background color will be used for 'wet' areas.
-fig.add_axes([0.1,0.1,0.8,0.8],axisbg='aqua')
+# create figure with aqua background (will be oceans)
+fig = figure()
+
 # create Basemap instance. Use 'high' resolution coastlines.
 t1 = time.clock()
 m = Basemap(llcrnrlon=-11.,llcrnrlat=49.,urcrnrlon=5.,urcrnrlat=59.,
- resolution='h',projection='tmerc',lon_0=-8.,lat_0=0.)
-print 'time to create instance with high-res boundaries = ',time.clock()-t1
+ resolution='h',projection='tmerc',lon_0=-8,lat_0=0)
+# make sure countries and rivers are loaded
+m.drawcountries()
+m.drawrivers()
+print time.clock()-t1,' secs to create original Basemap instance'
+
+# cPickle the class instance.
+cPickle.dump(m,open('map.pickle','wb'),-1)
+
+# clear the figure
+clf()
+ax = fig.add_axes([0.1,0.1,0.8,0.8],axisbg='aqua')
+# read cPickle back in and plot it again (should be much faster).
+t1 = time.clock()
+m2 = cPickle.load(open('map.pickle','rb'))
 # draw coastlines and fill continents.
 m.drawcoastlines()
 m.fillcontinents(color='coral')
@@ -18,6 +30,7 @@
 m.drawcountries(linewidth=1)
 # draw major rivers.
 m.drawrivers(color='b')
+print time.clock()-t1,' secs to plot using using a pickled Basemap instance'
 # draw parallels
 circles = arange(48,65,2).tolist()
 m.drawparallels(circles,labels=[1,1,0,0])
Deleted: trunk/toolkits/basemap-testing/examples/ireland.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/ireland.py	2007年11月16日 15:58:05 UTC (rev 4336)
+++ trunk/toolkits/basemap-testing/examples/ireland.py	2007年11月16日 16:54:58 UTC (rev 4337)
@@ -1,144 +0,0 @@
-from matplotlib.toolkits.basemap import Basemap, basemap_datadir
-from pylab import show, title, arange, figure, draw, ion, ioff, clf
-import cPickle, time, sys, os
-
-# turn interactive mode on.
-ion()
-# create new figure
-fig=figure()
-# create Basemap instance. Use 'crude' resolution coastlines.
-m = Basemap(llcrnrlon=-11.,llcrnrlat=50.5,urcrnrlon=-5.,urcrnrlat=56.,
- resolution='c',projection='tmerc',lon_0=-8.,lat_0=0.)
-# draw coastlines and fill continents.
-m.drawcoastlines()
-m.fillcontinents()
-# draw political boundaries.
-m.drawcountries()
-# draw parallels
-circles = arange(50,60,1).tolist()
-m.drawparallels(circles,labels=[1,1,0,0])
-# draw meridians
-meridians = arange(-12,0,1)
-m.drawmeridians(meridians,labels=[0,0,1,1])
-print 'plotting with crude res boundaries ...'
-title("Crude Res Boundaries ('c')",y=1.05)
-draw()
-time.sleep(5)
-
-# create new figure
-#fig=figure()
-clf()
-# create Basemap instance. Use 'low' resolution coastlines.
-m = Basemap(llcrnrlon=-11.,llcrnrlat=50.5,urcrnrlon=-5.,urcrnrlat=56.,
- resolution='l',projection='tmerc',lon_0=-8.,lat_0=0.)
-# draw coastlines and fill continents.
-m.drawcoastlines()
-m.fillcontinents()
-# draw political boundaries.
-m.drawcountries()
-# draw parallels
-m.drawparallels(circles,labels=[1,1,0,0])
-# draw meridians
-m.drawmeridians(meridians,labels=[0,0,1,1])
-print 'plotting with low res boundaries ...'
-title("Low Res Boundaries ('l')",y=1.05)
-draw()
-time.sleep(5)
-
-t1 = time.clock()
-# create new figure
-#fig=figure()
-clf()
-print 'plotting with intermediate res boundaries ...'
-# create Basemap instance. Use 'intermediate' resolution coastlines.
-m = Basemap(llcrnrlon=-11.,llcrnrlat=50.5,urcrnrlon=-5.,urcrnrlat=56.,
- resolution='i',projection='tmerc',lon_0=-8.,lat_0=0.)
-print time.clock()-t1,'seconds to create class instance with intermediate res coastlines'
-# cPickle the class instance.
-cPickle.dump(m,open('map.pickle','wb'),-1)
-# draw coastlines and fill continents.
-m.drawcoastlines()
-m.fillcontinents()
-# draw political boundaries.
-m.drawcountries()
-# draw parallels
-m.drawparallels(circles,labels=[1,1,0,0])
-# draw meridians
-m.drawmeridians(meridians,labels=[0,0,1,1])
-title("Intermediate Res Boundaries ('i')",y=1.05)
-draw()
-time.sleep(5)
-
-# create new figure
-#fig=figure()
-clf()
-# read cPickle back in and plot it again (should be much faster).
-t1 = time.clock()
-m2 = cPickle.load(open('map.pickle','rb'))
-print time.clock()-t1,' to read the intermediate res coastline class instance back in from a cPickle'
-# draw coastlines and fill continents.
-m2.drawcoastlines()
-m2.fillcontinents()
-# draw political boundaries.
-m2.drawcountries(linewidth=1.0)
-# draw major rivers.
-m2.drawrivers(color='b')
-# draw parallels
-m2.drawparallels(circles,labels=[1,1,0,0])
-# draw meridians
-m2.drawmeridians(meridians,labels=[0,0,1,1])
-print 'plotting with intermediate res boundaries from a saved pickle ...'
-title("Intermediate Res Boundaries ('i') with major rivers",y=1.05)
-draw()
-time.sleep(5)
-# only do high-res coastlines if they are installed, otherwise stop here.
-if not os.path.isfile(os.path.join(basemap_datadir,'gshhs_h.dat')):
- sys.exit(0)
-
-import time
-t1 = time.clock()
-# create new figure
-#fig=figure()
-clf()
-print 'plotting with high res boundaries ...'
-# create Basemap instance. Use 'high' resolution coastlines.
-m = Basemap(llcrnrlon=-11.,llcrnrlat=50.5,urcrnrlon=-5.,urcrnrlat=56.,
- resolution='h',projection='tmerc',lon_0=-8.,lat_0=0.)
-print time.clock()-t1,'seconds to create class instance with high res coastlines'
-# cPickle the class instance.
-cPickle.dump(m,open('map.pickle','wb'),-1)
-# draw coastlines and fill continents.
-m.drawcoastlines()
-m.fillcontinents()
-# draw political boundaries.
-m.drawcountries()
-# draw parallels
-m.drawparallels(circles,labels=[1,1,0,0])
-# draw meridians
-m.drawmeridians(meridians,labels=[0,0,1,1])
-title("High Res Boundaries ('i')",y=1.05)
-draw()
-time.sleep(5)
-
-# create new figure
-#fig=figure()
-clf()
-# read cPickle back in and plot it again (should be much faster).
-t1 = time.clock()
-m2 = cPickle.load(open('map.pickle','rb'))
-print time.clock()-t1,' to read the high res coastline class instance back in from a cPickle'
-# draw coastlines and fill continents.
-m2.drawcoastlines()
-m2.fillcontinents()
-# draw political boundaries.
-m2.drawcountries(linewidth=1.0)
-# draw major rivers.
-m2.drawrivers(color='b')
-# draw parallels
-m2.drawparallels(circles,labels=[1,1,0,0])
-# draw meridians
-m2.drawmeridians(meridians,labels=[0,0,1,1])
-print 'plotting with high res boundaries from a saved pickle ...'
-title("High Res Boundaries ('i') with major rivers",y=1.05)
-ioff()
-show()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4336
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4336&view=rev
Author: jdh2358
Date: 2007年11月16日 07:58:05 -0800 (2007年11月16日)
Log Message:
-----------
fixed bug in polyfit, polyval deprecation
Modified Paths:
--------------
 trunk/matplotlib/lib/matplotlib/mlab.py
Modified: trunk/matplotlib/lib/matplotlib/mlab.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/mlab.py	2007年11月16日 15:56:34 UTC (rev 4335)
+++ trunk/matplotlib/lib/matplotlib/mlab.py	2007年11月16日 15:58:05 UTC (rev 4336)
@@ -442,6 +442,7 @@
 kw = dict(rowvar=False)
 return npy.corrcoef(*args, **kw)
 
+
 def polyfit(*args, **kwargs):
 """
 def polyfit(x,y,N)
@@ -482,7 +483,7 @@
 
 """
 warnings.warn("use numpy.poyfit", DeprecationWarning)
- return npy.polyfit(*args, **kw)
+ return npy.polyfit(*args, **kwargs)
 
 
 
@@ -504,9 +505,8 @@
 
 """
 warnings.warn("use numpy.polyval", DeprecationWarning)
- return npy.polyval(*args, **kw)
+ return npy.polyval(*args, **kwargs)
 
-
 def vander(*args, **kwargs):
 """
 X = vander(x,N=None)
@@ -2262,7 +2262,8 @@
 return x
 
 class FormatInt(FormatObj):
- pass
+ def toval(self, x):
+ return x
 
 class FormatPercent(FormatFloat):
 def __init__(self, precision=4):
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 4335
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4335&view=rev
Author: jswhit
Date: 2007年11月16日 07:56:34 -0800 (2007年11月16日)
Log Message:
-----------
remove reference to pupynere
Modified Paths:
--------------
 trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py
Modified: trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py
===================================================================
--- trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py	2007年11月16日 15:54:31 UTC (rev 4334)
+++ trunk/toolkits/basemap-testing/examples/ccsm_popgrid.py	2007年11月16日 15:56:34 UTC (rev 4335)
@@ -19,10 +19,6 @@
 locally orthogonal to each other.
 
 POP grids are used extensively locally in oceanographic and ice models.
-
-This example uses the pupynere pure-python netCDF 3 reader
-from Roberto De Almeida for reading netCDF files (included).
-
 """
 import pylab as pl
 from matplotlib import rcParams
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.