Changeset 1753 for inundation/pyvolution/test_quantity.py

Timestamp:

Aug 24, 2005, 1:49:47 PM (19 years ago)

Author:

ole

Message:

Embedded caching functionality within quantity.set_values and modified validation example lwru2.py to illustrate the advantages that can be gained from supervised caching.

File:

• inundation/pyvolution/test_quantity.py (modified) (4 diffs)

inundation/pyvolution/test_quantity.py

@@ -276 +276 @@
 
 
+        
 
     def test_set_vertex_values_using_least_squares(self):
-        from least_squares import Interpolation, fit_to_mesh
+
         
         quantity = Quantity(self.mesh4)
@@ -297 +298 @@
                        [ 3.0, 1.0]]
 
-
-        interp = Interpolation(quantity.domain.coordinates, quantity.domain.triangles,
-                               data_points, alpha=0.0)
-
         z = linear_function(data_points)
-        answer = linear_function(quantity.domain.coordinates)
-
-        f = interp.fit(z)
-
+        
+        #Obsoleted bit
+        #interp = Interpolation(quantity.domain.coordinates,
+        #                       quantity.domain.triangles,
+        #                       data_points, alpha=0.0)
+        #
+        #answer = linear_function(quantity.domain.coordinates)
+        #
+        #f = interp.fit(z)
+        #
         #print "f",f
         #print "answer",answer
-        assert allclose(f, answer)
-
-
-        quantity.set_values(f)
-
-
+        #assert allclose(f, answer)
+
+
+        #Use built-in least squares fit
+        quantity.set_values(points = data_points, values = z, alpha = 0)
         answer = linear_function(quantity.domain.get_vertex_coordinates(obj = True))
         #print quantity.vertex_values, answer
         assert allclose(quantity.vertex_values.flat, answer)
 
-        #Now try using the general interface
-
+
+        #Now try by setting the same values directly
+        from least_squares import fit_to_mesh        
         vertex_attributes = fit_to_mesh(quantity.domain.coordinates,
                                         quantity.domain.triangles,
@@ -329 +332 @@
         #print vertex_attributes
         quantity.set_values(vertex_attributes)
+        assert allclose(quantity.vertex_values.flat, answer)
+
+
+    def test_set_values_from_file(self):
+        quantity = Quantity(self.mesh4)
+
+        #Get (enough) datapoints
+        data_points = [[ 0.66666667, 0.66666667],
+                       [ 1.33333333, 1.33333333],
+                       [ 2.66666667, 0.66666667],
+                       [ 0.66666667, 2.66666667],
+                       [ 0.0, 1.0],
+                       [ 0.0, 3.0],
+                       [ 1.0, 0.0],
+                       [ 1.0, 1.0],
+                       [ 1.0, 2.0],
+                       [ 1.0, 3.0],
+                       [ 2.0, 1.0],
+                       [ 3.0, 0.0],
+                       [ 3.0, 1.0]]
+
+        z = linear_function(data_points)
+        
+
+        #Create pts file
+        from data_manager import write_ptsfile
+        ptsfile = 'testptsfile.pts'
+        att = 'spam_and_eggs'
+        write_ptsfile(ptsfile, data_points, z, attribute_name = att)
+
+        #Check that values can be set from file
+        quantity.set_values(filename = ptsfile,
+                            attribute_name = att, alpha = 0)
+        answer = linear_function(quantity.domain.get_vertex_coordinates(obj = True))
+        #print quantity.vertex_values, answer
+        assert allclose(quantity.vertex_values.flat, answer)
+
+
+        #Check that values can be set from file using default attribute
+        quantity.set_values(filename = ptsfile, alpha = 0)
         assert allclose(quantity.vertex_values.flat, answer)        
 
+        #Cleanup
+        import os
+        os.remove(ptsfile)
+        
 
 
@@ -832 +879 @@
         indices = [1]
         quantity.set_values(value,
-                                  location = 'centroids',
-                                  indices = indices)
+                            location = 'centroids',
+                            indices = indices)
         #print "quantity.centroid_values",quantity.centroid_values
         assert allclose(quantity.centroid_values, [1,7,3,4,5,6])