Changeset 4059

Timestamp:

Dec 6, 2006, 12:30:54 PM (18 years ago)

Author:

duncan

Message:

checking in, so I can checkout in another repository...

Location:

anuga_core/source/anuga

Files:

• geospatial_data/geospatial_data.py (modified) (3 diffs)
• geospatial_data/test_geospatial_data.py (modified) (2 diffs)
• shallow_water/data_manager.py (modified) (1 diff)
• shallow_water/test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/geospatial_data/geospatial_data.py

@@ -15 +15 @@
 from anuga.coordinate_transforms.geo_reference import Geo_reference, TitleError
 from anuga.coordinate_transforms.redfearn import convert_from_latlon_to_utm
+from anuga.shallow_water.data_manager import Exposure_csv
 
         
@@ -521 +522 @@
             except IOError, e:    
                 msg = 'Could not open file %s ' %file_name
+                raise IOError, msg  
+        
+        elif file_name[-4:]== ".xxx":
+            #let's do ticket#116 stuff
+            #
+            try:
+                data_points, attributes, geo_reference = _read_csv_file(file_name, verbose)
+            except IOError, e:    
+                msg = 'Could not open file %s ' %file_name
                 raise IOError, msg        
         else:      
             msg = 'Extension %s is unknown' %file_name[-4:]
             raise IOError, msg
-        
 #        print'in import data_points', data_points
 #        print'in import attributes', attributes
@@ -704 +713 @@
 
 
+def _read_csv_file(file_name, verbose = False):
+    """Read .csv file
+    
+    Return a dic of array of points, and dic of array of attribute
+    eg
+    dic['points'] = [[1.0,2.0],[3.0,5.0]]
+    dic['attributelist']['elevation'] = [[7.0,5.0]
+    """    
+
+    return pointlist, attributes, geo_reference
+
 def _read_xya_file( fd, delimiter):
     points = []

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -643 +643 @@
         os.remove(FN)
         
-    def test_loadxya(self):
+    def test_loadcsv(self):
         """
         comma delimited
         """
-        fileName = tempfile.mktemp(".xya")
+        fileName = tempfile.mktemp(".csv")
         file = open(fileName,"w")
         file.write("elevation  , speed \n\
@@ -653 +653 @@
 0.0, 1.0, 0.0, 10.0\n\
 1.0, 0.0, 10.4, 40.0\n")
+        file.close()
+        results = Geospatial_data(fileName, delimiter=',')
+        os.remove(fileName)
+#        print 'data', results.get_data_points()
+        assert allclose(results.get_data_points(), [[1.0, 0.0],[0.0, 1.0],[1.0, 0.0]])
+        assert allclose(results.get_attributes(attribute_name='elevation'), [10.0, 0.0, 10.4])
+        assert allclose(results.get_attributes(attribute_name='speed'), [0.0, 10.0, 40.0])
+
+    def test_loadxya(self):
+        """
+        comma delimited
+        """
+        fileName = tempfile.mktemp(".xya")
+        file = open(fileName,"w")
+        file.write("longitude,latitude,z \n\
+-35.3149601,150.9198238,452.688000\n\
+-35.3149791,150.9209232,459.126000\n\
+-35.3149980,150.9220226,465.613000\n")
         file.close()
         results = Geospatial_data(fileName, delimiter=',')

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -794 +794 @@
         self._load_exposure_csv(self._file_name)
         try:
+            #Have code here that handles caps or lower 
             lats = self._attribute_dic[latitude_title]
             longs = self._attribute_dic[longitude_title]

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -4398 +4398 @@
 ########## testing nbed class ##################
     def test_exposure_csv_loading(self):
-        
-
         file_name = tempfile.mktemp(".xya")
         file = open(file_name,"w")
@@ -4417 +4415 @@
         os.remove(file_name)
         
-    def test_exposure_csv_loading(self):
+    def test_exposure_csv_loadingII(self):