Changeset 4337

Timestamp:

Mar 29, 2007, 12:02:46 PM (18 years ago)

Author:

ole

Message:

New auto validation passes on Nautilus

File:

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

anuga_validation/automated_validation_tests/okushiri_tank_validation/compare_timeseries_with_measures.py

@@ -73 +73 @@
                    'ch7': 1.230000000000000071e+01,
                    'ch9': 1.315000000000000036e+01}
-
-# Obsolete
-expected_maximum_diff = {'Boundary': 7.166795837686146253e-05,
-                         'ch5': 1.326867779957524585e-03,
-                         'ch7': 3.582696745840288632e-04,
-                         'ch9': 2.212919173501755321e-03}
-
-expected_minimum_diff = {'Boundary': 1.335627610594206094e-04,
-                         'ch5': 9.334970576141445042e-04,
-                         'ch7': 4.523664511720201960e-03,
-                         'ch9': 3.427581218447350343e-03}
-
-expected_argmax_timelag = {'Boundary': 3.000000000000007105e-01,
-                           'ch5': 4.999999999999715783e-02,
-                           'ch7': 0.000000000000000000e+00,
-                           'ch9': 0.000000000000000000e+00}
-
-expected_argmin_timelag = {'Boundary': 2.500000000000000000e-01,
-                           'ch5': 7.999999999999989342e-01,
-                           'ch7': 2.150000000000000355e+00,
-                           'ch9': 1.150000000000000355e+00}
-
-
 
 #-------------------------
@@ -171 +148 @@
               %(name, reference_value, computed_value,
                 abs(reference_value-computed_value))        
-    print msg
-    print 'Allclose:', allclose(reference_value, computed_value, rtol=eps)
-    #assert allclose(reference_value, computed_value, rtol=eps), msg
+    #print msg
+    #print 'Allclose:', allclose(reference_value, computed_value, rtol=eps)
+    assert allclose(reference_value, computed_value, rtol=eps), msg
     
 
@@ -193 +170 @@
         model.append(f(t, point_id=k)[0])
 
-
-    #FIXME: TRY TO REDUCE THESE TOLERANCES!!!!!
-
     # Covariance measure    
     res = cov(observed_timeseries, model)
-    report_difference('Covariance', res, expected_covariance[name], 1.0e-3)
+    report_difference('Covariance', res, expected_covariance[name], eps)
      
     # Difference measures    
     res = sum(abs(observed_timeseries-model))/len(model)
     report_difference('Accumulated difference', res,
-                      expected_difference[name], 1.0e-3)    
+                      expected_difference[name], eps)    
 
     # Extrema