Changeset 3346

Timestamp:

Jul 18, 2006, 11:17:39 AM (19 years ago)

Author:

duncan

Message:

bug fixes

Location:

inundation/damage

Files:

• inundation_damage.py (modified) (4 diffs)
• test_inundation_damage.py (modified) (2 diffs)

inundation/damage/inundation_damage.py

@@ -40 +40 @@
                                  use_cache = True):
     """
+    This is the main function for calculating tsunami damage due to
+    inundation.  It gets the location of structures from the exposure
+    file and gets the inundation of these structures from the
+    sww file.
+
+    It then calculates the damage loss. 
     """
 
@@ -56 +62 @@
     results_dic = edm.calc_damage_and_costs(verbose_csv=True)
     for title, value in results_dic.iteritems():
-        csv.set_colum(title, value)
+        csv.set_column(title, value)
     
     # Save info back to csv file
+    if exposure_file_out == None:
+        exposure_file_out = exposure_file_in
     csv.save(exposure_file_out)
     
@@ -193 +201 @@
     def __init__(self,max_depths, shore_distances, walls,
                  struct_costs, content_costs):
-        self.max_depths = max_depths
-        self.shore_distances = shore_distances
+        self.max_depths = [float(x) for x in max_depths]
+        self.shore_distances = [float(x) for x in shore_distances]
         self.walls = walls
-        self.struct_costs = struct_costs 
-        self.content_costs = content_costs
+        self.struct_costs = [float(x) for x in struct_costs]
+        self.content_costs = [float(x) for x in content_costs]
 
         self.structure_count = len(self.max_depths)
@@ -255 +263 @@
         
     def calc_cost(self):
+        # ensure_numeric does not cut it.
         self.struct_loss = self.struct_damage * \
                            ensure_numeric(self.struct_costs)

inundation/damage/test_inundation_damage.py

@@ -141 +141 @@
 
     
-    def ztest_inundation_damage(self):
+    def test_inundation_damage(self):
+
+        # Note, this isn't testing the results,
+        # just that is all runs
         sww_file = self.domain.filename + "." + self.domain.format
         #print "sww_file",sww_file 
@@ -288 +291 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    #suite = unittest.makeSuite(Test_inundation_damage,'test_add_depth_and_momentum2csv')
-    #suite = unittest.makeSuite(Test_inundation_damage,'test_calc_damage_and_costs')
+    #suite = unittest.makeSuite(Test_inundation_damage,'test_inundation_damage')
     suite = unittest.makeSuite(Test_inundation_damage,'test')
     runner = unittest.TextTestRunner()