Skip to content

Commit

Permalink
tiny changes
Browse files Browse the repository at this point in the history
  • Loading branch information
shnarazk committed Feb 7, 2025
1 parent 54b482e commit 57ebd09
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 9 deletions.
10 changes: 10 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
## 0.18.0, 2025-0X-XX

- Remove feature 'incremental_solver'
- Remove feature 'EVSIDS'
- Use `static mut` vars. So splr is non-thread-safe now.

## 0.17.6, 2025-02-01

- Fix a f64 sorting bug again

## 0.17.5, 2025-01-28

- Fix a f64 sorting bug

## 0.17.4, 2025-01-28

Expand Down
12 changes: 3 additions & 9 deletions src/cdb/db.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ use std::{fs::File, io::Write, path::Path};
#[derive(Clone, Debug)]
pub struct ClauseDB {
/// container of clauses
pub(crate) clause: Vec<Clause>,
pub(super) clause: Vec<Clause>,
/// hashed representation of binary clauses.
///## Note
/// This means a biclause \[l0, l1\] is stored at bi_clause\[l0\] instead of bi_clause\[!l0\].
///
binary_link: BinaryLinkDB,
/// container of watch literals
pub(crate) watch_cache: Vec<WatchCache>,
pub(super) watch_cache: Vec<WatchCache>,
/// collected free clause ids.
freelist: Vec<ClauseId>,
/// see unsat_certificate.rs
Expand All @@ -44,7 +44,7 @@ pub struct ClauseDB {

// bi-clause completion
bi_clause_completion_queue: Vec<Lit>,
pub(crate) num_bi_clause_completion: usize,
pub(super) num_bi_clause_completion: usize,

//
//## clause rewarding
Expand Down Expand Up @@ -86,11 +86,6 @@ pub struct ClauseDB {
pub(crate) lb_entanglement: Ema2,
/// cutoff value used in the last `reduce`
pub(crate) reduction_threshold: f64,

//
//## incremental solving
//
pub eliminated_permanent: Vec<Vec<Lit>>,
}

impl Default for ClauseDB {
Expand Down Expand Up @@ -125,7 +120,6 @@ impl Default for ClauseDB {
num_reregistration: 0,
lb_entanglement: Ema2::new(1_000).with_slow(80_000).with_value(2.0),
reduction_threshold: 0.0,
eliminated_permanent: Vec::new(),
}
}
}
Expand Down

0 comments on commit 57ebd09

Please sign in to comment.