Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maartenflippo merged 1 commit into from
Nov 17, 2025
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions pumpkin-crates/core/src/engine/conflict_analysis/resolvers/resolution_resolver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
}

Expand Down
2 changes: 2 additions & 0 deletions pumpkin-crates/core/src/engine/constraint_satisfaction_solver.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down