Changeset 2563 for inundation/fit_interpolate/run_long_benchmark.py

Timestamp:

Mar 21, 2006, 10:58:32 AM (18 years ago)

Author:

duncan

Message:

get interpolate tests running in test_all

File:

• inundation/fit_interpolate/run_long_benchmark.py (modified) (3 diffs)

inundation/fit_interpolate/run_long_benchmark.py

@@ -7 +7 @@
 delimiter = ','
 
-is_fit_list = [True, False]
-num_of_points_list = [10, 1000, 100000, 10000000]
-maxArea_list = [0.1, 0.001, 0.00001, 0.0000001]
+use_least_squares_list = [True,False]
+is_fit_list = [False]
+num_of_points_list = [10]
+maxArea_list = [0.1, 0.001]
+#num_of_points_list = [10, 1000, 100000, 10000000]
+#maxArea_list = [0.1, 0.001, 0.00001, 0.0000001]
 max_points_per_cell_list = [8]
 
@@ -15 +18 @@
 # write the title line
 
-fd.write("num_of_points" + delimiter +
+fd.write("use_least_squares" + delimiter +
+    "num_of_points" + delimiter +
          "maxArea" + delimiter +
          "num_of_triangles" + delimiter +
@@ -23 +27 @@
          "time" + delimiter + "\n")
 
-for is_fit in is_fit_list:
-    for num_of_points in num_of_points_list:
-        for maxArea in maxArea_list:
-            for max_points_per_cell in max_points_per_cell_list:
+
+for use_least_squares in use_least_squares_list:
+    for is_fit in is_fit_list:
+        for num_of_points in num_of_points_list:
+            for maxArea in maxArea_list:
+                for max_points_per_cell in max_points_per_cell_list:
     
-                time, mem, num_tri = ben.trial(num_of_points=num_of_points
-                                      ,maxArea=maxArea
-                                      ,max_points_per_cell=max_points_per_cell
-                                      ,is_fit=is_fit
-                                      )
-                print "time",time
-                print "mem", mem
-                fd.write(str(is_fit) + delimiter +
-                         str(num_of_points) + delimiter +
-                         str(maxArea) + delimiter +
-                         str(num_tri) + delimiter +
-                         str(max_points_per_cell) + delimiter +
-                         str(mem)  + delimiter +
-                         str(time) + delimiter + "\n")
+                    time, mem, num_tri = ben.trial(num_of_points=num_of_points
+                                                   ,maxArea=maxArea
+                                                   ,max_points_per_cell=max_points_per_cell
+                                                   ,is_fit=is_fit
+                                                   ,use_least_squares=use_least_squares
+                                               )
+                    print "time",time
+                    print "mem", mem
+                    fd.write(str(use_least_squares) + delimiter +
+                             str(is_fit) + delimiter +
+                             str(num_of_points) + delimiter +
+                             str(maxArea) + delimiter +
+                             str(num_tri) + delimiter +
+                             str(max_points_per_cell) + delimiter +
+                             str(mem)  + delimiter +
+                             str(time) + delimiter + "\n")
 fd.close()