Changeset 4596

Timestamp:

Jul 6, 2007, 10:33:08 AM (17 years ago)

Author:

duncan

Message:

benchmarking fit

Location:

anuga_core/source/anuga/fit_interpolate

Files:

• benchmark_least_squares.py (modified) (5 diffs)
• run_long_benchmark.py (modified) (2 diffs)
• ticket178_benchmark.py (added)

anuga_core/source/anuga/fit_interpolate/benchmark_least_squares.py

@@ -68 +68 @@
               use_least_squares=False,
               use_file_type=None,
+              blocking_len=500000,
+              segments_in_mesh=True,
               save=False,
               verbose=False):
@@ -79 +81 @@
 
         mesh_dict = self._build_regular_mesh_dict(maxArea=maxArea,
+                                                  is_segments=segments_in_mesh,
                                                   save=save)
         points_dict = self._build_points_dict(num_of_points=num_of_points)
@@ -130 +133 @@
                 calc = interp.interpolate(mesh_dict['vertex_attributes']
                                           ,points_dict['points']
-                                          ,start_blocking_len = 500000)
+                                          ,start_blocking_len=blocking_len)
             
         time_taken_sec = (time.time()-t0)
@@ -143 +146 @@
     def _build_regular_mesh_dict(self,
                                  maxArea=1000,
+                                 is_segments=True,
                                  save=False):
-      # make a mesh
+      # make a normalised mesh
         # pretty regular size, with some segments thrown in. 
         m = Mesh()
@@ -153 +157 @@
         
         m.auto_segment(alpha = 100 )
-        
-        dict = {}
-        dict['points'] = [[.10,.10],[.90,.20]]
-        dict['segments'] = [[0,1]] 
-        dict['segment_tags'] = ['wall1']   
-        m.addVertsSegs(dict)
+
+        if is_segments:
+            dict = {}
+            dict['points'] = [[.10,.10],[.90,.20]]
+            dict['segments'] = [[0,1]] 
+            dict['segment_tags'] = ['wall1']   
+            m.addVertsSegs(dict)
     
-        dict = {}
-        dict['points'] = [[.10,.90],[.40,.20]]
-        dict['segments'] = [[0,1]] 
-        dict['segment_tags'] = ['wall2']   
-        m.addVertsSegs(dict)
-        
-        dict = {}
-        dict['points'] = [[.20,.90],[.60,.60]]
-        dict['segments'] = [[0,1]] 
-        dict['segment_tags'] = ['wall3'] 
-        m.addVertsSegs(dict)
-        
-        dict = {}
-        dict['points'] = [[.60,.20],[.90,.90]]
-        dict['segments'] = [[0,1]] 
-        dict['segment_tags'] = ['wall4']   
-        m.addVertsSegs(dict)
-
-        m.generateMesh(mode = "Q", maxArea = maxArea)       
+            dict = {}
+            dict['points'] = [[.10,.90],[.40,.20]]
+            dict['segments'] = [[0,1]] 
+            dict['segment_tags'] = ['wall2']   
+            m.addVertsSegs(dict)
+        
+            dict = {}
+            dict['points'] = [[.20,.90],[.60,.60]]
+            dict['segments'] = [[0,1]] 
+            dict['segment_tags'] = ['wall3'] 
+            m.addVertsSegs(dict)
+        
+            dict = {}
+            dict['points'] = [[.60,.20],[.90,.90]]
+            dict['segments'] = [[0,1]] 
+            dict['segment_tags'] = ['wall4']   
+            m.addVertsSegs(dict)
+
+        m.generateMesh(mode = "Q", maxArea = maxArea, minAngle=20.0)       
         if save is True:
             m.export_mesh_file("aaaa.tsh")

anuga_core/source/anuga/fit_interpolate/run_long_benchmark.py

@@ -12 +12 @@
 ben = BenchmarkLeastSquares()
 
-ofile = 'lbm_results.txt'
+ofile = 'lbm_results.csv'
 delimiter = ','
 
 use_least_squares_list = [False]
 is_fit_list = [True]
-#num_of_points_list = [10]
-#maxArea_list = [0.1, 0.001]
-num_of_points_list = [10000, 100000] #, 10000, 100000] #, 10000000]
-maxArea_list = [0.1, 0.01, 0.001] #, 0.00001, 0.0000001]
+num_of_points_list = [50, 500] #, 10000, 100000] #, 10000000]
+maxArea_list = [0.5, 0.055, 0.06] #, 0.00001, 0.0000001]
 max_points_per_cell_list = [8]
 use_file_type_list = [None,'txt', 'pts']
@@ -47 +45 @@
                                                    ,max_points_per_cell=max_points_per_cell
                                                    ,is_fit=is_fit
+                                                   ,segments_in_mesh=False
                                                    ,use_file_type=use_file_type
+                                                   ,save=True
                                                )
                     print "time",time