ellmau/adf-obdd
1
0
Fork 0
mirror of https://github.com/ellmau/adf-obdd.git synced 2025-12-19 09:29:36 +01:00
Code Issues Projects Releases Wiki Activity

Apply clippy suggestions

Browse Source
This commit is contained in:
monsterkrampe 2025-06-30 08:48:48 +02:00
parent 63e051b439
commit d0e513451e
No known key found for this signature in database
GPG Key ID: B8ADC1F5A5CE5057
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/src/main.rs
View File

@ -204,14 +204,14 @@ impl App {
Some("nai") => { Some("nai") => {
let naive_adf = adf.hybrid_step_opt(false); let naive_adf = adf.hybrid_step_opt(false);
for ac_counts in naive_adf.formulacounts(false) { for ac_counts in naive_adf.formulacounts(false) {
print!("{:?} ", ac_counts); print!("{ac_counts:?} ");
} }
println!(); println!();
} }
Some("mem") => { Some("mem") => {
let naive_adf = adf.hybrid_step_opt(false); let naive_adf = adf.hybrid_step_opt(false);
for ac_counts in naive_adf.formulacounts(true) { for ac_counts in naive_adf.formulacounts(true) {
print!("{:?}", ac_counts); print!("{ac_counts:?}");
} }
println!(); println!();
} }
@ -383,13 +383,13 @@ impl App {
match self.counter.as_deref() { match self.counter.as_deref() {
Some("nai") => { Some("nai") => {
for ac_counts in adf.formulacounts(false) { for ac_counts in adf.formulacounts(false) {
print!("{:?} ", ac_counts); print!("{ac_counts:?} ");
} }
println!(); println!();
} }
Some("mem") => { Some("mem") => {
for ac_counts in adf.formulacounts(true) { for ac_counts in adf.formulacounts(true) {
print!("{:?}", ac_counts); print!("{ac_counts:?}");
} }
println!(); println!();
} }

4
lib/src/datatypes/bdd.rs
View File

@ -275,8 +275,8 @@ mod test {
let term: Term = Term::from(value); let term: Term = Term::from(value);
let var = Var::from(value); let var = Var::from(value);
// display // display
assert_eq!(format!("{}", term), format!("Term({})", value)); assert_eq!(format!("{term}"), format!("Term({})", value));
assert_eq!(format!("{}", var), format!("Var({})", value)); assert_eq!(format!("{var}"), format!("Var({})", value));
//deref //deref
assert_eq!(value, *term); assert_eq!(value, *term);
true true

2
lib/src/obdd.rs
View File

@ -690,7 +690,7 @@ mod test {
let a1 = bdd.and(v1, v2); let a1 = bdd.and(v1, v2);
let _a2 = bdd.or(a1, v3); let _a2 = bdd.or(a1, v3);
assert_eq!(format!("{}", bdd), " \n0 BddNode: Var(18446744073709551614), lo: Term(0), hi: Term(0)\n1 BddNode: Var(18446744073709551615), lo: Term(1), hi: Term(1)\n2 BddNode: Var(0), lo: Term(0), hi: Term(1)\n3 BddNode: Var(1), lo: Term(0), hi: Term(1)\n4 BddNode: Var(2), lo: Term(0), hi: Term(1)\n5 BddNode: Var(0), lo: Term(0), hi: Term(3)\n6 BddNode: Var(1), lo: Term(4), hi: Term(1)\n7 BddNode: Var(0), lo: Term(4), hi: Term(6)\n"); assert_eq!(format!("{bdd}"), " \n0 BddNode: Var(18446744073709551614), lo: Term(0), hi: Term(0)\n1 BddNode: Var(18446744073709551615), lo: Term(1), hi: Term(1)\n2 BddNode: Var(0), lo: Term(0), hi: Term(1)\n3 BddNode: Var(1), lo: Term(0), hi: Term(1)\n4 BddNode: Var(2), lo: Term(0), hi: Term(1)\n5 BddNode: Var(0), lo: Term(0), hi: Term(3)\n6 BddNode: Var(1), lo: Term(4), hi: Term(1)\n7 BddNode: Var(0), lo: Term(4), hi: Term(6)\n");
} }
#[test] #[test]

16
lib/src/parser.rs
View File

@ -94,25 +94,25 @@ impl std::fmt::Debug for Formula {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
Formula::Atom(a) => { Formula::Atom(a) => {
write!(f, "{}", a)?; write!(f, "{a}")?;
} }
Formula::Not(n) => { Formula::Not(n) => {
write!(f, "not({:?})", n)?; write!(f, "not({n:?})")?;
} }
Formula::And(f1, f2) => { Formula::And(f1, f2) => {
write!(f, "and({:?},{:?})", f1, f2)?; write!(f, "and({f1:?},{f2:?})")?;
} }
Formula::Or(f1, f2) => { Formula::Or(f1, f2) => {
write!(f, "or({:?},{:?})", f1, f2)?; write!(f, "or({f1:?},{f2:?})")?;
} }
Formula::Imp(f1, f2) => { Formula::Imp(f1, f2) => {
write!(f, "imp({:?},{:?})", f1, f2)?; write!(f, "imp({f1:?},{f2:?})")?;
} }
Formula::Xor(f1, f2) => { Formula::Xor(f1, f2) => {
write!(f, "xor({:?},{:?})", f1, f2)?; write!(f, "xor({f1:?},{f2:?})")?;
} }
Formula::Iff(f1, f2) => { Formula::Iff(f1, f2) => {
write!(f, "iff({:?},{:?})", f1, f2)?; write!(f, "iff({f1:?},{f2:?})")?;
} }
Formula::Bot => { Formula::Bot => {
write!(f, "Const(B)")?; write!(f, "Const(B)")?;
@ -481,7 +481,7 @@ mod test {
let (_remain, result) = AdfParser::formula(input).unwrap(); let (_remain, result) = AdfParser::formula(input).unwrap();
assert_eq!( assert_eq!(
format!("{:?}", result), format!("{result:?}"),
"and(or(not(a),iff( iff left ,b)),xor(imp(c,d),e))" "and(or(not(a),iff( iff left ,b)),xor(imp(c,d),e))"
); );