prep for apply for normalized sdds

jsfpdn · Oct 9, 2024 · 6556f33 · 6556f33
1 parent 4710d0b
commit 6556f33
Show file tree

Hide file tree

Showing 5 changed files with 798 additions and 346 deletions.
diff --git a/sdd-rs-lib/dot_writer.rs b/sdd-rs-lib/dot_writer.rs
@@ -1,7 +1,7 @@
-use crate::Result;
+use crate::{manager::SddManager, Result};
 
 pub trait Dot {
- fn draw(&self, writer: &mut DotWriter);
+ fn draw<'a>(&self, writer: &mut DotWriter, manager: &SddManager);
 }
 
 pub enum Edge {

diff --git a/sdd-rs-lib/literal.rs b/sdd-rs-lib/literal.rs
@@ -1,7 +1,7 @@
 use std::fmt::Display;
 
 #[derive(Hash, Eq, PartialEq, Debug, Clone, PartialOrd, Ord)]
-pub struct VarLabel(String);
+pub(crate) struct VarLabel(String);
 
 impl VarLabel {
  #[must_use]
@@ -16,12 +16,6 @@ impl VarLabel {
 }
 
 // Either true or false
-#[derive(Hash, Eq, PartialEq, Debug, Clone, PartialOrd, Ord)]
-pub struct Literal {
- var_label: VarLabel,
- polarity: Polarity,
-}
-
 #[derive(Hash, Clone, Debug, Eq, PartialEq, PartialOrd, Ord, Copy)]
 pub enum Polarity {
  Positive,
@@ -39,11 +33,17 @@ impl std::ops::Not for Polarity {
  }
 }
 
+#[derive(Hash, Eq, PartialEq, Debug, Clone, PartialOrd, Ord)]
+pub struct Literal {
+ var_label: VarLabel,
+ polarity: Polarity,
+}
+
 impl Literal {
  #[must_use]
- pub fn new(polarity: Polarity, var_label: VarLabel) -> Literal {
+ pub fn new(polarity: Polarity, variable: &str) -> Literal {
  Literal {
- var_label,
+ var_label: VarLabel::new(variable),
  polarity,
  }
  }
@@ -67,7 +67,7 @@ impl Literal {
  }
 
  #[must_use]
- pub fn var_label(self) -> VarLabel {
+ pub(crate) fn var_label(self) -> VarLabel {
  self.var_label
  }
 }