Changeset 4635

Timestamp:

Jul 24, 2007, 10:42:54 AM (17 years ago)

Author:

nick

Message:

fixed some changes make_plots_from_csv_files

Location:

anuga_core/source/anuga/abstract_2d_finite_volumes

Files:

• test_util.py (modified) (1 diff)
• util.py (modified) (3 diffs)

anuga_core/source/anuga/abstract_2d_finite_volumes/test_util.py

@@ -1388 +1388 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-#    suite = unittest.makeSuite(Test_Util,'test')
-    suite = unittest.makeSuite(Test_Util,'test_get_min_max_values')
+    suite = unittest.makeSuite(Test_Util,'test')
+#    suite = unittest.makeSuite(Test_Util,'test_get_min_max_values')
     runner = unittest.TextTestRunner(verbosity=0)
     runner.run(suite)

anuga_core/source/anuga/abstract_2d_finite_volumes/util.py

@@ -970 +970 @@
     line11 = line1.split(',')
 
-    try:
-        float(line11[0])
-    except:    
+    if isinstance(line11[0],str) is True:
         # We have found text in the first line
         east_index = None
@@ -999 +997 @@
         lines = lines[1:] # Remove header from data
     else:
-        # First field in first line contains a number, so there is no header. Assume that this is a simple easting, northing file
+        # No header, assume that this is a simple easting, northing file
 
         msg = 'There was no header in file %s and the number of columns is %d' %(filename, len(line11))
@@ -1902 +1900 @@
     return min1, max1
 
-def sortedDictValues(adict):
-    """Sorts a dictionary by the Keys
-    This code was authored by Alex Martelli (8/4/2001) and 
-    sourced from ASPN
-    """
-       
-    items = adict.items()
-    items.sort()
-    print 'items',items
-    return [value for key, value in items]
-    
-    
-    
-
-
-        
+    
+    
+    
+
+
+