Changeset 7649

Timestamp:

Mar 2, 2010, 5:19:13 PM (15 years ago)

Author:

ole

Message:

Added variable tolerance and more measures to Patong auto validation

Location:

anuga_validation/automated_validation_tests/patong_beach_validation

Files:

• compare_model_timeseries.py (modified) (8 diffs)
• validate.py (modified) (4 diffs)

anuga_validation/automated_validation_tests/patong_beach_validation/compare_model_timeseries.py

@@ -36 +36 @@
 def usage():
     print 'Usage:'
-    print 'python compare_model_timeseries.py swwfile1 swwfile2'
+    print 'python compare_model_timeseries.py swwfile1 swwfile2 epsilon'
 
 
@@ -74 +74 @@
                        timeseries2,
                        name='',
-                       legend = ('Time series 1', 'Time series 2')):
+                       legend = ('Time series 1', 'Time series 2'),
+                       eps=1.0e-6):
     """Compare and plot two timeseries
     """
@@ -84 +85 @@
     assert timeseries1.shape[0] == N    
     assert timeseries2.shape[0] == N        
-    
-    eps = 1.0e-3
-    
+
+    print 'epsilon', eps
     # Covariance measure    
-    #res = cov(timeseries1, timeseries2)
-    #msg = 'Covariance between timeseries was too large: %e' % res
-    #assert res < 0.01, msg
+    res = cov(timeseries1-timeseries2)
+    print '2 norm diff', res        
+    msg = '2-norm of timeseries difference was too large: %e' % res
+    assert res < eps, msg
      
-    # Difference measures
-    print timeseries1
-    print timeseries1-timeseries2
-    
-    
     # Maximum norm
     nominator = max(abs(timeseries1-timeseries2))    
     denominator = max(abs(timeseries1))
-    print nominator, denominator, N
     if denominator > 0:
         # Relative measure
@@ -107 +102 @@
         # Absolute measure
         res = nominator/N
-                
+
+    print 'Max abs diff', res    
     msg = '%s: Difference between timeseries was too large: %e' % (name, res)
-    #assert res < eps, msg
+    assert res < eps, msg
     
     
     nominator = sum(abs(timeseries1-timeseries2))    
     denominator = sum(abs(timeseries1))
-    print nominator, denominator, N
     if denominator > 0:
         # Relative measure
@@ -121 +116 @@
         # Absolute measure
         res = nominator/N
-                
+
+    print 'Sum abs diff', res    
     msg = '%s: Difference between timeseries was too large: %e' % (name, res)
-    #assert res < eps, msg
+    assert res < eps, msg
 
     # Extrema
-    #res = max(model)
-    #report_difference('Maximum', res, expected_maximum[name], rtol, atol)
+    max1 = max(timeseries1)
+    max2 = max(timeseries2)
+    print 'Max diff', abs(max1-max2)
+
+    min1 = min(timeseries1)
+    min2 = min(timeseries2)
+    print 'Min diff', abs(min1-min2)    
+    
+    # Locations of extrema
+    i1 = num.argmax(timeseries1)
+    i2 = num.argmax(timeseries2)
+    
+    res = abs(reference_time[i1]-reference_time[i2])
+    print 'Max loc diff', res
+
+
+    i1 = num.argmin(timeseries1)
+    i2 = num.argmin(timeseries2)
+    
+    res = abs(reference_time[i1]-reference_time[i2])
+    print 'Min loc diff', res    
     
     
@@ -155 +170 @@
     
 
-def compare_all_timeseries(swwfile1, swwfile2):
+def compare_all_timeseries(swwfile1, swwfile2, eps=1.0e-6):
     
     timevector1, timeseries1 = get_timeseries(swwfile1, gauges)
@@ -177 +192 @@
                            timeseries1[name],
                            timeseries2[name],
-                           name=name)
+                           name=name,
+                           eps=eps)
         
         
@@ -189 +205 @@
 if __name__ == '__main__':
 
-    if len(sys.argv) != 3:
+    if len(sys.argv) != 4:
         usage()
         import sys; sys.exit(-1) 
 
-    #res = compare_all_timeseries(sys.argv[1], sys.argv[2])
+    eps = float(sys.argv[3]) # Get tolerance to be used in comparisons
     try:
-        res = compare_all_timeseries(sys.argv[1], sys.argv[2])
+        res = compare_all_timeseries(sys.argv[1], sys.argv[2], eps=eps)
     except:
         sys.exit(-1)

anuga_validation/automated_validation_tests/patong_beach_validation/validate.py

@@ -53 +53 @@
                          'patong.sww.FINAL.tgz'
                         )
-Optional_Data_Objects = ('patong.sww.BASIC.tgz',)
+Optional_Data_Objects = ('patong.sww.TRIAL.tgz',)
+
+# Associated tolerances to be used in comparisons (would depend on discretisation errors)
+epsilon = {'patong.sww.TRIAL.tgz': 1.0e-3,
+           'patong.sww.BASIC.tgz': 1.0e-4,
+           'patong.sww.FINAL.tgz': 1.0e-5}
+
 
 # path to the local data directory
@@ -314 +320 @@
     return res == 0
 
-def check_that_output_is_as_expected(expected_sww, valid_sww):
+def check_that_output_is_as_expected(expected_sww, valid_sww, epsilon):
     '''Check that validation output is as required.'''
 
@@ -348 +354 @@
     new_output_sww = os.path.join(output_directory, expected_sww)
     #cmd = 'python cmpsww.py %s %s > cmpsww.stdout' % (local_sww, new_output_sww)
-    cmd = 'python compare_model_timeseries.py %s %s > compare_model_timeseries.stdout' % (local_sww, new_output_sww)
+    cmd = 'python compare_model_timeseries.py %s %s %e > compare_model_timeseries.stdout' %\
+          (local_sww, new_output_sww, epsilon)
     print '-------------------------------------'
     print cmd
@@ -449 +456 @@
         (valid_sww, _) = odo.rsplit('.', 1)
         (expected_sww, _) = valid_sww.rsplit('.', 1)
-        check_that_output_is_as_expected(expected_sww, valid_sww)
+        check_that_output_is_as_expected(expected_sww, valid_sww, epsilon[odo])
 
     stop_time = time.time()