run again with updated script (#64)

src/bulk.log

@@ -229,3 +229,161 @@ Running Greedy planner
 Greedy plan successfully created, saving plan and stats
 Running Zone Blocking planner
 Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model Ernesto_Che_Guevara_in_style_Voronoi-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model 4WD_Shift_collar_-_Scaled-ascii
+----
+Reading Gcode file
+Running Dec-MCTS planner
+FAILED TO COMPLETE DEC_MCTS ON MODEL 4WD_Shift_collar_-_Scaled-ascii
+Dec-MCTS plan successfully created, saving plan and stats
+SKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model Base_145x145mm_12holes-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model bp_FJ6309_BP23248_FMA52740_Ethmoid_fixed-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullyRunning Greedy planner
+Greedy plan successfully created, saving plan and stats
+Running Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model entrapment2
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model finalraptornormaltail-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullyRunning Greedy planner
+Greedy plan successfully created, saving plan and stats
+Running Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model four_screws-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model ir_sensor_main-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model Kitchen_sponge_holder_small-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model mano_derch_right_hand-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model NEW_CORNER-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model orb_half_2-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model plannet_X_3
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model prop_v2-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model repaird_version._if_given_instructions_give_errors_3D_printed_Marble_Machine_2-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model Skulptur_012-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model Top-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model V1_Front
+----
+Reading Gcode file
+Running Dec-MCTS planner
+Dec-MCTS plan successfully created, saving plan and stats
+SKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model wind_wheel
+----
+Reading Gcode file
+Running Dec-MCTS planner
+Dec-MCTS plan successfully created, saving plan and stats
+SKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model zaa-ascii
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats
+
+####################################
+Runnning for model flexirex
+----
+Reading Gcode file
+SKIPPING DECMCTS: Already completed successfullySKIPPING GREEDY: Already completed successfullyRunning Zone Blocking planner
+Zone blocking plan successfully created, saving plan and stats

src/bulk_test.py

@@ -35,7 +35,7 @@ def batch_run(
     env_desc2 = tu.read_env('calibrations/r1_tforms.yaml',
                             'calibrations/r2_tforms.yaml')
     env = tu.SimEnv(env_desc=env_desc2, gui=False, home=home)
-    stats = {}
+    stats = prev_stats
 
     for model in models:
 
@@ -82,6 +82,7 @@ def batch_run(
                     r-=1
         else:
             notes.write("SKIPPING DECMCTS: Already completed successfully")
+            print("SKIPPING DECMCTS for {}".format(model))
 
 
         if not only_complete or \
@@ -117,6 +118,7 @@ def batch_run(
                     r-=1
         else:
             notes.write("SKIPPING GREEDY: Already completed successfully")
+            print("SKIPPING GREEDY for {}".format(model))
 
         if not only_complete or \
                 model not in prev_stats or \
@@ -151,6 +153,8 @@ def batch_run(
                     r-=1
         else:
             notes.write("SKIPPING ZONEBLOCKING: Already completed successfully")
+            print("SKIPPING ZONEBLOCKING for {}".format(model))
+
 
     stat_file.write(yaml.dump(stats))
     notes.close()
@@ -209,11 +213,11 @@ if __name__ == '__main__':
 
         for i in range(len(models)):
             models[i] = models[i][:-1]
-   # batch_run(
-   #     models,
-   #     'bulk.log',
-   #     'bulk.stats',
-   #     'plans',
-   #     50,
-   #     2000)
-    plot_comparison("bulk.stats")
+    batch_run(
+        models,
+        'bulk.log',
+        'bulk.stats',
+        'plans',
+        50,
+        2000)
+    #plot_comparison("bulk.stats")