Changeset 7858 for trunk/anuga_core/source/anuga/file/csv_file.py

Timestamp:

Jun 18, 2010, 4:43:10 PM (13 years ago)

Author:

hudson

Message:

Refactorings to increase code quality, fixed missing log import from sww_interrogate.

File:

• trunk/anuga_core/source/anuga/file/csv_file.py (modified) (10 diffs)

trunk/anuga_core/source/anuga/file/csv_file.py

@@ -11 +11 @@
 """
 
+
 import csv
 import numpy as num
+import anuga.utilities.log as log
 
 
@@ -168 +170 @@
     if completed:
         try:
-            file = str(kwargs['file_name'])
+            file_name = str(kwargs['file_name'])
         except:
-            raise 'kwargs must have file_name'
+            raise Exception('kwargs must have file_name')
     else:
         # write temp file in output directory
         try:
-            file = str(kwargs['output_dir']) + 'detail_temp.csv'
+            file_name = str(kwargs['output_dir']) + 'detail_temp.csv'
         except:
-            raise 'kwargs must have output_dir'
+            raise Exception('kwargs must have output_dir')
 
     # extracts the header info and the new line info
@@ -199 +201 @@
     # try to open!
     try:
-        fid = open(file, 'r')
+        fid = open(file_name, 'r')
         file_header = fid.readline()
         fid.close()
         if verbose: log.critical('read file header %s' % file_header)
-    except:
-        msg = 'try to create new file: %s' % file
-        if verbose: log.critical(msg)
+    except Exception:
+        msg = 'try to create new file: %s' % file_name
+        if verbose:
+            log.critical(msg)
         #tries to open file, maybe directory is bad
         try:
-            fid = open(file, 'w')
+            fid = open(file_name, 'w')
             fid.write(header)
             fid.close()
@@ -218 +221 @@
     # if header is same or this is a new file
     if file_header == str(header):
-        fid = open(file, 'a')
+        fid = open(file_name, 'a')
         fid.write(line)
         fid.close()
@@ -225 +228 @@
         # if header is different and has completed will append info to
         # end of details_temp.cvs file in output directory
-        file = str(kwargs['output_dir']) + 'detail_temp.csv'
-        fid = open(file, 'a')
+        file_name = str(kwargs['output_dir']) + 'detail_temp.csv'
+        fid = open(file_name, 'a')
         fid.write(header)
         fid.write(line)
@@ -244 +247 @@
 
 def load_csv_as_building_polygons(file_name,
-                          floor_height=3,
-                          clipping_polygons=None):
+                          floor_height=3):
     """
     Convert CSV files of the form:
@@ -285 +287 @@
             
 
-##
-# @brief Convert CSV file into a dictionary of polygons and associated values.
-# @param filename The path to the file to read, value_name name for the 4th column
 def load_csv_as_polygons(file_name,
                  value_name='value',
@@ -338 +337 @@
     
     msg = 'Did not find expected column header: northing'    
-    assert 'northing' in X.keys(), northing
+    assert 'northing' in X.keys(), msg
     
     msg = 'Did not find expected column header: northing'        
@@ -357 +356 @@
     past_ids = {}
     last_id = None
-    for i, id in enumerate(X['id']):
+    for i, poly_id in enumerate(X['id']):
 
         # Check for duplicate polygons
-        if id in past_ids:
+        if poly_id in past_ids:
             msg = 'Polygon %s was duplicated in line %d' % (id, i)
             raise Exception, msg
         
-        if id not in polygons:
+        if poly_id not in polygons:
             # Start new polygon
-            polygons[id] = []
+            polygons[poly_id] = []
             if values is not None:
-                values[id] = X[value_name][i]
+                values[poly_id] = X[value_name][i]
 
             # Keep track of previous polygon ids
@@ -385 +384 @@
                 
             if exclude is True:
-                excluded_polygons[id]=True
-
-        polygons[id].append(point)    
+                excluded_polygons[poly_id]=True
+
+        polygons[poly_id].append(point)    
             
         # Check that value is the same across each polygon
         msg = 'Values must be the same across each polygon.'
-        msg += 'I got %s in line %d but it should have been %s' % (X[value_name][i], i, values[id])
-        assert values[id] == X[value_name][i], msg
-
-        last_id = id
+        msg += 'I got %s in line %d but it should have been %s' % \
+                            (X[value_name][i], i, values[poly_id])
+        assert values[poly_id] == X[value_name][i], msg
+
+        last_id = poly_id
 
     # Weed out polygons that were not wholly inside clipping polygons
-    for id in excluded_polygons:
-        del polygons[id]
+    for poly_id in excluded_polygons:
+        del polygons[poly_id]
         
     return polygons, values