Changeset 3861

Timestamp:

Oct 25, 2006, 5:32:42 PM (17 years ago)

Author:

ole

Message:

Played with measures of similarity between timeseries

Location:

anuga_validation/okushiri_2005

Files:

• create_okushiri.py (modified) (1 diff)
• extract_timeseries.py (modified) (5 diffs)
• project.py (modified) (1 diff)

anuga_validation/okushiri_2005/create_okushiri.py

@@ -93 +93 @@
     #--------------------------------------------------------------------------
 
+
     base_resolution = 1
 

anuga_validation/okushiri_2005/extract_timeseries.py

@@ -21 +21 @@
     plotting = True
 
-plotting = False
+#plotting = False
 
 #-------------------------
@@ -39 +39 @@
 
     
-expected_covariances = {'Boundary': 5.288392008865989e-05,
-                        'ch5': 1.166748190444681e-04,
-                        'ch7': 1.121816242516758e-04,
-                        'ch9': 1.249543278366778e-04}
+#expected_covariances = {'Boundary': 5.288392008865989e-05,
+#                        'ch5': 1.166748190444681e-04,
+#                        'ch7': 1.121816242516758e-04,
+#                        'ch9': 1.249543278366778e-04}
 
 # old limiters
@@ -49 +49 @@
                         'ch7': 1.121474766904651861e-04,
                         'ch9': 1.249244820847215335e-04}
+
+expected_differences = {'Boundary': 8.361144081847830638e-04,
+                        'ch5': 3.423673831653336816e-03,
+                        'ch7': 2.799962153549145211e-03,
+                        'ch9': 3.198560464876740433e-03}
+
 
 
@@ -112 +118 @@
         model.append(f(t, point_id=k)[0])
 
+    # Covariance measures    
     res = cov(observed_timeseries, model)     
     print 'Covariance = %.18e' %res
@@ -125 +132 @@
     else:
         pass
+
+    # Difference measures    
+    res = sum(abs(observed_timeseries-model))/len(model)     
+    print 'Accumulated difference = %.18e' %res
+
+    if res < expected_differences[name]-eps:
+        print 'Result is better than expected by: %.18e'\
+              %(res-expected_differences[name])
+        print 'Expect = %.18e' %expected_differences[name]    
+    elif res > expected_differences[name]+eps:
+        print 'FAIL: Result is worse than expected by: %.18e'\
+                                %(res-expected_differences[name])
+        print 'Expect = %.18e' %expected_differences[name]
+    else:
+        pass
+
+
 
 

anuga_validation/okushiri_2005/project.py

@@ -16 +16 @@
 # Model output
 #output_filename = 'okushiri_old_limiters.sww'
-output_filename = 'okushiri_nl_new_mesh.sww'
+#output_filename = 'okushiri_new_limiters.sww'
+#output_filename = 'okushiri_nl_coarse10_mesh.sww'
+output_filename = 'okushiri_nl_coarse100_mesh.sww'
 
 
 
+