use is_true and is_false in the is_clause_* functions

rust/solve/src/dpll.rs

@@ -74,9 +74,9 @@ fn test_is_unknown() {
}
/// A satisfied clause is a clause where at least one atom is true.
fn is_clause_satisfied(vars: BoundVars, clause: Clause) -> bool {
fn is_clause_satisfied(vars: &BoundVars, clause: Clause) -> bool {
    for v in clause {
        if vars.contains(&v) {
        if is_true(vars, v) {
            return true
        }
    }
@@ -86,14 +86,14 @@ fn is_clause_satisfied(vars: BoundVars, clause: Clause) -> bool {
#[test]
fn test_is_clause_satisfied() {
    assert!(is_clause_satisfied(from_vec(vec!(1)), vec!(1)));
    assert!(!is_clause_satisfied(empty_vars(), vec!(1)));
    assert!(is_clause_satisfied(&from_vec(vec!(1)), vec!(1)));
    assert!(!is_clause_satisfied(&empty_vars(), vec!(1)));
}
/// A conflict clause is a clause whose atoms each are false.
fn is_clause_conflict(vars: BoundVars, clause: Clause) -> bool {
fn is_clause_conflict(vars: &BoundVars, clause: Clause) -> bool {
    for v in clause {
        if vars.contains(&v) {
        if is_true(vars, v) {
            return false
        }
    }
@@ -103,9 +103,9 @@ fn is_clause_conflict(vars: BoundVars, clause: Clause) -> bool {
#[test]
fn test_is_clause_conflict() {
    assert!(is_clause_conflict(empty_vars(), vec!(1)));
    assert!(is_clause_conflict(empty_vars(), vec!(1, 2, 3)));
    assert!(is_clause_conflict(from_vec(vec!(4)), vec!(1, 2, 3)));
    assert!(!is_clause_conflict(from_vec(vec!(1)), vec!(1)));
    assert!(!is_clause_conflict(from_vec(vec!(2)), vec!(1, 2)));
    assert!(is_clause_conflict(&empty_vars(), vec!(1)));
    assert!(is_clause_conflict(&empty_vars(), vec!(1, 2, 3)));
    assert!(is_clause_conflict(&from_vec(vec!(4)), vec!(1, 2, 3)));
    assert!(!is_clause_conflict(&from_vec(vec!(1)), vec!(1)));
    assert!(!is_clause_conflict(&from_vec(vec!(2)), vec!(1, 2)));
}