Browse Source

Fixed problems that occured during the merge except for one.

master
Cameron Weinfurt 3 years ago
parent
commit
06dcca25cb
  1. 19
      src/clause.rs
  2. 1
      src/main.rs

19
src/clause.rs

@ -267,23 +267,20 @@ impl core::ops::IndexMut<usize> for Clause {
impl Display for Clause {
fn fmt(&self, fmt: &mut Formatter) -> core::fmt::Result {
if self.literals.len() == 0 {
write!(fmt, "NULL")
#[cfg(not(no_unicode))]
{
write!(fmt, "⊥")
write!(fmt, "⊥")?;
}
#[cfg(no_unicode)]
{
write!(fmt, "FALSE")
write!(fmt, "FALSE")?;
}
write!(fmt, " V {}", lit)?;
#[cfg(not(no_unicode))]
write!(fmt, " ∨ {}", lit)?;
#[cfg(no_unicode)]
write!(fmt, " v {}", lit)?;
}
Ok(())
#[cfg(not(no_unicode))]
write!(fmt, " ∨ {}", lit)?;
#[cfg(no_unicode)]
write!(fmt, " v {}", lit)?;
}
Ok(())
}
}
@ -468,7 +465,7 @@ mod test {
y.get_name(),
z.get_name(),
w.get_name()
);
);
println!("x: {}, y: {}, z: {}, w: {}", x, y, z, w);
assign_vars! {
x = 1;

1
src/main.rs

@ -7,7 +7,6 @@ mod clause_gen;
/// I made this before I knew I didn't need it. :/
pub mod hash_wrapper;
mod maxsat;
mod clause_gen;
use crate::clause_gen::*;
use crate::maxsat::*;

Loading…
Cancel
Save