Changeset 2184

Timestamp:

Jan 4, 2006, 3:29:14 PM (17 years ago)

Author:

duncan

Message:

writing results to file

Location:

inundation/fit_interpolate

Files:

• benchmark_least_squares.py (modified) (9 diffs)
• run_long_benchmark.py (added)

inundation/fit_interpolate/benchmark_least_squares.py

@@ -11 +11 @@
    test results.
    
-   Ole Nielsen, Stephen Roberts, Duncan Gray, Christopher Zoppou
+   Duncan Gray
    Geoscience Australia, 2004.
 """
@@ -56 +56 @@
               maxArea=1000,
               max_points_per_cell=4,
+              is_fit=True,
               save=False):
+        '''
+        num_of_points 
+        '''
+        
         #print "num_of_points",num_of_points
         #print "maxArea",maxArea
@@ -65 +70 @@
         m = Mesh()
         m.addUserVertex(0,0)
-        m.addUserVertex(100,0)
-        m.addUserVertex(0,100)
-        m.addUserVertex(100,100)
+        m.addUserVertex(1.0,0)
+        m.addUserVertex(0,1.0)
+        m.addUserVertex(1.0,1.0)
         
         m.autoSegment(alpha = 100 )
         
         dict = {}
-        dict['points'] = [[10,10],[90,20]]
+        dict['points'] = [[.10,.10],[.90,.20]]
         dict['segments'] = [[0,1]] 
         dict['segment_tags'] = ['wall1']   
@@ -78 +83 @@
     
         dict = {}
-        dict['points'] = [[10,90],[40,20]]
+        dict['points'] = [[.10,.90],[.40,.20]]
         dict['segments'] = [[0,1]] 
         dict['segment_tags'] = ['wall2']   
@@ -84 +89 @@
         
         dict = {}
-        dict['points'] = [[20,90],[60,60]]
+        dict['points'] = [[.20,.90],[.60,.60]]
         dict['segments'] = [[0,1]] 
         dict['segment_tags'] = ['wall3'] 
@@ -90 +95 @@
         
         dict = {}
-        dict['points'] = [[60,20],[90,90]]
+        dict['points'] = [[.60,.20],[.90,.90]]
         dict['segments'] = [[0,1]] 
         dict['segment_tags'] = ['wall4']   
@@ -99 +104 @@
             m.export_mesh_file("aaaa.tsh")
         mesh_dict =  m.Mesh2IOTriangulationDict()
-
+        #print "mesh_dict",mesh_dict
         points = []
         point_atts = []
+        vertex_atts = []
+
+              
+            
         for point in range(num_of_points):
             points.append([random()*100, random()*100])
             point_atts.append(10.0)
+
+        # There has to be a better way of doing this..
+        for vertex in mesh_dict['vertices']:
+            vertex_atts.append(10.0)
             
         #Initial time and memory
@@ -116 +129 @@
                                verbose = False,
                                max_points_per_cell = 4)
-        calc = interp.fit_points(point_atts )
-        #print "interp.expanded_quad_searches", interp.expanded_quad_searches
-        #print "calc", calc
+        if is_fit is True:
+            calc = interp.fit_points(point_atts)
+
+        else:
+            # run an interploate problem.
+            print "Interpolate!"
+            calc = interp.interpolate(vertex_atts)
+            
         time_taken_sec = (time.time()-t0)
         m1 = mem_usage()
@@ -126 +144 @@
             memory_used = (m1 - m0)
         #print 'That took %.2f seconds' %time_taken_sec
-        return time_taken_sec, memory_used
+        return time_taken_sec, memory_used, len(mesh_dict['triangles'])