fix(pumpkin-core): Declare solving after conflict resolution (#317)

maartenflippo · web-flow · commit 48245670d15b · 2025-11-17T17:09:36.000+01:00
diff --git a/pumpkin-crates/core/src/engine/conflict_analysis/resolvers/resolution_resolver.rs b/pumpkin-crates/core/src/engine/conflict_analysis/resolvers/resolution_resolver.rs
@@ -125,8 +125,6 @@ impl ConflictResolver for ResolutionResolver {
             .add_term(learned_nogood.predicates.len() as u64);
 
         self.add_learned_nogood(context, learned_nogood, inference_code);
-
-        context.solver_state.declare_solving();
     }
 }
 
diff --git a/pumpkin-crates/core/src/engine/constraint_satisfaction_solver.rs b/pumpkin-crates/core/src/engine/constraint_satisfaction_solver.rs
@@ -845,6 +845,8 @@ impl ConstraintSatisfactionSolver {
 
         self.conflict_resolver
             .resolve_conflict(&mut conflict_analysis_context);
+
+        self.state.declare_solving();
     }
 
     /// Performs a restart during the search process; it is only called when it has been determined

Original file line number	Diff line number	Diff line change
`@@ -125,8 +125,6 @@ impl ConflictResolver for ResolutionResolver {`
`125`	`125`	`.add_term(learned_nogood.predicates.len() as u64);`
`126`	`126`
`127`	`127`	`self.add_learned_nogood(context, learned_nogood, inference_code);`
`128`		`-`
`129`		`- context.solver_state.declare_solving();`
`130`	`128`	`}`
`131`	`129`	`}`
`132`	`130`
Original file line number	Diff line number	Diff line change
`@@ -845,6 +845,8 @@ impl ConstraintSatisfactionSolver {`
`845`	`845`
`846`	`846`	`self.conflict_resolver`
`847`	`847`	`.resolve_conflict(&mut conflict_analysis_context);`
	`848`	`+`
	`849`	`+ self.state.declare_solving();`
`848`	`850`	`}`
`849`	`851`
`850`	`852`	`/// Performs a restart during the search process; it is only called when it has been determined`