Changeset 4061 for anuga_core/source

Timestamp:

Dec 6, 2006, 12:40:09 PM (18 years ago)

Author:

duncan

Message:

So tests pass

Location:

anuga_core/source/anuga/geospatial_data

Files:

• geospatial_data.py (modified) (2 diffs)
• test_geospatial_data.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
 
         
@@ -720 +719 @@
     dic['points'] = [[1.0,2.0],[3.0,5.0]]
     dic['attributelist']['elevation'] = [[7.0,5.0]
-    """    
+    """
+    
+    from anuga.shallow_water.data_manager import Exposure_csv
     csv =Exposure_csv(file_name)
     

anuga_core/source/anuga/geospatial_data/test_geospatial_data.py

@@ -643 +643 @@
         os.remove(FN)
         
-    def test_loadcsv(self):
+    def not_test_loadcsv(self):
         """
         comma delimited
         """
         fileName = tempfile.mktemp(".csv")
+        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=',')
+        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("elevation  , speed \n\
@@ -653 +671 @@
 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=',')