From 84840bb1ddc8e92e2266a8f39b45598e87802fe4 Mon Sep 17 00:00:00 2001 From: Maarten Flippo Date: Mon, 17 Nov 2025 16:35:36 +0100 Subject: [PATCH] fix(pumpkin-core): Declare solving after conflict resolution --- .../engine/conflict_analysis/resolvers/resolution_resolver.rs | 2 -- .../core/src/engine/constraint_satisfaction_solver.rs | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 1b8143d76..4f85187c3 100644 --- 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 index 93ad459b9..5f8c431c1 100644 --- 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