diff --git a/solution_search.py b/solution_search.py index 35ff07bad3c04adb85ba7847f3c0c14b1a43e2e5..c91fd13eed72ddc4adc5f71a30b8753de7549de4 100644 --- a/solution_search.py +++ b/solution_search.py @@ -154,13 +154,15 @@ def main2(chart_file, cam_file, cam_step_file, cam_complete_file, cam_strong_fil # Frontier places asked previous_frontier_places = set() + current_start_prop = start_prop # i = 0 # with PyCallGraph(output=GraphvizOutput()): while True: + print("START PROP:", current_start_prop) ret = \ find_mac(mcla, cam_file, cam_step_file, cam_complete_file, - steps, final_prop, start_prop, inv_prop) + steps, final_prop, current_start_prop, inv_prop) # EXIT # i += 1 # if i == 3: @@ -178,8 +180,8 @@ def main2(chart_file, cam_file, cam_step_file, cam_complete_file, cam_strong_fil str(previous_frontier_places)) # Compute the formula of the next start_property - start_prop = make_logical_formula(previous_frontier_places, - start_prop) + current_start_prop = make_logical_formula(previous_frontier_places, + start_prop) # If all_macs flag is not set (to True), # search allways macs with less or equal steps than previous, @@ -191,7 +193,10 @@ def main2(chart_file, cam_file, cam_step_file, cam_complete_file, cam_strong_fil LOGGER.debug( final_prop + - ":: Next start_prop formula: {} in {} steps".format(start_prop, steps) + ":: Next start_prop formula: {} in {} steps".format( + current_start_prop, + steps + ) )