Changeset 2754


Ignore:
Timestamp:
Apr 24, 2006, 2:28:11 PM (18 years ago)
Author:
duncan
Message:

fixing imports that were breaking tests

Location:
inundation/pyvolution
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • inundation/pyvolution/least_squares.py

    r2753 r2754  
    195195
    196196    """
    197     print "in fit_to_mesh **"
    198197    if use_cache is True:
    199198        from caching.caching import cache
     
    221220                               precrop = precrop)
    222221
    223     print "id(Interpolation)",id(Interpolation)
    224222    vertex_attributes = interp.fit_points(point_attributes, verbose = verbose)
    225223
  • inundation/pyvolution/quantity.py

    r2683 r2754  
    619619        from Numeric import Float
    620620        from utilities.numerical_tools import ensure_numeric
    621         from least_squares import fit_to_mesh
     621        from pyvolution.least_squares import fit_to_mesh
    622622        from coordinate_transforms.geo_reference import Geo_reference
    623623
  • inundation/pyvolution/test_quantity.py

    r2650 r2754  
    99from Numeric import allclose, array, ones, Float
    1010
     11from pyvolution.least_squares import fit_to_mesh               
     12from domain import Domain
     13from geospatial_data.geospatial_data import Geospatial_data
     14from coordinate_transforms.geo_reference import Geo_reference
    1115
    1216#Aux for least_squares example
     
    280284    def test_set_values_using_least_squares(self):
    281285
    282         from geospatial_data.geospatial_data import Geospatial_data
    283286
    284287        quantity = Quantity(self.mesh4)
     
    312315
    313316        #Now try by setting the same values directly
    314         from least_squares import fit_to_mesh
    315317        vertex_attributes = fit_to_mesh(quantity.domain.coordinates,
    316318                                        quantity.domain.triangles,
     
    330332    def test_test_set_values_using_least_squares_w_geo(self):
    331333
    332         from domain import Domain
    333         from geospatial_data.geospatial_data import Geospatial_data
    334         from coordinate_transforms.geo_reference import Geo_reference
    335         from least_squares import fit_to_mesh
    336334
    337335        #Mesh
     
    389387        quantity.vertex_values[:] = 0.0
    390388
    391         from geospatial_data.geospatial_data import Geospatial_data
    392389        geo = Geospatial_data(data_points, z, data_georef)
    393390
     
    452449
    453450        #Mesh in zone 56 (absolute coords)
    454         from domain import Domain
    455         from coordinate_transforms.geo_reference import Geo_reference
    456451
    457452        x0 = 314036.58727982
     
    528523
    529524        #Mesh in zone 56 (relative coords)
    530         from domain import Domain
    531         from coordinate_transforms.geo_reference import Geo_reference
    532525
    533526        x0 = 314036.58727982
Note: See TracChangeset for help on using the changeset viewer.