Changeset 4331

Timestamp:

Mar 28, 2007, 3:02:11 PM (18 years ago)

Author:

ole

Message:

More work on adut validation

File:

• anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py (modified) (2 diffs)

anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py

@@ -152 +152 @@
 def report_difference(name, computed_value, reference_value, eps):
 
-    print '%s = %.18e' %(name, computed_value)
+    # print '%s = %.18e' %(name, computed_value)
 
     #if computed_value < reference_value-eps:
@@ -166 +166 @@
 
     if abs(reference_value) > 0:
-        msg = '%s (expected, computed): (%.18e, %.18e): Relative error=%.18e'\
+        msg = '%s (expected, computed):\n  (%.18e, %.18e):\n  Relative error=%.18e'\
               %(name, reference_value, computed_value,
                 abs(reference_value-computed_value)/reference_value)
     else:
-        msg = '%s (expected, computed): (%.18e, %.18e): Absolute error=%.18e'\
+        msg = '%s (expected, computed):\n  (%.18e, %.18e):\n  Absolute error=%.18e'\
               %(name, reference_value, computed_value,
                 abs(reference_value-computed_value))        
     print msg
    
-    #assert allclose(reference_value, computed_value), msg
+    assert allclose(reference_value, computed_value), msg