Changeset 6548

Timestamp:

Mar 18, 2009, 4:59:03 PM (16 years ago)

Author:

ole

Message:

Added caching test to validation suite following fix of ticket:314
Also removed parameter acceptable_overshoot which was never implemented anyway.

Files:

• anuga_core/source/anuga/fit_interpolate/fit.py (modified) (4 diffs)
• anuga_validation/automated_validation_tests/okushiri_tank_validation/test_caching_of_set_quantity.py (copied) (copied from anuga_validation/okushiri_2005/test_caching_of_set_quantity.py) (8 diffs)
• anuga_validation/okushiri_2005/test_caching_of_set_quantity.py (modified) (3 diffs)

anuga_core/source/anuga/fit_interpolate/fit.py

@@ -474 +474 @@
                 alpha=DEFAULT_ALPHA,
                 verbose=False,
-                acceptable_overshoot=1.01, 
-                # FIXME: Move to config - this value is assumed in caching test
-                # FIXME(Ole): Just realised that this was never implemented (29 Jan 2009). I suggest removing it altogether.
                 mesh_origin=None,
                 data_origin=None,
@@ -493 +490 @@
               'alpha': alpha,
               'verbose': verbose,
-              'acceptable_overshoot': acceptable_overshoot,
               'mesh_origin': mesh_origin,
               'data_origin': data_origin,
@@ -549 +545 @@
                  alpha=DEFAULT_ALPHA,
                  verbose=False,
-                 acceptable_overshoot=1.01,
                  mesh_origin=None,
                  data_origin=None,
@@ -575 +570 @@
           alpha: Smoothing parameter.
 
-          acceptable overshoot: NOT IMPLEMENTED
-          controls the allowed factor by which
-          fitted values
-          may exceed the value of input data. The lower limit is defined
-          as min(z) - acceptable_overshoot*delta z and upper limit
-          as max(z) + acceptable_overshoot*delta z
-          
 
           mesh_origin: A geo_reference object or 3-tuples consisting of

anuga_validation/automated_validation_tests/okushiri_tank_validation/test_caching_of_set_quantity.py

@@ -1 @@
-"""This script tests that caching works for set_quantity using point data from a file.
+"""This script tests that caching works for set_quantity using point 
+data from a file.
 First cache is cleared, then set_quantity is run twice checking that
 fitting is evaluated only first time and that the result from cache on the
@@ -6 +7 @@
 This script depends on  Benchmark_2.msh and Benchmark_2_Bathymetry.pts
 """
-# FIXME(Ole): This needs to become a unit test - in automated validation tests under Okushiri.
-
-# FIXME(Ole): This won't work until ticket:314 has been fixed.
 
 # Module imports
@@ -18 +16 @@
 import time
 
-internal_verbose = True # Verbose used in set_quantity and passed into fit_to_mesh
+internal_verbose = True # Verbosity used within this function
 
 filename=project.bathymetry_filename
@@ -27 +25 @@
 # Create Domain from mesh
 #-------------------------
-domain = cache(Domain, (project.mesh_filename, {'verbose': True}), verbose=False)
+domain = cache(Domain, 
+               (project.mesh_filename, 
+                {'verbose': True}), 
+               verbose=False)
 
 # Clear caching of underlying function                                            
@@ -37 +38 @@
           'alpha': alpha,
           'verbose': internal_verbose,
-          'acceptable_overshoot': 1.01, # This is the default value in _fit_to_mesh - actually, not implemented. Remove!
           'mesh_origin': None,
           'data_origin': None,
@@ -62 +62 @@
 
 
-
 #-------------------------
 # Initial Conditions
 #-------------------------
-#print 'Set elevation and cache'
 t0 = time.time()
 domain.set_quantity('elevation',
@@ -84 +82 @@
              dependencies=[filename],
              test=True)
+             
 assert flag is not None
-res = domain.get_quantity('elevation').get_values()                                        
+res = domain.get_quantity('elevation').get_values()
 assert num.allclose(res, ref)
 
 # Now check this using the high level call
-
 print 'Try to read in via cache'
 t0 = time.time()
@@ -99 +97 @@
 cache_time = time.time()-t0                    
                     
-res = domain.get_quantity('elevation').get_values()                                        
+res = domain.get_quantity('elevation').get_values() 
 assert num.allclose(res, ref)
 
 print 'cache_time', cache_time
 print 'compute_time', compute_time
-assert cache_time < compute_time/10
+
+msg = 'Caching did not speed things up as expected'
+assert cache_time < compute_time/10, msg

anuga_validation/okushiri_2005/test_caching_of_set_quantity.py

@@ -1 @@
-"""This script tests that caching works for set_quantity using point data from a file.
+"""This script tests that caching works for set_quantity using point 
+data from a file.
 First cache is cleared, then set_quantity is run twice checking that
 fitting is evaluated only first time and that the result from cache on the
@@ -6 +7 @@
 This script depends on  Benchmark_2.msh and Benchmark_2_Bathymetry.pts
 """
-# FIXME(Ole): This needs to become a unit test - in automated validation tests under Okushiri.
 
-# FIXME(Ole): This won't work until ticket:314 has been fixed.
+# FIXME(Ole): This script is obsolete and has been moved into the 
+# automatic validation unit test suite.
 
 # Module imports
@@ -18 +19 @@
 import time
 
-internal_verbose = True # Verbose used in set_quantity and passed into fit_to_mesh
+internal_verbose = True # Verbosity used within this function
 
 filename=project.bathymetry_filename