-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor: factor out solver integration tests
- Loading branch information
Showing
18 changed files
with
359 additions
and
584 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,7 @@ members = [ | |
| "glucose", | ||
| "minisat", | ||
| "ipasir", | ||
| "solvertests", | ||
| ] | ||
| resolver = "2" | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1 @@ | ||
| use rustsat::{ | ||
| instances::{BasicVarManager, SatInstance}, | ||
| lit, | ||
| solvers::{SolveIncremental, SolverResult}, | ||
| }; | ||
| use rustsat_cadical::CaDiCaL; | ||
|
|
||
| fn test_assumption_sequence<S: SolveIncremental>(mut solver: S) { | ||
| let inst: SatInstance<BasicVarManager> = | ||
| SatInstance::from_dimacs_path("./data/small.cnf").unwrap(); | ||
| solver.add_cnf(inst.as_cnf().0).unwrap(); | ||
| let res = solver.solve().unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver.solve_assumps(&[!lit![0], !lit![1]]).unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| } | ||
|
|
||
| #[test] | ||
| fn assumption_sequence() { | ||
| let solver = CaDiCaL::default(); | ||
| test_assumption_sequence(solver); | ||
| } | ||
| rustsat_solvertests::incremental_tests!(rustsat_cadical::CaDiCaL); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,34 +1,5 @@ | ||
| use rustsat::{ | ||
| instances::{BasicVarManager, SatInstance}, | ||
| lit, | ||
| solvers::{PhaseLit, Solve, SolverResult}, | ||
| types::TernaryVal, | ||
| var, | ||
| }; | ||
| use rustsat_cadical::CaDiCaL; | ||
|
|
||
| fn test_phase_saving<S: Solve + PhaseLit>(mut solver: S) { | ||
| let inst: SatInstance<BasicVarManager> = | ||
| SatInstance::from_dimacs_path("./data/small.cnf").unwrap(); | ||
| solver.add_cnf(inst.as_cnf().0).unwrap(); | ||
| solver.phase_lit(lit![0]).unwrap(); | ||
| solver.phase_lit(!lit![1]).unwrap(); | ||
| solver.phase_lit(lit![2]).unwrap(); | ||
| solver.phase_lit(!lit![3]).unwrap(); | ||
| let res = solver.solve().unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let sol = solver.solution(var![3]).unwrap(); | ||
| assert_eq!(sol.lit_value(lit![0]), TernaryVal::True); | ||
| assert_eq!(sol.lit_value(lit![1]), TernaryVal::False); | ||
| assert_eq!(sol.lit_value(lit![2]), TernaryVal::True); | ||
| assert_eq!(sol.lit_value(lit![3]), TernaryVal::False); | ||
| solver.unphase_var(var![1]).unwrap(); | ||
| solver.unphase_var(var![0]).unwrap(); | ||
| } | ||
|
|
||
| #[test] | ||
| fn phase_saving() { | ||
| let mut solver = CaDiCaL::default(); | ||
| solver.set_option("lucky", 0).unwrap(); | ||
| test_phase_saving(solver); | ||
| } | ||
| rustsat_solvertests::phasing_tests!({ | ||
| let mut slv = rustsat_cadical::CaDiCaL::default(); | ||
| slv.set_option("lucky", 0).unwrap(); | ||
| slv | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,20 @@ | ||
| use rustsat::{ | ||
| instances::{BasicVarManager, SatInstance}, | ||
| solvers::{Solve, SolverResult}, | ||
| }; | ||
| use rustsat_cadical::CaDiCaL; | ||
|
|
||
| fn small_sat_instance<S: Solve>(mut solver: S) { | ||
| let inst: SatInstance<BasicVarManager> = | ||
| SatInstance::from_dimacs_path("./data/AProVE11-12.cnf").unwrap(); | ||
| solver.add_cnf(inst.as_cnf().0).unwrap(); | ||
| let res = solver.solve().unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| } | ||
|
|
||
| fn small_unsat_instance<S: Solve>(mut solver: S) { | ||
| let inst: SatInstance<BasicVarManager> = | ||
| SatInstance::from_dimacs_path("./data/smtlib-qfbv-aigs-ext_con_032_008_0256-tseitin.cnf") | ||
| .unwrap(); | ||
| solver.add_cnf(inst.as_cnf().0).unwrap(); | ||
| let res = solver.solve().unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| mod base { | ||
| rustsat_solvertests::base_tests!(rustsat_cadical::CaDiCaL); | ||
| } | ||
|
|
||
| #[test] | ||
| fn small_sat() { | ||
| let solver = CaDiCaL::default(); | ||
| small_sat_instance(solver); | ||
| mod sat { | ||
| rustsat_solvertests::base_tests!({ | ||
| let mut slv = rustsat_cadical::CaDiCaL::default(); | ||
| slv.set_configuration(rustsat_cadical::Config::SAT).unwrap(); | ||
| slv | ||
| }); | ||
| } | ||
|
|
||
| #[test] | ||
| fn small_unsat() { | ||
| let solver = CaDiCaL::default(); | ||
| small_unsat_instance(solver); | ||
| } | ||
|
|
||
| #[test] | ||
| fn sat_small_sat() { | ||
| let mut solver = CaDiCaL::default(); | ||
| solver | ||
| .set_configuration(rustsat_cadical::Config::SAT) | ||
| .unwrap(); | ||
| small_sat_instance(solver); | ||
| } | ||
|
|
||
| #[test] | ||
| fn sat_small_unsat() { | ||
| let mut solver = CaDiCaL::default(); | ||
| solver | ||
| .set_configuration(rustsat_cadical::Config::SAT) | ||
| .unwrap(); | ||
| small_unsat_instance(solver); | ||
| } | ||
|
|
||
| #[test] | ||
| fn unsat_small_sat() { | ||
| let mut solver = CaDiCaL::default(); | ||
| solver | ||
| .set_configuration(rustsat_cadical::Config::UNSAT) | ||
| .unwrap(); | ||
| small_sat_instance(solver); | ||
| } | ||
|
|
||
| #[test] | ||
| fn unsat_small_unsat() { | ||
| let mut solver = CaDiCaL::default(); | ||
| solver | ||
| .set_configuration(rustsat_cadical::Config::UNSAT) | ||
| .unwrap(); | ||
| small_unsat_instance(solver); | ||
| mod unsat { | ||
| rustsat_solvertests::base_tests!({ | ||
| let mut slv = rustsat_cadical::CaDiCaL::default(); | ||
| slv.set_configuration(rustsat_cadical::Config::UNSAT) | ||
| .unwrap(); | ||
| slv | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,86 +1,6 @@ | ||
| use rustsat::{ | ||
| instances::{BasicVarManager, SatInstance}, | ||
| lit, | ||
| solvers::{SolveIncremental, SolverResult}, | ||
| }; | ||
| use rustsat_glucose::core::Glucose; | ||
|
|
||
| fn test_assumption_sequence<S: SolveIncremental>(mut solver: S) { | ||
| let inst: SatInstance<BasicVarManager> = | ||
| SatInstance::from_dimacs_path("./data/small.cnf").unwrap(); | ||
| solver.add_cnf(inst.as_cnf().0).unwrap(); | ||
| let res = solver.solve().unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver.solve_assumps(&[!lit![0], !lit![1]]).unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[lit![0], !lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], !lit![2], lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| let res = solver | ||
| .solve_assumps(&[!lit![0], !lit![1], !lit![2], !lit![3]]) | ||
| .unwrap(); | ||
| assert_eq!(res, SolverResult::Unsat); | ||
| mod core { | ||
| rustsat_solvertests::incremental_tests!(rustsat_glucose::core::Glucose); | ||
| } | ||
|
|
||
| #[test] | ||
| fn assumption_sequence() { | ||
| let solver = Glucose::default(); | ||
| test_assumption_sequence(solver); | ||
| } | ||
| // Note: Cannot test prepro version of glucose with this small example because | ||
| // the variable are eliminated by preprocessing |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,38 +1,7 @@ | ||
| use rustsat::{ | ||
| instances::{BasicVarManager, SatInstance}, | ||
| lit, | ||
| solvers::{PhaseLit, Solve, SolverResult}, | ||
| types::TernaryVal, | ||
| var, | ||
| }; | ||
| use rustsat_glucose::{core, simp}; | ||
|
|
||
| fn test_phase_saving<S: Solve + PhaseLit>(mut solver: S) { | ||
| let inst: SatInstance<BasicVarManager> = | ||
| SatInstance::from_dimacs_path("./data/small.cnf").unwrap(); | ||
| solver.add_cnf(inst.as_cnf().0).unwrap(); | ||
| solver.phase_lit(lit![0]).unwrap(); | ||
| solver.phase_lit(!lit![1]).unwrap(); | ||
| solver.phase_lit(lit![2]).unwrap(); | ||
| solver.phase_lit(!lit![3]).unwrap(); | ||
| let res = solver.solve().unwrap(); | ||
| assert_eq!(res, SolverResult::Sat); | ||
| let sol = solver.solution(var![3]).unwrap(); | ||
| assert_eq!(sol.lit_value(lit![0]), TernaryVal::True); | ||
| assert_eq!(sol.lit_value(lit![1]), TernaryVal::False); | ||
| assert_eq!(sol.lit_value(lit![2]), TernaryVal::True); | ||
| assert_eq!(sol.lit_value(lit![3]), TernaryVal::False); | ||
| solver.unphase_var(var![1]).unwrap(); | ||
| solver.unphase_var(var![0]).unwrap(); | ||
| } | ||
| #[test] | ||
| fn core_phase_saving() { | ||
| let solver = core::Glucose::default(); | ||
| test_phase_saving(solver); | ||
| mod core { | ||
| rustsat_solvertests::phasing_tests!(rustsat_glucose::core::Glucose); | ||
| } | ||
|
|
||
| #[test] | ||
| fn simp_phase_saving() { | ||
| let solver = simp::Glucose::default(); | ||
| test_phase_saving(solver); | ||
| mod simp { | ||
| rustsat_solvertests::phasing_tests!(rustsat_glucose::simp::Glucose); | ||
| } |
Oops, something went wrong.