Changeset 6768

Timestamp:

Apr 8, 2009, 1:17:20 PM (15 years ago)

Author:

rwilson

Message:

Removed use of Numeric.Randomarray.

Location:

branches/numpy/anuga

Files:

• geospatial_data/geospatial_data.py (modified) (3 diffs)
• geospatial_data/test_geospatial_data.py (modified) (4 diffs)
• utilities/test_numerical_tools.py (modified) (2 diffs)

branches/numpy/anuga/geospatial_data/geospatial_data.py

@@ -9 +9 @@
 from warnings import warn
 from string import lower
-from RandomArray import randint, seed, get_seed
 from copy import deepcopy
 import copy
@@ -15 +14 @@
 from Scientific.IO.NetCDF import NetCDFFile
 import numpy as num
+from numpy.random import randint, seed
 
 from anuga.coordinate_transforms.lat_long_UTM_conversion import UTMtoLL
@@ -713 +713 @@
         # plus recalcule seed when no seed provided.
         if seed_num is not None:
-            seed(seed_num, seed_num)
+            seed(seed_num)
         else:
             seed()
 
-        if verbose: print "seed:", get_seed()
+        #if verbose: print "seed:", get_seed()
 
         random_num = randint(0, self_size-1, (int(new_size),))

branches/numpy/anuga/geospatial_data/test_geospatial_data.py

@@ -1688 +1688 @@
 
             P = G1.get_data_points(absolute=False)
-            expected = [[5.0, 4.0], [4.0, 3.0], [4.0, 2.0],
-                        [3.0, 1.0], [2.0, 3.0]]
+            expected = [[5.,4.], [4.,1.], [2.,4.], [2.,3.], [1.,4.]]
+            #            expected = [[5.0, 4.0], [4.0, 3.0], [4.0, 2.0],
+                                     #            [3.0, 1.0], [2.0, 3.0]]
             msg = 'Expected %s, but\nP=%s' % (str(expected), str(P))
             assert num.allclose(P, expected), msg
 
             A = G1.get_attributes()
-            expected = [24, 18, 17, 11, 8]
+            expected = [24, 16, 9, 8, 4]
             msg = 'expected=%s, but A=%s' % (str(expected), str(A))
             assert num.allclose(A, expected), msg
@@ -1703 +1704 @@
         # below is a workaround until randint works on cyclones compute nodes
         if get_host_name()[8:9] != '0':
-            from RandomArray import randint,seed
-
-            seed(100,100)
+            from numpy.random import randint, seed
+
+            seed((100, 100))
             a_points = randint(0, 999999, (10,2))
             points = a_points.tolist()
@@ -1719 +1720 @@
 
             P = G1.get_data_points(absolute=False)
-            expected = [[982420., 28233.]]
+            expected = [[425835., 137518.]]
             msg = 'expected=%s, but\nP=%s' % (str(expected), str(P))
             assert num.allclose(P, expected), msg
@@ -1814 +1815 @@
             os.remove(mesh_filename)
 
-            assert(alpha == 0.01)
+            msg = 'alpha=%s' % str(alpha)
+            # 0.01 was expected with Numeric.RandomArray RNG
+            assert alpha==1.0, msg
 
     def test_find_optimal_smoothing_parameter2(self):

branches/numpy/anuga/utilities/test_numerical_tools.py

@@ -4 +4 @@
 import unittest
 import numpy as num
+from numpy.random import uniform, seed
 
 from math import sqrt, pi
@@ -298 +299 @@
         from util_ext import gradient as gradient_c
 
-        from RandomArray import uniform, seed
-        seed(17, 53)
+        seed((17, 53))
 
         x0, x1, x2, y0, y1, y2 = uniform(0.0,3.0,6)