mirror of
https://github.com/ellmau/adf-obdd.git
synced 2025-12-19 09:29:36 +01:00
Add NoGood and NoGoodStore (#65)
* Add NoGood and NoGoodStore with basic functionality
This commit is contained in:
parent
c29db9a6aa
commit
9d0845c740
24
Cargo.lock
generated
24
Cargo.lock
generated
@ -14,6 +14,7 @@ dependencies = [
|
||||
"nom",
|
||||
"quickcheck",
|
||||
"quickcheck_macros",
|
||||
"roaring",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"test-log",
|
||||
@ -147,6 +148,12 @@ dependencies = [
|
||||
"regex-automata",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "bytemuck"
|
||||
version = "1.9.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cdead85bdec19c194affaeeb670c0e41fe23de31459efd1c174d049269cf02cc"
|
||||
|
||||
[[package]]
|
||||
name = "byteorder"
|
||||
version = "1.4.3"
|
||||
@ -718,6 +725,23 @@ dependencies = [
|
||||
"winapi",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "retain_mut"
|
||||
version = "0.1.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4389f1d5789befaf6029ebd9f7dac4af7f7e3d61b69d4f30e2ac02b57e7712b0"
|
||||
|
||||
[[package]]
|
||||
name = "roaring"
|
||||
version = "0.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dd539cab4e32019956fe7e0cf160bb6d4802f4be2b52c4253d76d3bb0f85a5f7"
|
||||
dependencies = [
|
||||
"bytemuck",
|
||||
"byteorder",
|
||||
"retain_mut",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ryu"
|
||||
version = "1.0.9"
|
||||
|
||||
@ -30,6 +30,7 @@ serde = { version = "1.0", features = ["derive","rc"] }
|
||||
serde_json = "1.0"
|
||||
biodivine-lib-bdd = "0.4.0"
|
||||
derivative = "2.2.0"
|
||||
roaring = "0.9.0"
|
||||
|
||||
[dev-dependencies]
|
||||
test-log = "0.2"
|
||||
|
||||
@ -182,6 +182,7 @@ pub mod adfbiodivine;
|
||||
pub mod datatypes;
|
||||
pub mod obdd;
|
||||
pub mod parser;
|
||||
pub mod nogoods;
|
||||
#[cfg(test)]
|
||||
mod test;
|
||||
//pub mod obdd2;
|
||||
|
||||
448
lib/src/nogoods.rs
Normal file
448
lib/src/nogoods.rs
Normal file
@ -0,0 +1,448 @@
|
||||
//! Collection of all nogood-related structures.
|
||||
|
||||
use std::{
|
||||
borrow::Borrow,
|
||||
ops::{BitAnd, BitOr, BitXor},
|
||||
};
|
||||
|
||||
use crate::datatypes::Term;
|
||||
use roaring::RoaringBitmap;
|
||||
|
||||
/// Representation of a nogood by a pair of [Bitmaps][RoaringBitmap]
|
||||
#[derive(Debug, Default, Clone)]
|
||||
pub struct NoGood {
|
||||
active: RoaringBitmap,
|
||||
value: RoaringBitmap,
|
||||
}
|
||||
|
||||
impl Eq for NoGood {}
|
||||
impl PartialEq for NoGood {
|
||||
fn eq(&self, other: &Self) -> bool {
|
||||
self.active
|
||||
.borrow()
|
||||
.bitxor(other.active.borrow())
|
||||
.is_empty()
|
||||
&& self.value.borrow().bitxor(other.value.borrow()).is_empty()
|
||||
}
|
||||
}
|
||||
|
||||
impl NoGood {
|
||||
/// Creates a [NoGood] from a given Vector of [Terms][Term].
|
||||
pub fn from_term_vec(term_vec: &[Term]) -> NoGood {
|
||||
let mut result = Self::default();
|
||||
term_vec.iter().enumerate().for_each(|(idx, val)| {
|
||||
let idx:u32 = idx.try_into().expect("no-good learner implementation is based on the assumption that only u32::MAX-many variables are in place");
|
||||
if val.is_truth_value() {
|
||||
result.active.insert(idx);
|
||||
if val.is_true() {
|
||||
result.value.insert(idx);
|
||||
}
|
||||
}
|
||||
});
|
||||
result
|
||||
}
|
||||
|
||||
/// Returns [None] if the pair contains inconsistent pairs.
|
||||
/// Otherwise it returns a [NoGood] which represents the set values.
|
||||
pub fn try_from_pair_iter(
|
||||
pair_iter: &mut impl Iterator<Item = (usize, bool)>,
|
||||
) -> Option<NoGood> {
|
||||
let mut result = Self::default();
|
||||
let mut visit = false;
|
||||
for (idx, val) in pair_iter {
|
||||
visit = true;
|
||||
let idx:u32 = idx.try_into().expect("no-good learner implementation is based on the assumption that only u32::MAX-many variables are in place");
|
||||
let is_new = result.active.insert(idx);
|
||||
let upd = if val {
|
||||
result.value.insert(idx)
|
||||
} else {
|
||||
result.value.remove(idx)
|
||||
};
|
||||
// if the state is not new and the value is changed
|
||||
if !is_new && upd {
|
||||
return None;
|
||||
}
|
||||
}
|
||||
if visit {
|
||||
Some(result)
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
/// Creates an updated [Vec<Term>], based on the given [&[Term]] and the [NoGood].
|
||||
pub fn update_term_vec(&self, term_vec: &[Term]) -> Vec<Term> {
|
||||
term_vec.iter().enumerate().map(|(idx,val)|{
|
||||
let idx:u32 = idx.try_into().expect("no-good learner implementation is based on the assumption that only u32::MAX-many variables are in place");
|
||||
if self.active.contains(idx){
|
||||
if self.value.contains(idx){
|
||||
Term::TOP
|
||||
}else{
|
||||
Term::BOT
|
||||
}
|
||||
}else{
|
||||
*val
|
||||
}
|
||||
}).collect()
|
||||
}
|
||||
|
||||
/// Given a [NoGood] and another one, conclude a non-conflicting value which can be concluded on basis of the given one.
|
||||
pub fn conclude(&self, other: &NoGood) -> Option<(usize, bool)> {
|
||||
log::debug!("conclude: {:?} other {:?}", self, other);
|
||||
let implication = self
|
||||
.active
|
||||
.borrow()
|
||||
.bitxor(other.active.borrow())
|
||||
.bitand(self.active.borrow());
|
||||
if implication.len() == 1 {
|
||||
let pos = implication
|
||||
.min()
|
||||
.expect("just checked that there is one element to be found");
|
||||
Some((pos as usize, !self.value.contains(pos)))
|
||||
} else {
|
||||
None
|
||||
}
|
||||
}
|
||||
|
||||
/// Updates the [NoGood] and a second one in a disjunctive (bitor) manner.
|
||||
pub fn disjunction(&mut self, other: &NoGood) {
|
||||
self.active = self.active.borrow().bitor(&other.active);
|
||||
self.value = self.value.borrow().bitor(&other.value);
|
||||
}
|
||||
|
||||
/// Returns [true] if the other [NoGood] matches with all the assignments of the current [NoGood].
|
||||
pub fn is_violating(&self, other: &NoGood) -> bool {
|
||||
let active = self.active.borrow().bitand(other.active.borrow());
|
||||
if self.active.len() == active.len() {
|
||||
let lhs = active.borrow().bitand(self.value.borrow());
|
||||
let rhs = active.borrow().bitand(other.value.borrow());
|
||||
if lhs.bitxor(rhs).is_empty() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
false
|
||||
}
|
||||
|
||||
/// Returns the number of set (i.e. active) bits.
|
||||
pub fn len(&self) -> usize {
|
||||
self.active
|
||||
.len()
|
||||
.try_into()
|
||||
.expect("expecting to be on a 64 bit system")
|
||||
}
|
||||
|
||||
#[must_use]
|
||||
/// Returns [true] if the [NoGood] does not set any value.
|
||||
pub fn is_empty(&self) -> bool {
|
||||
self.len() == 0
|
||||
}
|
||||
}
|
||||
|
||||
impl From<&[Term]> for NoGood {
|
||||
fn from(term_vec: &[Term]) -> Self {
|
||||
Self::from_term_vec(term_vec)
|
||||
}
|
||||
}
|
||||
|
||||
/// A structure to store [NoGoods][NoGood] and offer operations and deductions based on them.
|
||||
// TODO:make struct crate-private
|
||||
#[derive(Debug)]
|
||||
pub struct NoGoodStore {
|
||||
store: Vec<Vec<NoGood>>,
|
||||
duplicates: DuplicateElemination,
|
||||
}
|
||||
|
||||
impl NoGoodStore {
|
||||
/// Creates a new [NoGoodStore] and assumes a size compatible with the underlying [NoGood] implementation.
|
||||
pub fn new(size: u32) -> NoGoodStore {
|
||||
Self {
|
||||
store: vec![Vec::new(); size as usize],
|
||||
duplicates: DuplicateElemination::Equiv,
|
||||
}
|
||||
}
|
||||
|
||||
/// Tries to create a new [NoGoodStore].
|
||||
/// Does not succeed if the size is too big for the underlying [NoGood] implementation.
|
||||
pub fn try_new(size: usize) -> Option<NoGoodStore> {
|
||||
match TryInto::<u32>::try_into(size) {
|
||||
Ok(val) => Some(Self::new(val)),
|
||||
Err(_) => None,
|
||||
}
|
||||
}
|
||||
|
||||
/// Sets the behaviour when managing duplicates.
|
||||
pub fn set_dup_elem(&mut self, mode: DuplicateElemination) {
|
||||
self.duplicates = mode;
|
||||
}
|
||||
|
||||
/// Adds a given [NoGood]
|
||||
pub fn add_ng(&mut self, nogood: NoGood) {
|
||||
let mut idx = nogood.len();
|
||||
if idx > 0 {
|
||||
idx -= 1;
|
||||
if match self.duplicates {
|
||||
DuplicateElemination::None => true,
|
||||
DuplicateElemination::Equiv => !self.store[idx].contains(&nogood),
|
||||
DuplicateElemination::Subsume => {
|
||||
self.store
|
||||
.iter_mut()
|
||||
.enumerate()
|
||||
.for_each(|(cur_idx, ng_vec)| {
|
||||
if idx >= cur_idx {
|
||||
ng_vec.retain(|ng| !ng.is_violating(&nogood));
|
||||
}
|
||||
});
|
||||
true
|
||||
}
|
||||
} {
|
||||
self.store[idx].push(nogood);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Draws a (Conclusion)[NoGood], based on the [NoGoodstore] and the given [NoGood].
|
||||
pub fn conclusions(&self, nogood: &NoGood) -> Option<NoGood> {
|
||||
let mut result = NoGood::default();
|
||||
self.store
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|(len, _vec)| *len <= nogood.len())
|
||||
.filter_map(|(_len, val)| {
|
||||
NoGood::try_from_pair_iter(&mut val.iter().filter_map(|ng| ng.conclude(nogood)))
|
||||
})
|
||||
.try_fold(&mut result, |acc, ng| {
|
||||
if ng.is_violating(acc) {
|
||||
None
|
||||
} else {
|
||||
acc.disjunction(&ng);
|
||||
Some(acc)
|
||||
}
|
||||
})?;
|
||||
if self
|
||||
.store
|
||||
.iter()
|
||||
.enumerate()
|
||||
.filter(|(len, _vec)| *len <= nogood.len())
|
||||
.any(|(_, vec)| vec.iter().any(|elem| result.is_violating(elem)))
|
||||
{
|
||||
return None;
|
||||
}
|
||||
Some(result)
|
||||
}
|
||||
}
|
||||
|
||||
/// Allows to define how costly the DuplicateElemination is done.
|
||||
#[derive(Debug, Copy, Clone)]
|
||||
pub enum DuplicateElemination {
|
||||
/// No Duplicate Detection
|
||||
None,
|
||||
/// Only check weak equivalence
|
||||
Equiv,
|
||||
/// Check for subsumptions
|
||||
Subsume,
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod test {
|
||||
use super::*;
|
||||
use test_log::test;
|
||||
|
||||
#[test]
|
||||
fn create_ng() {
|
||||
let terms = vec![Term::TOP, Term(22), Term(13232), Term::BOT, Term::TOP];
|
||||
let ng = NoGood::from_term_vec(&terms);
|
||||
|
||||
assert_eq!(ng.active.len(), 3);
|
||||
assert_eq!(ng.value.len(), 2);
|
||||
assert!(ng.active.contains(0));
|
||||
assert!(!ng.active.contains(1));
|
||||
assert!(!ng.active.contains(2));
|
||||
assert!(ng.active.contains(3));
|
||||
assert!(ng.active.contains(4));
|
||||
|
||||
assert!(ng.value.contains(0));
|
||||
assert!(!ng.value.contains(1));
|
||||
assert!(!ng.value.contains(2));
|
||||
assert!(!ng.value.contains(3));
|
||||
assert!(ng.value.contains(4));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn conclude() {
|
||||
let ng1 = NoGood::from_term_vec(&[Term::TOP, Term(22), Term::TOP, Term::BOT, Term::TOP]);
|
||||
let ng2 = NoGood::from_term_vec(&[Term::TOP, Term(22), Term(13232), Term::BOT, Term::TOP]);
|
||||
let ng3 = NoGood::from_term_vec(&[
|
||||
Term::TOP,
|
||||
Term(22),
|
||||
Term(13232),
|
||||
Term::BOT,
|
||||
Term::TOP,
|
||||
Term::BOT,
|
||||
]);
|
||||
|
||||
assert_eq!(ng1.conclude(&ng2), Some((2, false)));
|
||||
assert_eq!(ng1.conclude(&ng1), None);
|
||||
assert_eq!(ng2.conclude(&ng1), None);
|
||||
assert_eq!(ng1.conclude(&ng3), Some((2, false)));
|
||||
assert_eq!(ng3.conclude(&ng1), Some((5, true)));
|
||||
assert_eq!(ng3.conclude(&ng2), Some((5, true)));
|
||||
|
||||
// conclusions on empty knowledge
|
||||
let ng4 = NoGood::from_term_vec(&[Term::TOP]);
|
||||
let ng5 = NoGood::from_term_vec(&[Term::BOT]);
|
||||
let ng6 = NoGood::from_term_vec(&[]);
|
||||
|
||||
assert_eq!(ng4.conclude(&ng6), Some((0, false)));
|
||||
assert_eq!(ng5.conclude(&ng6), Some((0, true)));
|
||||
assert_eq!(ng6.conclude(&ng5), None);
|
||||
assert_eq!(ng4.conclude(&ng5), None);
|
||||
|
||||
let ng_a = NoGood::from_term_vec(&[Term::BOT, Term(22)]);
|
||||
let ng_b = NoGood::from_term_vec(&[Term(22), Term::TOP]);
|
||||
|
||||
assert_eq!(ng_a.conclude(&ng_b), Some((0, true)));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn violate() {
|
||||
let ng1 = NoGood::from_term_vec(&[Term::TOP, Term(22), Term::TOP, Term::BOT, Term::TOP]);
|
||||
let ng2 = NoGood::from_term_vec(&[Term::TOP, Term(22), Term(13232), Term::BOT, Term::TOP]);
|
||||
let ng3 = NoGood::from_term_vec(&[
|
||||
Term::TOP,
|
||||
Term(22),
|
||||
Term(13232),
|
||||
Term::BOT,
|
||||
Term::TOP,
|
||||
Term::BOT,
|
||||
]);
|
||||
let ng4 = NoGood::from_term_vec(&[Term::TOP]);
|
||||
|
||||
assert!(ng4.is_violating(&ng1));
|
||||
assert!(!ng1.is_violating(&ng4));
|
||||
assert!(ng2.is_violating(&ng3));
|
||||
assert!(!ng3.is_violating(&ng2));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn add_ng() {
|
||||
let mut ngs = NoGoodStore::new(5);
|
||||
let ng1 = NoGood::from_term_vec(&[Term::TOP]);
|
||||
let ng2 = NoGood::from_term_vec(&[Term(22), Term::TOP]);
|
||||
let ng3 = NoGood::from_term_vec(&[Term(22), Term(22), Term::TOP]);
|
||||
let ng4 = NoGood::from_term_vec(&[Term(22), Term(22), Term(22), Term::TOP]);
|
||||
let ng5 = NoGood::from_term_vec(&[Term::BOT]);
|
||||
|
||||
assert!(!ng1.is_violating(&ng5));
|
||||
assert!(ng1.is_violating(&ng1));
|
||||
|
||||
ngs.add_ng(ng1.clone());
|
||||
ngs.add_ng(ng2.clone());
|
||||
ngs.add_ng(ng3.clone());
|
||||
ngs.add_ng(ng4.clone());
|
||||
ngs.add_ng(ng5.clone());
|
||||
|
||||
assert_eq!(
|
||||
ngs.store
|
||||
.iter()
|
||||
.fold(0, |acc, ng_vec| { acc + ng_vec.len() }),
|
||||
5
|
||||
);
|
||||
|
||||
ngs.set_dup_elem(DuplicateElemination::Equiv);
|
||||
|
||||
ngs.add_ng(ng1.clone());
|
||||
ngs.add_ng(ng2.clone());
|
||||
ngs.add_ng(ng3.clone());
|
||||
ngs.add_ng(ng4.clone());
|
||||
ngs.add_ng(ng5.clone());
|
||||
|
||||
assert_eq!(
|
||||
ngs.store
|
||||
.iter()
|
||||
.fold(0, |acc, ng_vec| { acc + ng_vec.len() }),
|
||||
5
|
||||
);
|
||||
ngs.set_dup_elem(DuplicateElemination::Subsume);
|
||||
ngs.add_ng(ng1);
|
||||
ngs.add_ng(ng2);
|
||||
ngs.add_ng(ng3);
|
||||
ngs.add_ng(ng4);
|
||||
ngs.add_ng(ng5);
|
||||
|
||||
assert_eq!(
|
||||
ngs.store
|
||||
.iter()
|
||||
.fold(0, |acc, ng_vec| { acc + ng_vec.len() }),
|
||||
5
|
||||
);
|
||||
|
||||
ngs.add_ng(NoGood::from_term_vec(&[Term(22), Term::BOT, Term(22)]));
|
||||
|
||||
assert_eq!(
|
||||
ngs.store
|
||||
.iter()
|
||||
.fold(0, |acc, ng_vec| { acc + ng_vec.len() }),
|
||||
6
|
||||
);
|
||||
|
||||
ngs.add_ng(NoGood::from_term_vec(&[Term(22), Term::BOT, Term::BOT]));
|
||||
|
||||
assert_eq!(
|
||||
ngs.store
|
||||
.iter()
|
||||
.fold(0, |acc, ng_vec| { acc + ng_vec.len() }),
|
||||
6
|
||||
);
|
||||
|
||||
assert!(NoGood::from_term_vec(&[Term(22), Term::BOT, Term(22)])
|
||||
.is_violating(&NoGood::from_term_vec(&[Term(22), Term::BOT, Term::BOT])));
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn ng_store_conclusions() {
|
||||
let mut ngs = NoGoodStore::new(5);
|
||||
|
||||
let ng1 = NoGood::from_term_vec(&[Term::BOT]);
|
||||
|
||||
ngs.add_ng(ng1.clone());
|
||||
assert_eq!(ng1.conclude(&ng1), None);
|
||||
assert_eq!(
|
||||
ng1.conclude(&NoGood::from_term_vec(&[Term(33)])),
|
||||
Some((0, true))
|
||||
);
|
||||
assert_eq!(ngs.conclusions(&ng1), None);
|
||||
assert_ne!(ngs.conclusions(&NoGood::from_term_vec(&[Term(33)])), None);
|
||||
assert_eq!(
|
||||
ngs.conclusions(&NoGood::from_term_vec(&[Term(33)]))
|
||||
.expect("just checked with prev assertion")
|
||||
.update_term_vec(&[Term(33)]),
|
||||
vec![Term::TOP]
|
||||
);
|
||||
|
||||
let ng2 = NoGood::from_term_vec(&[Term(123), Term::TOP, Term(234), Term(345)]);
|
||||
let ng3 = NoGood::from_term_vec(&[Term::TOP, Term::BOT, Term::TOP, Term(345)]);
|
||||
|
||||
ngs.add_ng(ng2);
|
||||
ngs.add_ng(ng3);
|
||||
|
||||
log::debug!("issues start here");
|
||||
assert!(ngs
|
||||
.conclusions(&NoGood::from_term_vec(&[Term::TOP]))
|
||||
.is_some());
|
||||
assert_eq!(
|
||||
ngs.conclusions(&[Term::TOP].as_slice().into())
|
||||
.expect("just checked with prev assertion")
|
||||
.update_term_vec(&[Term::TOP, Term(4), Term(5), Term(6), Term(7)]),
|
||||
vec![Term::TOP, Term::BOT, Term(5), Term(6), Term(7)]
|
||||
);
|
||||
assert!(ngs
|
||||
.conclusions(&NoGood::from_term_vec(&[
|
||||
Term::TOP,
|
||||
Term::BOT,
|
||||
Term(5),
|
||||
Term(6),
|
||||
Term(7)
|
||||
]))
|
||||
.is_some());
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user