Skip to content

Commit 584be63

Browse files
Bug fix, ensure solver values are updated when current frame is solved.
Issue #222
1 parent d444f5a commit 584be63

1 file changed

Lines changed: 15 additions & 16 deletions

File tree

python/mmSolver/tools/solver/lib/collection.py

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -471,18 +471,18 @@ def compile_collection(col, prog_fn=None):
471471
frame = mmapi.Frame(frame_num)
472472
sol.set_use_single_frame(True)
473473
sol.set_single_frame(frame)
474-
sol_list.append(sol)
475474
else:
476475
by_frame = col_state.get_solver_increment_by_frame_from_collection(col)
477476
frame_string = col_state.get_solver_frames_from_collection(col)
478477
frame_nums = __compile_frame_list(range_type, frame_string, by_frame)
479478
frames = [mmapi.Frame(f) for f in frame_nums]
480479
sol.set_frame_list(frames)
481-
eval_obj_relations = col_state.get_solver_eval_object_relationships_from_collection(col)
482-
eval_complex_graphs = col_state.get_solver_eval_complex_graphs_from_collection(col)
483-
sol.set_eval_object_relationships(eval_obj_relations)
484-
sol.set_eval_complex_graphs(eval_complex_graphs)
485-
sol_list.append(sol)
480+
481+
eval_obj_relations = col_state.get_solver_eval_object_relationships_from_collection(col)
482+
eval_complex_graphs = col_state.get_solver_eval_complex_graphs_from_collection(col)
483+
sol.set_eval_object_relationships(eval_obj_relations)
484+
sol.set_eval_complex_graphs(eval_complex_graphs)
485+
sol_list.append(sol)
486486

487487
elif solver_tab == const.SOLVER_TAB_STANDARD_VALUE:
488488
sol = mmapi.SolverStandard()
@@ -492,7 +492,6 @@ def compile_collection(col, prog_fn=None):
492492
frame = mmapi.Frame(frame_num)
493493
sol.set_use_single_frame(True)
494494
sol.set_single_frame(frame)
495-
sol_list.append(sol)
496495
else:
497496
# Frame numbers
498497
by_frame = col_state.get_solver_increment_by_frame_from_collection(col)
@@ -512,15 +511,15 @@ def compile_collection(col, prog_fn=None):
512511
sol.set_root_frame_list(root_frames)
513512
sol.set_frame_list(frames)
514513

515-
global_solve = col_state.get_solver_global_solve_from_collection(col)
516-
only_root = col_state.get_solver_only_root_frames_from_collection(col)
517-
eval_obj_relations = col_state.get_solver_eval_object_relationships_from_collection(col)
518-
eval_complex_graphs = col_state.get_solver_eval_complex_graphs_from_collection(col)
519-
sol.set_global_solve(global_solve)
520-
sol.set_only_root_frames(only_root)
521-
sol.set_eval_object_relationships(eval_obj_relations)
522-
sol.set_eval_complex_graphs(eval_complex_graphs)
523-
sol_list.append(sol)
514+
global_solve = col_state.get_solver_global_solve_from_collection(col)
515+
only_root = col_state.get_solver_only_root_frames_from_collection(col)
516+
eval_obj_relations = col_state.get_solver_eval_object_relationships_from_collection(col)
517+
eval_complex_graphs = col_state.get_solver_eval_complex_graphs_from_collection(col)
518+
sol.set_global_solve(global_solve)
519+
sol.set_only_root_frames(only_root)
520+
sol.set_eval_object_relationships(eval_obj_relations)
521+
sol.set_eval_complex_graphs(eval_complex_graphs)
522+
sol_list.append(sol)
524523

525524
elif solver_tab.lower() == const.SOLVER_TAB_LEGACY_VALUE:
526525
step_list = get_solver_steps_from_collection(col)

0 commit comments

Comments
 (0)