Changeset 2509

Timestamp:

Mar 9, 2006, 2:29:45 PM (19 years ago)

Author:

ole

Message:

Clean up following move of util_ext.*

Location:

inundation

Files:

• pyvolution/least_squares.py (modified) (1 diff)
• pyvolution/test_util.py (modified) (1 diff)
• utilities/test_numerical_tools.py (modified) (2 diffs)

inundation/pyvolution/least_squares.py

@@ -34 +34 @@
 
 
-try:
-    from util import gradient
-except ImportError, e:
-    #FIXME (DSG-ON) reduce the dependency of modules in pyvolution
-    # Have util in a dir, working like load_mesh, and get rid of this
-    def gradient(x0, y0, x1, y1, x2, y2, q0, q1, q2):
-        """
-        """
-
-        det = (y2-y0)*(x1-x0) - (y1-y0)*(x2-x0)
-        a = (y2-y0)*(q1-q0) - (y1-y0)*(q2-q0)
-        a /= det
-
-        b = (x1-x0)*(q2-q0) - (x2-x0)*(q1-q0)
-        b /= det
-
-        return a, b
-
+from utilities.numerical_tools import gradient
 
 DEFAULT_ALPHA = 0.001

inundation/pyvolution/test_util.py

@@ -21 +21 @@
         pass
 
-
-    def test_gradient(self):
-        x0 = 0.0; y0 = 0.0; z0 = 0.0
-        x1 = 1.0; y1 = 0.0; z1 = -1.0
-        x2 = 0.0; y2 = 1.0; z2 = 0.0
-
-        zx, zy = gradient(x0, y0, x1, y1, x2, y2, z0, z1, z2)
-
-        assert zx == -1.0
-        assert zy == 0.0
-
-    def test_gradient_more(self):
-        x0 = 2.0/3; y0 = 2.0/3
-        x1=  8.0/3; y1 = 2.0/3
-        x2 = 2.0/3; y2 = 8.0/3
-
-        q0 = 2.0+2.0/3
-        q1 = 8.0+2.0/3
-        q2 = 2.0+8.0/3
-
-        #Gradient of fitted pwl surface
-        a, b = gradient(x0, y0, x1, y1, x2, y2, q0, q1, q2)
-
-        assert abs(a - 3.0) < epsilon
-        assert abs(b - 1.0) < epsilon
-
-
-    def test_gradient2(self):
-        """Test two-point gradient
-        """
-        
-        x0 = 5.0; y0 = 5.0; z0 = 10.0
-        x1 = 8.0; y1 = 2.0; z1 = 1.0
-        x2 = 8.0; y2 = 8.0; z2 = 10.0
-
-        #Reference
-        zx, zy = gradient(x0, y0, x1, y1, x2, y2, z0, z1, z2)
-        a, b = gradient2(x0, y0, x1, y1, z0, z1)
-
-        assert zx == a
-        assert zy == b
-
-        z2_computed = z0 + a*(x2-x0) + b*(y2-y0)
-        assert z2_computed == z2
-        
-    def test_gradient2_more(self):
-        """Test two-point gradient more
-        """
-        x0 = 2.0; y0 = 2.0
-        x1 = 8.0; y1 = 3.0
-        x2 = 1.0; y2 = 8.0
-
-        q0 = 2.0
-        q1 = 8.0
-        q2 = q0
-
-        #Gradient of fitted pwl surface
-        a_ref, b_ref = gradient(x0, y0, x1, y1, x2, y2, q0, q1, q2)
-        a, b = gradient2(x0, y0, x1, y1, q0, q1)        
-
-        assert a == a_ref
-        assert b == b_ref
-
-
-    def test_that_C_extension_compiles(self):
-        FN = 'util_ext.c'
-        try:
-            import util_ext
-        except:
-            from compile import compile
-
-            try:
-                compile(FN)
-            except:
-                raise 'Could not compile %s' %FN
-            else:
-                import util_ext
-
-
-    def test_gradient_C_extension(self):
-        from util_ext import gradient as gradient_c
-
-        x0 = 2.0/3; y0 = 2.0/3
-        x1=  8.0/3; y1 = 2.0/3
-        x2 = 2.0/3; y2 = 8.0/3
-
-        q0 = 2.0+2.0/3
-        q1 = 8.0+2.0/3
-        q2 = 2.0+8.0/3
-
-        #Gradient of fitted pwl surface
-        a, b = gradient_c(x0, y0, x1, y1, x2, y2, q0, q1, q2)
-
-        assert abs(a - 3.0) < epsilon
-        assert abs(b - 1.0) < epsilon
-
-
-    def test_gradient_C_extension3(self):
-        from util_ext import gradient as gradient_c
-
-        from RandomArray import uniform, seed
-        seed(17, 53)
-
-        x0, x1, x2, y0, y1, y2 = uniform(0.0,3.0,6)
-
-        q0 = uniform(0.0, 10.0, 4)
-        q1 = uniform(1.0, 3.0, 4)
-        q2 = uniform(7.0, 20.0, 4)
-
-
-        for i in range(4):
-            #Gradient of fitted pwl surface
-            from util import gradient_python
-            a_ref, b_ref = gradient(x0, y0, x1, y1, x2, y2,
-                                    q0[i], q1[i], q2[i])
-
-            #print a_ref, b_ref
-            a, b = gradient_c(x0, y0, x1, y1, x2, y2,
-                              q0[i], q1[i], q2[i])
-
-            #print a, a_ref, b, b_ref
-            assert abs(a - a_ref) < epsilon
-            assert abs(b - b_ref) < epsilon
 
 

