Changeset 4326

Timestamp:

Mar 26, 2007, 3:55:11 PM (17 years ago)

Author:

duncan

Message:

damage modelling change. Get a message quickly if the csv label is not present.

Location:

anuga_core/source/anuga

Files:

• damage_modelling/inundation_damage.py (modified) (2 diffs)
• shallow_water/data_manager.py (modified) (6 diffs)
• shallow_water/test_data_manager.py (modified) (2 diffs)

anuga_core/source/anuga/damage_modelling/inundation_damage.py

@@ -34 +34 @@
 from anuga_config import epsilon
 depth_epsilon = epsilon
+
+# Change these if the ouput from nexix changes
 SHORE_DIST_LABEL = 'SHORE_DIST'
 WALL_TYPE_LABEL = 'WALL_TYPE'
@@ -56 +58 @@
     """
 
-    csv = Exposure_csv(exposure_file_in)
+    csv = Exposure_csv(exposure_file_in,
+                       title_check_list=[SHORE_DIST_LABEL,WALL_TYPE_LABEL,
+                                         STR_VALUE_LABEL,CONT_VALUE_LABEL])
     geospatial = csv.get_location()
     geospatial = ensure_absolute(geospatial)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -750 +750 @@
 
 
-#### NED is national exposure database
+#### NED is national exposure database (name changed to NEXIS)
     
 LAT_TITLE = 'LATITUDE'
@@ -760 +760 @@
                  longitude_title=LONG_TITLE, is_x_y_locations=None,
                  x_title=X_TITLE, y_title=Y_TITLE,
-                 refine_polygon=None):
+                 refine_polygon=None, title_check_list=None):
         """
         This class is for handling the exposure csv file.
@@ -799 +799 @@
         #The values are the index positions of file columns.
         self._attribute_dic, self._title_index_dic = \
-        self._load_exposure_csv(self._file_name)
+        self._load_exposure_csv(self._file_name,
+                                title_check_list=title_check_list)
         try:
             #Have code here that handles caps or lower 
@@ -857 +858 @@
             return 1
     
-    def _load_exposure_csv(self, file_name):
+    def _load_exposure_csv(self, file_name, title_check_list=None):
         """
         Load in the csv as a dic, title as key and column info as value, .
@@ -867 +868 @@
         title_index_dic = {}
         titles_stripped = [] # list of titles
-        
         reader = csv.reader(file(file_name))
 
@@ -877 +877 @@
         title_count = len(titles_stripped)       
         #print "title_index_dic",title_index_dic
-
+        if title_check_list is not None:
+            for title_check in title_check_list:
+                #msg = "Reading error.  This row is not present ", title_check 
+                #assert title_index_dic.has_key(title_check), msg
+                if not title_index_dic.has_key(title_check):
+                    #reader.close()
+                    msg = "Reading error.  This row is not present ", \
+                          title_check                     
+                    raise IOError, msg
+                    
+        
         
         #create a dic of colum values, indexed by column title

anuga_core/source/anuga/shallow_water/test_data_manager.py

@@ -4407 +4407 @@
 114.5, -21.4, bang, 40.0\n")
         file.close()
-        exposure = Exposure_csv(file_name)
+        exposure = Exposure_csv(file_name, title_check_list = ['speed','sound'])
         exposure.get_column("sound")
        
@@ -4436 +4436 @@
         
         os.remove(file_name)
-
+        
+    def test_exposure_csv_loading_title_check_list(self):
+
+        # I can't get cvs.reader to close the exposure file
+        # The hacks below are to get around this.        
+        if sys.platform == 'win32':
+            file_name = tempfile.gettempdir() + \
+                    "test_exposure_csv_loading_title_check_list.xya"
+        else:
+            file_name = tempfile.mktemp(".xya")
+        file = open(file_name,"w")
+        file.write("LATITUDE, LONGITUDE ,sound  , speed \n\
+115.0, -21.0, splat, 0.0\n\
+114.0, -21.7, pow, 10.0\n\
+114.5, -21.4, bang, 40.0\n")
+        file.close()
+        try:
+            exposure = Exposure_csv(file_name, title_check_list = ['SOUND'])
+        except IOError:
+            pass
+        else:
+            self.failUnless(0 ==1,  'Assertion not thrown error!')
+            
+        if not sys.platform == 'win32':
+            os.remove(file_name)
+        
     def test_exposure_csv_cmp(self):
         file_name = tempfile.mktemp(".xya")