Changeset 7854

Timestamp:

Jun 17, 2010, 4:48:21 PM (15 years ago)

Author:

James Hudson

Message:

Fixed Windows Interpolate nonexistent verbose flag.

Location:

trunk/anuga_core/source/anuga

Files:

• file/csv_file.py (modified) (4 diffs)
• fit_interpolate/interpolate.py (modified) (1 diff)
• utilities/log.py (modified) (1 diff)

trunk/anuga_core/source/anuga/file/csv_file.py

@@ -15 +15 @@
 
 
-def load_csv_as_dict(file_name, title_check_list=None, delimiter=','):
+def load_csv_as_dict(file_name, title_check_list=None, delimiter=',',
+                        d_type = str):
     """
     Load in the csv as a dictionary, title as key and column info as value.
@@ -26 +27 @@
 
     delimiter is the delimiter used to separate the fields
+    
+    format is one of float, str, int
 
     return 2 dictionaries: ({key:column}, {title:index}).
@@ -35 +38 @@
 
     # FIXME(Ole): Consider dealing with files without headers
-    # FIXME(Ole): Consider a wrapper automatically converting text fields
-    #             to the right type by trying for: int, float, string
     
     attribute_dic = {}
@@ -67 +68 @@
             msg += 'although there were %d headers' % title_count
             raise IOError, msg
-        for i, value in enumerate(line[:title_count]):  # skip trailing data
-            attribute_dic.setdefault(titles_stripped[i], []).append(value)
+        for i, val in enumerate(line[:title_count]):  # skip trailing data
+            attribute_dic.setdefault(titles_stripped[i], []).append(d_type(val))
 
     return attribute_dic, title_index_dic

trunk/anuga_core/source/anuga/fit_interpolate/interpolate.py

@@ -941 +941 @@
                                   ['line', 'point'],
                                   figname='points_boundary',
-                                  label=title,
-                                  verbose=verbose)
+                                  label=title)
 
             m = len(self.interpolation_points)

trunk/anuga_core/source/anuga/utilities/log.py

@@ -74 +74 @@
 
 # set _new_python to True if python version 2.5 or later
-_new_python = (sys.version_info >= 0x02050000)      # 2.5.x.x
+_new_python = (sys.version_info[0]*10 + sys.version_info[1] >= 25)      # 2.5.x.x