Changeset 2347

Timestamp:

Feb 7, 2006, 4:35:24 PM (19 years ago)

Author:

ole

Message:

Change default value for verbose from None to False in set_values

Location:

inundation/pyvolution

Files:

• least_squares.py (modified) (3 diffs)
• quantity.py (modified) (4 diffs)
• test_quantity.py (modified) (2 diffs)

inundation/pyvolution/least_squares.py

@@ -201 +201 @@
 
     """
+
+
     interp = Interpolation(vertex_coordinates,
                            triangles,
@@ -425 +427 @@
 
 
+
         #FIXME (Ole): Check that this function is memeory efficient.
         #6 million datapoints and 300000 basis functions
@@ -488 +491 @@
         #Remove points falling outside mesh boundary
         #This reduced one example from 1356 seconds to 825 seconds
+
+        
         if precrop is True:
             from Numeric import take

inundation/pyvolution/quantity.py

@@ -173 +173 @@
                    location = 'vertices',
                    indices = None,
-                   verbose = None,
+                   verbose = False,
                    use_cache = False):
 
@@ -591 +591 @@
 
 
+
         self.set_values_from_points(points, values, alpha,
                                     location, indices,
@@ -607 +608 @@
         """
 
+
         from Numeric import Float
         from util import ensure_numeric
@@ -642 +644 @@
                   'mesh_origin': mesh_georef.get_origin(),
                   'alpha': alpha,
+                  'precrop': True,
                   'verbose': verbose}
 

inundation/pyvolution/test_quantity.py

@@ -398 +398 @@
 
 
-    def test_set_values_from_file(self):
+    def test_set_values_from_file1(self):
         quantity = Quantity(self.mesh4)
 
@@ -1454 +1454 @@
 #-------------------------------------------------------------
 if __name__ == "__main__":
-    suite = unittest.makeSuite(Test_Quantity, 'test')#_test_set_values_using_least_squares_w_geo')
+    suite = unittest.makeSuite(Test_Quantity, 'test')
     #print "restricted test"
     #suite = unittest.makeSuite(Test_Quantity,'test_set_values_func')