Changeset 1504

Timestamp:

Jun 8, 2005, 12:58:27 PM (19 years ago)

Author:

ole

Message:

Got a few unit tests to work on linux (rounding problems)

Location:

inundation/ga/storm_surge/pyvolution

Files:

• shallow_water.py (modified) (2 diffs)
• test_quantity.py (modified) (5 diffs)

inundation/ga/storm_surge/pyvolution/shallow_water.py

@@ -56 +56 @@
 
 from domain import *
-from region import *
-from realtime_visualisation_new import Visualiser
+from region import *#
+
 Generic_domain = Domain #Rename
 
@@ -111 +111 @@
         #Realtime visualisation
         if self.visualiser is None:
+            from realtime_visualisation_new import Visualiser            
             self.visualiser = Visualiser(self,scale_z)
         self.visualise = True

inundation/ga/storm_surge/pyvolution/test_quantity.py

@@ -285 +285 @@
         #The central triangle (1)
         #(using standard gradient based on neigbours controid values)
-        assert a[1] == 2.0
-        assert b[1] == 0.0
+        assert allclose(a[1], 2.0)
+        assert allclose(b[1], 0.0)
 
 
@@ -292 +292 @@
         #q0 = q1 + a*(x0-x1) + b*(y0-y1)  <=>
         #2  = 4  + a*(-2/3)  + b*(-2/3)
-        assert a[0] + b[0] == 3
+        assert allclose(a[0] + b[0], 3)
         #From orthogonality (a*(y0-y1) + b*(x0-x1) == 0)        
-        assert a[0] - b[0] == 0 
+        assert allclose(a[0] - b[0], 0) 
 
 
@@ -300 +300 @@
         #q2 = q1 + a*(x2-x1) + b*(y2-y1)  <=>
         #6  = 4  + a*(4/3)  + b*(-2/3)        
-        assert 2*a[2] - b[2] == 3
+        assert allclose(2*a[2] - b[2], 3)
         #From orthogonality (a*(y1-y2) + b*(x2-x1) == 0)
-        assert a[2] + 2*b[2] == 0 
+        assert allclose(a[2] + 2*b[2], 0) 
 
 
@@ -308 +308 @@
         #q3 = q1 + a*(x3-x1) + b*(y3-y1)  <=>
         #2  = 4  + a*(-2/3)  + b*(4/3)        
-        assert a[3] - 2*b[3] == 3
+        assert allclose(a[3] - 2*b[3], 3)
         #From orthogonality (a*(y1-y3) + b*(x3-x1) == 0)        
-        assert 2*a[3] + b[3] == 0 
+        assert allclose(2*a[3] + b[3], 0) 
 
 
@@ -339 +339 @@
         #print a, b
 
-        assert a[1] == 3.0
-        assert b[1] == 1.0
+        assert allclose(a[1], 3.0)
+        assert allclose(b[1], 1.0)
         
         #Work out the others