Changeset 2924

Timestamp:

May 19, 2006, 4:12:41 PM (19 years ago)

Author:

duncan

Message:

changing pyvolution code so fit_interpolate/fit.py is used.

Location:

inundation

Files:

• fit_interpolate/fit.py (modified) (1 diff)
• pyvolution/data_manager.py (modified) (1 diff)
• pyvolution/interpolate_sww.py (modified) (1 diff)
• pyvolution/quantity.py (modified) (10 diffs)
• pyvolution/test_combine_pts.py (modified) (1 diff)
• pyvolution/test_quantity.py (modified) (4 diffs)

inundation/fit_interpolate/fit.py

@@ -400 +400 @@
     """
     #Since this is a wrapper for fit, lets handle the geo_spatial att's
-    
     if use_cache is True:
         interp = cache(_fit,

inundation/pyvolution/data_manager.py

@@ -1530 +1530 @@
             northing_min = None,
             northing_max = None,
-            expand_search = False, #To avoid intractable situations (This will be fixed when least_squares gets redesigned)
             verbose = False,
             origin = None,

inundation/pyvolution/interpolate_sww.py

@@ -1 +1 @@
 """ Interpolation of a sww file.
+
+THIS FILE IS OBSOLETE
+
 Used to interpolate height information from sww files.
 

inundation/pyvolution/quantity.py

@@ -168 +168 @@
                    function = None,   # Callable object: f(x,y)
                    geospatial_data = None, #Arbitrary dataset
-                   points = None, values = None, data_georef = None, #Input for least squares (obsoleted by use of geo_spatial object)
+                   points = None, values = None, data_georef = None, #Input for fit (obsoleted by use of geo_spatial object)
                    filename = None, attribute_name = None, #Input from file
                    alpha = None,
@@ -196 +196 @@
         geospatial_data:
           Arbitrary geo spatial dataset in the form of the class
-          Geospatial_data. Mesh points are populated using least squares
-          fitting
+          Geospatial_data. Mesh points are populated using
+          fit_interpolate.fit fitting
 
         points:
-          Nx2 array of data points for use with least squares fit
+          Nx2 array of data points for use with fit_interpolate.fit
           If points are present, an N array of attribute
           values corresponding to
@@ -214 +214 @@
         filename:
           Name of a .pts file containing data points and attributes for
-          use with least squares.
+          use with fit_interpolate.fit.
 
         attribute_name:
@@ -222 +222 @@
 
         alpha:
-          Smoothing parameter to be used with least squares fits.
-          See module least_squares for further details about alpha.
+          Smoothing parameter to be used with fit_interpolate.fit.
+          See module fit_interpolate.fit for further details about alpha.
           Alpha will only be used with points, values or filename.
           Otherwise it will be ignored.
@@ -255 +255 @@
 
         use_cache: True means that caching of intermediate results is
-                   attempted for least squares fit.
+                   attempted for fit_interpolate.fit.
 
 
@@ -613 +613 @@
                                verbose = False,
                                use_cache = False):
-        """Set quantity values from arbitray data points using least squares
+        """
+        Set quantity values from arbitray data points using
+        fit_interpolate.fit
         """
 
@@ -619 +621 @@
         from Numeric import Float
         from utilities.numerical_tools import ensure_numeric
-        from pyvolution.least_squares import fit_to_mesh
+        #from pyvolution.least_squares import fit_to_mesh
+        from fit_interpolate.fit import fit_to_mesh
         from coordinate_transforms.geo_reference import Geo_reference
 
@@ -629 +632 @@
             msg = 'set_values_from_points is only defined for '+\
                   'location=\'vertices\''
-            raise msg
+            raise ms
 
         coordinates = self.domain.coordinates
@@ -647 +650 @@
 
 
-        #Call least squares method
+        #Call fit_interpolate.fit function
         args = (coordinates, triangles, points, values)
         kwargs = {'data_origin': data_georef.get_origin(),
                   'mesh_origin': mesh_georef.get_origin(),
                   'alpha': alpha,
-                  'precrop': True,
                   'verbose': verbose}
 
@@ -685 +687 @@
                              use_cache = False):
         """Set quantity based on arbitrary points in .pts file
-        using least_squares attribute_name selects name of attribute
+        using attribute_name selects name of attribute
         present in file.
         If not specified try to use whatever is available in file.

inundation/pyvolution/test_combine_pts.py

@@ -7 +7 @@
 
 
-from least_squares import *
+#from least_squares import *
 from Numeric import allclose, array, transpose
 

inundation/pyvolution/test_quantity.py

@@ -9 +9 @@
 from Numeric import allclose, array, ones, Float
 
-from pyvolution.least_squares import fit_to_mesh                
+from fit_interpolate.fit import fit_to_mesh
+#from pyvolution.least_squares import fit_to_mesh               
 from domain import Domain
 from geospatial_data.geospatial_data import Geospatial_data
 from coordinate_transforms.geo_reference import Geo_reference
 
-#Aux for least_squares example
+#Aux for fit_interpolate.fit example
 def linear_function(point):
     point = array(point)
@@ -282 +283 @@
 
 
-    def test_set_values_using_least_squares(self):
+    def test_set_values_using_fit(self):
 
 
@@ -304 +305 @@
         z = linear_function(data_points)
 
-        #Use built-in least squares fit
+        #Use built-in fit_interpolate.fit
         quantity.set_values( Geospatial_data(data_points, z), alpha = 0 )
         #quantity.set_values(points = data_points, values = z, alpha = 0)
@@ -330 +331 @@
 
 
-    def test_test_set_values_using_least_squares_w_geo(self):
+    def test_test_set_values_using_fit_w_geo(self):