Changeset 4178 for anuga_core/source/anuga

Timestamp:

Jan 15, 2007, 3:15:05 PM (18 years ago)

Author:

duncan

Message:

set max_read_lines to a large real when reading a csv file non blocking

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (4 diffs)
• test_geospatial_data.py (modified) (1 diff)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -3 +3 @@
 
 """
-
+from sys import maxint
 from os import access, F_OK, R_OK
 from types import DictType
@@ -592 +592 @@
             msg = '.xya format is deprecated.  Please use .txt.'
             warn(msg, DeprecationWarning)
-            #import sys; sys.exit() 
             if absolute is True:         
                 _write_xya_file(file_name,
@@ -843 +842 @@
     file_pointer = open(file_name)
     header, file_pointer = _read_csv_file_header(file_pointer)
-
-    while True:
-        try:
-            pointlist, att_dict,file_pointer  = _read_csv_file_blocking( \
+    pointlist, att_dict,file_pointer  = _read_csv_file_blocking( \
                 file_pointer,
                 header,
-                max_read_lines=MAX_READ_LINES) #FIXME: must be highest int
-        except StopIteration:
-            break
+                max_read_lines=1e30) #If the file is bigger that this, block..
         
     file_pointer.close()
@@ -1293 +1287 @@
          
 if __name__ == "__main__":
-    g = Geospatial_data("t.txt")
-    print "g.get_data_points()", g.get_data_points()
-    for i,a in enumerate(g):
-        if i >3: break 
-        print a
-    
+    pass
+    

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -651 +651 @@
     
     def test_load_csv(self):
-        # To test the mesh side of loading xya files.
-        # Not the loading of xya files
         
         import os