From ee1e1bd1bf59592631ff3227459d880a2950812e Mon Sep 17 00:00:00 2001 From: Stefan Ellmauthaler Date: Wed, 30 Jun 2021 10:17:39 +0200 Subject: [PATCH] fixed all warnings Signed-off-by: Stefan Ellmauthaler --- src/adf.rs | 12 ++++++------ src/main.rs | 9 ++++----- src/obdd.rs | 7 +++---- 3 files changed, 13 insertions(+), 15 deletions(-) diff --git a/src/adf.rs b/src/adf.rs index 1ac7ab3..8069eca 100644 --- a/src/adf.rs +++ b/src/adf.rs @@ -1,7 +1,5 @@ use std::{ collections::HashMap, - num::ParseFloatError, - ops::Deref, str::{self, FromStr}, }; @@ -22,7 +20,8 @@ impl Statement { } } - pub fn add_ac(&mut self, ac: usize) { + + pub fn _add_ac(&mut self, ac: usize) { self.ac = Some(ac); } } @@ -70,7 +69,8 @@ impl Adf { /// This ac needs to be in the prefix notation for ADFs as defined by the DIAMOND implementation. pub fn add_ac(&mut self, statement: &str, ac: &str) { if let Some(stmt) = self.dict.get(statement) { - self.add_ac_by_number(*stmt, ac) + let st = *stmt; + self.add_ac_by_number(st, ac) } } @@ -85,7 +85,7 @@ impl Adf { pub fn grounded(&mut self) -> Vec { let mut interpretation: Vec = Vec::new(); - let mut change:bool = false; + let mut change:bool; for it in self.stmts.iter(){ interpretation.push((*it).ac.unwrap()) @@ -119,7 +119,7 @@ impl Adf { fn setvarvalue(&mut self,interpretation:Vec, var:usize, val:bool) -> Option>{ let mut interpretation2:Vec = vec![0;interpretation.len()]; let mut change: bool = false; - for (pos,it) in interpretation.iter().enumerate(){ + for (pos,_it) in interpretation.iter().enumerate(){ interpretation2[pos] = self.bdd.restrict(interpretation[pos], var, val); if interpretation[pos] != interpretation2[pos]{ change = true diff --git a/src/main.rs b/src/main.rs index 37521c9..0417b42 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,4 +1,3 @@ -use std::borrow::Borrow; use std::{env, process::exit}; use std::fs::File; use std::io::{self, BufRead}; @@ -37,13 +36,13 @@ fn main() { println!("parsed {} statements", statements.len()); if statements.len() > 0 && ac.len() > 0 { - let mut myAdf = Adf::new(); - myAdf.init_statements(statements.iter().map(AsRef::as_ref).collect()); + let mut my_adf = Adf::new(); + my_adf.init_statements(statements.iter().map(AsRef::as_ref).collect()); for (s,c) in ac { - myAdf.add_ac(s.as_str(), c.as_str()); + my_adf.add_ac(s.as_str(), c.as_str()); } - let result = myAdf.grounded(); + let result = my_adf.grounded(); println!("{:?}",result); for (p,s) in statements.iter().enumerate(){ match result[p] { diff --git a/src/obdd.rs b/src/obdd.rs index 3835b01..2d481a2 100644 --- a/src/obdd.rs +++ b/src/obdd.rs @@ -143,13 +143,13 @@ impl Bdd { self.if_then_else(terma, BDD_TOP, termb) } - fn printtree(&self, tree: Term) { + fn _printtree(&self, tree: Term) { let node = self.nodes[tree]; println!("Index: {}, Node: {}", tree, node); if tree > BDD_TOP { - self.printtree(node.lo); - self.printtree(node.hi); + self._printtree(node.lo); + self._printtree(node.hi); } } } @@ -238,7 +238,6 @@ mod test { let b = bdd.or(v2, v1); let con1 = bdd.and(a, conj); - let con2 = bdd.and(v1, v3); let end = bdd.or(con1, b); let x = bdd.restrict(end, 1, false);