Skip to content

fix(pumpkin-core): Creation and Insertion in Sparse Set #395

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

Open
maartenflippo wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(pumpkin-core): Creation and Insertion in Sparse Set #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1e51140
Add test case for removal in sparse set
maartenflippo Mar 24, 2026
2a2a473
fix: bug in insertion method of sparse set
ImkoMarijnissen Mar 24, 2026
dd7fe8a
refactor: calculate range of values to use based on indices
ImkoMarijnissen Mar 25, 2026
1591d54
feat: add method for types implementing StorageKey
ImkoMarijnissen Mar 27, 2026
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
3 changes: 1 addition & 2 deletions pumpkin-crates/conflict-resolvers/src/minimisers/semantic_minimiser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,10 @@ create_statistics_struct!(SemanticMinimiserStatistics {

impl Default for SemanticMinimiser {
fn default() -> Self {
let mapping = |x: &DomainId| x.id() as usize;
Self {
original_domains: Default::default(),
domains: Default::default(),
present_ids: SparseSet::new(vec![], mapping),
present_ids: SparseSet::new(vec![]),
helper: Vec::default(),
mode: SemanticMinimisationMode::EnableEqualityMerging,
statistics: SemanticMinimiserStatistics::default(),
Expand Down
5 changes: 1 addition & 4 deletions pumpkin-crates/core/src/branching/variable_selection/random.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ use super::VariableSelector;
use crate::branching::BrancherEvent;
use crate::branching::SelectionContext;
use crate::containers::SparseSet;
use crate::containers::StorageKey;
use crate::variables::DomainId;

/// A [`VariableSelector`] which selects a random unfixed variable.
Expand All @@ -15,9 +14,7 @@ impl RandomSelector {
pub fn new(variables: impl IntoIterator<Item = DomainId>) -> Self {
// Note the -1 due to the fact that the indices of the domain ids start at 1
Self {
variables: SparseSet::new(variables.into_iter().collect(), |element| {
element.index() - 1
}),
variables: SparseSet::new(variables.into_iter().collect()),
}
}

Expand Down
Loading
Loading