Changeset 7009

Timestamp:

May 11, 2009, 3:27:59 PM (16 years ago)

Author:

rwilson

Message:

Replaced 'sets' module with 'frozenset' builtin class.

Location:

branches/numpy/anuga

Files:

• abstract_2d_finite_volumes/util.py (modified) (1 diff)
• geospatial_data/test_geospatial_data.py (modified) (3 diffs)
• shallow_water/data_manager.py (modified) (2 diffs)
• shallow_water/test_data_manager.py (modified) (5 diffs)

branches/numpy/anuga/abstract_2d_finite_volumes/util.py

@@ -1136 +1136 @@
     """
     import sys
-    from sets import Set as set
 
     all_quantity = ['stage', 'depth', 'momentum', 'xmomentum',

branches/numpy/anuga/geospatial_data/test_geospatial_data.py

@@ -5 +5 @@
 import tempfile
 from math import sqrt, pi
-from sets import ImmutableSet
 
 import numpy as num
@@ -1599 +1598 @@
         p1 = (lat_gong, lon_gong)
         p2 = (lat_2, lon_2)
-        points = ImmutableSet([p1, p2, p1])
+        points = frozenset([p1, p2, p1])
         gsd = Geospatial_data(data_points=list(points),
                               points_are_lats_longs=True)
@@ -1621 +1620 @@
         p1 = (lat_gong, lon_gong)
         p2 = (lat_2, lon_2)
-        points = ImmutableSet([p1, p2, p1])
+        points = frozenset([p1, p2, p1])
         gsd = Geospatial_data(data_points=list(points),
                               points_are_lats_longs=True)

branches/numpy/anuga/shallow_water/data_manager.py

@@ -5003 +5003 @@
     """
 
-    from sets import ImmutableSet
-
     msg = "grid_spacing can not be zero"
     assert not grid_spacing == 0, msg
@@ -5016 +5014 @@
     # Don't assume the zone of the segments is the same as the lower left
     # corner of the lat long data!!  They can easily be in different zones
-    lat_long_set = ImmutableSet()
+    lat_long_set = frozenset()
     for seg in segs:
         points_lat_long = points_needed(seg, ll_lat, ll_long, grid_spacing,
                                         lat_amount, long_amount, zone,
                                         isSouthHemisphere)
-        lat_long_set |= ImmutableSet(points_lat_long)
-
-    if lat_long_set == ImmutableSet([]):
+        lat_long_set |= frozenset(points_lat_long)
+
+    if lat_long_set == frozenset([]):
         msg = "URS region specified and polygon does not overlap."
         raise ValueError, msg

branches/numpy/anuga/shallow_water/test_data_manager.py

@@ -14 +14 @@
 from Scientific.IO.NetCDF import NetCDFFile
 from struct import pack, unpack
-from sets import ImmutableSet
 import shutil
 
@@ -9552 +9551 @@
         # the poly as points though.
         #geo.export_points_file("results.txt", as_lat_long=True)
-        results = ImmutableSet(geo.get_data_points(as_lat_long=True))
+        results = frozenset(geo.get_data_points(as_lat_long=True))
         #print 'results',results
 
@@ -9566 +9565 @@
                                      points_are_lats_longs=True) 
         #geo_answer.export_points_file("answer.txt", as_lat_long=True)  
-        answer = ImmutableSet(points)
+        answer = frozenset(points)
         
         outs = answer.difference(results)
@@ -9656 +9655 @@
                                   verbose=self.verbose)
         
-        results = ImmutableSet(geo.get_data_points(as_lat_long=True,
-                                  isSouthHemisphere=False))
+        results = frozenset(geo.get_data_points(as_lat_long=True,
+                                                isSouthHemisphere=False))
         #print 'results',results
 
@@ -9667 +9666 @@
                                degminsec2decimal_degrees(97,i*2,0)))
         #print "answer points", points
-        answer = ImmutableSet(points)
+        answer = frozenset(points)
         
         for point in points: