Changeset 4211

Timestamp:

Feb 5, 2007, 11:03:29 AM (18 years ago)

Author:

duncan

Message:

focus on loading files

Location:

anuga_core/source/anuga/fit_interpolate

Files:

• benchmark_least_squares.py (modified) (5 diffs)
• run_long_benchmark.py (modified) (3 diffs)

anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py

@@ -20 +20 @@
 import time
 from random import seed, random
-
-from anuga.pyvolution.least_squares import Interpolation
+import tempfile
+
 from anuga.fit_interpolate.interpolate import Interpolate
 from anuga.fit_interpolate.fit import Fit
 from anuga.pmesh.mesh import Mesh
+from anuga.geospatial_data.geospatial_data import Geospatial_data
 
 def mem_usage():
@@ -49 +50 @@
 
 class BenchmarkLeastSquares:
-"""
-"""
-
-"""
-
-Note(DSG-DSG): If you are interested in benchmarking fitting, before
-and after blocking O:\1\dgray\before_blocking_subsandpit is before blocking
-
-"""
+
+    """
+
+    Note(DSG-DSG): If you are interested in benchmarking fitting, before
+    and after blocking O:\1\dgray\before_blocking_subsandpit is before blocking
+
+    """
 
     def __init__(self):
@@ -67 +66 @@
               max_points_per_cell=4,
               is_fit=True,
-              use_least_squares=True,
+              use_least_squares=False,
+              use_file_type=None,
               save=False):
         '''
@@ -87 +87 @@
 
         if use_least_squares is True:
+            from anuga.where.least_squares import Interpolation
             interp = Interpolation(mesh_dict['vertices'],
                                    mesh_dict['triangles'],
@@ -107 +108 @@
                                  max_vertices_per_cell = max_points_per_cell)
                 print "Fit in Fit"
-                calc = interp.fit(points_dict['points'],
-                                  points_dict['point_attributes'])
+                if use_file_type == None:
+                    calc = interp.fit(points_dict['points'],
+                                      points_dict['point_attributes'])
+                else:
+                    #check that the type
+                    fileName = tempfile.mktemp("." + use_file_type)
+                    G1 = Geospatial_data(points_dict['points'],
+                                         points_dict['point_attributes'])
+                    G1.export_points_file(fileName, absolute=True)
+                    calc = interp.fit(fileName)
+                    os.remove(fileName)
+                    
             else:
                 # run an interploate problem.

anuga_core/source/anuga/fit_interpolate/run_long_benchmark.py

@@ -15 +15 @@
 delimiter = ','
 
-use_least_squares_list = [True,False]
+use_least_squares_list = [False]
 is_fit_list = [True]
 #num_of_points_list = [10]
 #maxArea_list = [0.1, 0.001]
-num_of_points_list = [10, 100, 10000, 100000] #, 10000000]
-maxArea_list = [0.1, 0.001, 0.00001, 0.0000001]
+num_of_points_list = [10, 100] #, 10000, 100000] #, 10000000]
+maxArea_list = [0.1, 0.001] #, 0.00001, 0.0000001]
 max_points_per_cell_list = [8]
+use_file_type_list = [None,'txt']
 
 fd = open(ofile,'a')
 # write the title line
 
-fd.write("use_least_squares" + delimiter +
+fd.write("use_file_type" + delimiter +
     "num_of_points" + delimiter +
          "maxArea" + delimiter +
@@ -36 +37 @@
 
 
-for use_least_squares in use_least_squares_list:
+for use_file_type in use_file_type_list:
     for is_fit in is_fit_list:
         for num_of_points in num_of_points_list:
@@ -46 +47 @@
                                                    ,max_points_per_cell=max_points_per_cell
                                                    ,is_fit=is_fit
-                                                   ,use_least_squares=use_least_squares
+                                                   ,use_file_type=use_file_type
                                                )
                     print "time",time
                     print "mem", mem
-                    fd.write(str(use_least_squares) + delimiter +
+                    fd.write(str(use_file_type) + delimiter +
                              str(is_fit) + delimiter +
                              str(num_of_points) + delimiter +