Changeset 4745

Timestamp:

Oct 4, 2007, 4:03:13 PM (16 years ago)

Author:

nick

Message:

small fix for machines without pylab installed

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (4 diffs)
• test_geospatial_data.py (modified) (3 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -1379 +1379 @@
                                      east_boundary=None,
                                      west_boundary=None,
-                                     plot_name=None,
+                                     plot_name='all_alphas',
                                      seed_num=None,
                                      cache=False,
@@ -1425 +1425 @@
     from anuga.utilities.numerical_tools import cov
     from Numeric import array, resize,shape,Float,zeros,take,argsort,argmin
-    from pylab import plot, ion, hold,savefig,semilogx,plotting,loglog
 
     attribute_smoothed='elevation'
@@ -1442 +1441 @@
         mesh_file='temp.msh'
 
-    if plot_name is None:
-        plot_name='alphas'
+        
         
     poly_topo = [[east_boundary,south_boundary],
@@ -1519 +1517 @@
 
         if verbose: print'cov',normal_cov[i][0],'= ',normal_cov[i][1]
-    
+
     normal_cov0=normal_cov[:,0]
     normal_cov_new=take(normal_cov,argsort(normal_cov0))
-    semilogx(normal_cov_new[:,0],normal_cov_new[:,1])
-    loglog(normal_cov_new[:,0],normal_cov_new[:,1])
-    savefig(plot_name,dpi=300)
+
+    if plot_name is not None:
+
+        from pylab import savefig,semilogx,loglog
+   
+        semilogx(normal_cov_new[:,0],normal_cov_new[:,1])
+        loglog(normal_cov_new[:,0],normal_cov_new[:,1])
+        savefig(plot_name,dpi=300)
     
     remove(mesh_file)

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -1901 +1901 @@
                                              east_boundary=5,
                                              west_boundary=-5,
-                                             plot_name='all_alphas',
+                                             plot_name=None,
                                              seed_num=100000,
                                              verbose=False)
@@ -1908 +1908 @@
         results = Geospatial_data(fileName)
         os.remove(fileName)
-        os.remove('all_alphas.png')
         
  #       print value, alpha
@@ -1918 +1917 @@
 
     #suite = unittest.makeSuite(Test_Geospatial_data, 'test_write_csv_attributes_lat_long')
-#    suite = unittest.makeSuite(Test_Geospatial_data, 'test_find_optimal_smoothing_parameter')
+    suite = unittest.makeSuite(Test_Geospatial_data, 'test_find_optimal_smoothing_parameter')
 #    suite = unittest.makeSuite(Test_Geospatial_data, 'test_split')
-    suite = unittest.makeSuite(Test_Geospatial_data, 'test')
+#    suite = unittest.makeSuite(Test_Geospatial_data, 'test')
     runner = unittest.TextTestRunner() #verbosity=2)
     runner.run(suite)