Place binary_sdd, sdd_or behind repr::sdd

neuppl · Jul 13, 2023 · fd28f86 · fd28f86
1 parent 33f12b3
commit fd28f86
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/builder/sdd/builder.rs b/src/builder/sdd/builder.rs
@@ -6,9 +6,9 @@ use std::cmp::Ordering;
 use crate::builder::cache::ite::Ite;
 use crate::builder::BottomUpBuilder;
 use crate::repr::ddnnf::DDNNFPtr;
-use crate::repr::sdd::binary_sdd::BinarySDD;
-use crate::repr::sdd::sdd_or::{SddAnd, SddOr};
+use crate::repr::sdd::BinarySDD;
 use crate::repr::sdd::SddPtr::{self, Var};
+use crate::repr::sdd::{SddAnd, SddOr};
 use crate::repr::vtree::{VTree, VTreeIndex, VTreeManager};
 use crate::{repr::cnf::Cnf, repr::logical_expr::LogicalExpr, repr::var_label::VarLabel};
 

diff --git a/src/builder/sdd/compression.rs b/src/builder/sdd/compression.rs
@@ -8,9 +8,9 @@ use crate::builder::cache::ite::Ite;
 use crate::builder::cache::LruTable;
 use crate::builder::BottomUpBuilder;
 use crate::repr::ddnnf::DDNNFPtr;
-use crate::repr::sdd::binary_sdd::BinarySDD;
-use crate::repr::sdd::sdd_or::{SddAnd, SddOr};
+use crate::repr::sdd::BinarySDD;
 use crate::repr::sdd::SddPtr;
+use crate::repr::sdd::{SddAnd, SddOr};
 use crate::repr::vtree::{VTree, VTreeIndex, VTreeManager};
 
 use super::builder::{SddBuilder, SddBuilderStats};

diff --git a/src/builder/sdd/semantic.rs b/src/builder/sdd/semantic.rs
@@ -7,9 +7,9 @@ use rustc_hash::FxHasher;
 use crate::backing_store::bump_table::BackedRobinhoodTable;
 use crate::builder::cache::ite::Ite;
 use crate::repr::ddnnf::{create_semantic_hash_map, DDNNFPtr};
-use crate::repr::sdd::binary_sdd::BinarySDD;
-use crate::repr::sdd::sdd_or::{SddAnd, SddOr};
+use crate::repr::sdd::BinarySDD;
 use crate::repr::sdd::SddPtr;
+use crate::repr::sdd::{SddAnd, SddOr};
 use crate::repr::vtree::{VTree, VTreeIndex, VTreeManager};
 use crate::repr::wmc::WmcParams;
 use crate::util::semirings::finitefield::FiniteField;

diff --git a/src/repr/sdd.rs b/src/repr/sdd.rs
@@ -1,8 +1,8 @@
 //! Defines the internal representations for a trimmed and compressed SDD with
 //! complemented edges.
 
-pub mod binary_sdd;
-pub mod sdd_or;
+mod binary_sdd;
+mod sdd_or;
 
 use crate::{
     repr::{
@@ -20,8 +20,8 @@ use SddPtr::*;
 
 use std::hash::Hash;
 
-use self::binary_sdd::BinarySDD;
-use self::sdd_or::{SddAnd, SddNodeIter, SddOr};
+pub use self::binary_sdd::*;
+pub use self::sdd_or::*;
 
 // This type is used a lot. Make sure it doesn't unintentionally get bigger.
 #[derive(Debug, Clone, Eq, Ord, PartialOrd, Copy)]