Changeset 2754

Timestamp:

Apr 24, 2006, 2:28:11 PM (19 years ago)

Author:

duncan

Message:

fixing imports that were breaking tests

Location:

inundation/pyvolution

Files:

• least_squares.py (modified) (2 diffs)
• quantity.py (modified) (1 diff)
• test_quantity.py (modified) (7 diffs)

inundation/pyvolution/least_squares.py

@@ -195 +195 @@
 
     """
-    print "in fit_to_mesh **"
     if use_cache is True:
         from caching.caching import cache
@@ -221 +220 @@
                                precrop = precrop)
 
-    print "id(Interpolation)",id(Interpolation)
     vertex_attributes = interp.fit_points(point_attributes, verbose = verbose)
 

inundation/pyvolution/quantity.py

@@ -619 +619 @@
         from Numeric import Float
         from utilities.numerical_tools import ensure_numeric
-        from least_squares import fit_to_mesh
+        from pyvolution.least_squares import fit_to_mesh
         from coordinate_transforms.geo_reference import Geo_reference
 

inundation/pyvolution/test_quantity.py

@@ -9 +9 @@
 from Numeric import allclose, array, ones, Float
 
+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
@@ -280 +284 @@
     def test_set_values_using_least_squares(self):
 
-        from geospatial_data.geospatial_data import Geospatial_data
 
         quantity = Quantity(self.mesh4)
@@ -312 +315 @@
 
         #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,
@@ -330 +332 @@
     def test_test_set_values_using_least_squares_w_geo(self):
 
-        from domain import Domain
-        from geospatial_data.geospatial_data import Geospatial_data
-        from coordinate_transforms.geo_reference import Geo_reference
-        from least_squares import fit_to_mesh
 
         #Mesh
@@ -389 +387 @@
         quantity.vertex_values[:] = 0.0
 
-        from geospatial_data.geospatial_data import Geospatial_data
         geo = Geospatial_data(data_points, z, data_georef)
 
@@ -452 +449 @@
 
         #Mesh in zone 56 (absolute coords)
-        from domain import Domain
-        from coordinate_transforms.geo_reference import Geo_reference
 
         x0 = 314036.58727982
@@ -528 +523 @@
 
         #Mesh in zone 56 (relative coords)
-        from domain import Domain
-        from coordinate_transforms.geo_reference import Geo_reference
 
         x0 = 314036.58727982