inundation/utilities/test_numerical_tools.py

@@ -5 +5 @@
 from Numeric import zeros, array, allclose
 from math import sqrt, pi
+from pyvolution.config import epsilon
 
 from numerical_tools import *
@@ -66 +67 @@
         assert B.typecode() == 'd'        
         assert A == B    
-        assert A is not B   #Not the same object        
+        assert A is not B   #Not the same object
+
+
+    def test_gradient(self):
+        x0 = 0.0; y0 = 0.0; z0 = 0.0
+        x1 = 1.0; y1 = 0.0; z1 = -1.0
+        x2 = 0.0; y2 = 1.0; z2 = 0.0
+
+        zx, zy = gradient(x0, y0, x1, y1, x2, y2, z0, z1, z2)
+
+        assert zx == -1.0
+        assert zy == 0.0
+
+    def test_gradient_more(self):
+        x0 = 2.0/3; y0 = 2.0/3
+        x1=  8.0/3; y1 = 2.0/3
+        x2 = 2.0/3; y2 = 8.0/3
+
+        q0 = 2.0+2.0/3
+        q1 = 8.0+2.0/3
+        q2 = 2.0+8.0/3
+
+        #Gradient of fitted pwl surface
+        a, b = gradient(x0, y0, x1, y1, x2, y2, q0, q1, q2)
+
+        assert abs(a - 3.0) < epsilon
+        assert abs(b - 1.0) < epsilon
+
+
+    def test_gradient2(self):
+        """Test two-point gradient
+        """
+        
+        x0 = 5.0; y0 = 5.0; z0 = 10.0
+        x1 = 8.0; y1 = 2.0; z1 = 1.0
+        x2 = 8.0; y2 = 8.0; z2 = 10.0
+
+        #Reference
+        zx, zy = gradient(x0, y0, x1, y1, x2, y2, z0, z1, z2)
+        a, b = gradient2(x0, y0, x1, y1, z0, z1)
+
+        assert zx == a
+        assert zy == b
+
+        z2_computed = z0 + a*(x2-x0) + b*(y2-y0)
+        assert z2_computed == z2
+        
+    def test_gradient2_more(self):
+        """Test two-point gradient more
+        """
+        x0 = 2.0; y0 = 2.0
+        x1 = 8.0; y1 = 3.0
+        x2 = 1.0; y2 = 8.0
+
+        q0 = 2.0
+        q1 = 8.0
+        q2 = q0
+
+        #Gradient of fitted pwl surface
+        a_ref, b_ref = gradient(x0, y0, x1, y1, x2, y2, q0, q1, q2)
+        a, b = gradient2(x0, y0, x1, y1, q0, q1)        
+
+        assert a == a_ref
+        assert b == b_ref
+
+
+    def test_that_C_extension_compiles(self):
+        FN = 'util_ext.c'
+        try:
+            import util_ext
+        except:
+            from compile import compile
+
+            try:
+                compile(FN)
+            except:
+                raise 'Could not compile %s' %FN
+            else:
+                import util_ext
+
+
+    def test_gradient_C_extension(self):
+        from util_ext import gradient as gradient_c
+
+        x0 = 2.0/3; y0 = 2.0/3
+        x1=  8.0/3; y1 = 2.0/3
+        x2 = 2.0/3; y2 = 8.0/3
+
+        q0 = 2.0+2.0/3
+        q1 = 8.0+2.0/3
+        q2 = 2.0+8.0/3
+
+        #Gradient of fitted pwl surface
+        a, b = gradient_c(x0, y0, x1, y1, x2, y2, q0, q1, q2)
+
+        assert abs(a - 3.0) < epsilon
+        assert abs(b - 1.0) < epsilon
+
+
+    def test_gradient_C_extension3(self):
+        from util_ext import gradient as gradient_c
+
+        from RandomArray import uniform, seed
+        seed(17, 53)
+
+        x0, x1, x2, y0, y1, y2 = uniform(0.0,3.0,6)
+
+        q0 = uniform(0.0, 10.0, 4)
+        q1 = uniform(1.0, 3.0, 4)
+        q2 = uniform(7.0, 20.0, 4)
+
+
+        for i in range(4):
+            #Gradient of fitted pwl surface
+            from util import gradient_python
+            a_ref, b_ref = gradient(x0, y0, x1, y1, x2, y2,
+                                    q0[i], q1[i], q2[i])
+
+            #print a_ref, b_ref
+            a, b = gradient_c(x0, y0, x1, y1, x2, y2,
+                              q0[i], q1[i], q2[i])
+
+            #print a, a_ref, b, b_ref
+            assert abs(a - a_ref) < epsilon
+            assert abs(b - b_ref) < epsilon
+
+