Changeset 6132

Timestamp:

Jan 9, 2009, 4:10:11 PM (16 years ago)

Author:

ole

Message:

Check for duplicate polygon ids in csv2polygon

File:

• anuga_core/source/anuga/shallow_water/data_manager.py (modified) (3 diffs)

anuga_core/source/anuga/shallow_water/data_manager.py

@@ -1094 +1094 @@
 
     # Loop through entries and compose polygons
+    past_ids = {}
+    last_id = None
     for i, id in enumerate(X['id']):
+
+        # Check for duplicate polygons
+        if id in past_ids:
+            msg = 'Polygon %s was duplicated in line %d' % (id, i)
+            raise Exception, msg
         
         if id not in polygons:
@@ -1101 +1108 @@
             if values is not None:
                 values[id] = X[value_name][i]
+
+            # Keep track of previous polygon ids
+            if last_id is not None:
+                past_ids[last_id] = i
             
         # Append this point to current polygon
@@ -1107 +1118 @@
             
         # Check that value is the same across each polygon
-        assert values[id] == X[value_name][i]
+        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
         
     return polygons, values