From 27c34fd2a8f2045f7041be7f9cc13ce610d4930b Mon Sep 17 00:00:00 2001 From: Christoph Zengler Date: Fri, 13 Sep 2024 14:24:49 +0200 Subject: [PATCH] Moved test files --- .gitignore | 14 +++++----- core/pom.xml | 21 ++++++++++++++ .../backbones/BackboneGenerationTest.java | 27 +++++++++--------- .../logicng/explanations/drup/DRUPTest.java | 11 ++++---- .../explanations/mus/MUSGenerationTest.java | 12 ++++---- .../smus/SmusComputationTest.java | 4 +-- .../functions/MinimumPrimeImplicantTest.java | 7 +++-- .../ConnectedComponentsComputerTest.java | 2 +- .../graphs/datastructures/GraphTest.java | 2 +- .../ConstraintGraphGeneratorTest.java | 10 +++---- .../graphs/io/GraphDimacsFileWriterTest.java | 16 +++++------ .../handlers/TimeoutMaxSATHandlerTest.java | 2 +- .../TimeoutOptimizationHandlerTest.java | 4 +-- .../logicng/io/FormulaWriterReaderTest.java | 12 ++++---- .../generators/BddGraphicalGeneratorTest.java | 8 +++--- .../FormulaAstGraphicalGeneratorTest.java | 12 ++++---- .../FormulaDagGraphicalGeneratorTest.java | 12 ++++---- .../GraphGraphicalGeneratorTest.java | 12 ++++---- .../logicng/io/readers/DimacsReaderTest.java | 2 +- .../writers/FormulaDimacsFileWriterTest.java | 16 +++++------ .../dnnf/DnnfCompilerTest.java | 14 +++++----- .../primecomputation/PrimeCompilerTest.java | 6 ++-- .../PrimeImplicantReductionTest.java | 10 +++---- .../PrimeImplicateReductionTest.java | 10 +++---- .../functions/BackboneFunctionTest.java | 17 ++++++----- .../functions/OptimizationFunctionTest.java | 14 +++++----- .../solvers/maxsat/MaxSatLongRunningTest.java | 4 +-- .../solvers/maxsat/PartialMaxSATTest.java | 20 ++++++------- .../maxsat/PartialWeightedMaxSATTest.java | 24 ++++++++-------- .../solvers/maxsat/PureMaxSATTest.java | 28 +++++++++---------- .../logicng/solvers/sat/SATCallTest.java | 2 +- .../logicng/solvers/sat/SATTest.java | 10 +++---- .../cnf/CNFSubsumptionTest.java | 2 +- .../cnf/CnfMethodComparisonTest.java | 16 +++++------ .../dnf/DNFSubsumptionTest.java | 2 +- .../AdvancedSimplifierTest.java | 2 +- .../simplification/QuineMcCluskeyTest.java | 6 ++-- .../antlr/AntlrPropositionalParserTest.java | 17 +++++++++++ parser/src/test/resources/formula1.txt | 3 -- parser/src/test/resources/formula2.txt | 4 --- pom.xml | 19 ------------- .../logicng/serialization/FormulasTest.java | 2 +- .../logicng/serialization/SatSolversTest.java | 2 +- .../backbones/backbone_large_formula.txt | 0 .../backbones/backbone_small_formulas.txt | 0 .../malformed/contains-line-without-zero.cnf | 0 .../dnnf/both_bdd_dnnf_1.cnf | 0 .../dnnf/both_bdd_dnnf_2.cnf | 0 .../dnnf/both_bdd_dnnf_3.cnf | 0 .../dnnf/both_bdd_dnnf_4.cnf | 0 .../dnnf/both_bdd_dnnf_5.cnf | 0 .../drup/avg_input.cnf | 0 .../drup/pg4_input.cnf | 0 .../drup/simple_input.cnf | 0 .../formulas/formula1.txt | 0 .../formulas/formula2.txt | 0 .../formulas/formula3.txt | 0 .../formulas/large_formula.txt | 0 .../formulas/largest_formula.txt | 0 .../formulas/simplify_formulas.txt | 0 .../formulas/small_formulas.txt | 0 .../graphs/graph30.txt | 0 .../graphs/graph50.txt | 0 .../graphs/io/graphs-dimacs/30_f.col | 0 .../graphs/io/graphs-dimacs/30_t.col | 0 .../graphs/io/graphs-dimacs/30_t.map | 0 .../graphs/io/graphs-dimacs/50p1_f.col | 0 .../graphs/io/graphs-dimacs/50p1_t.col | 0 .../graphs/io/graphs-dimacs/50p1_t.map | 0 .../graphs/io/graphs-dimacs/small_f.col | 0 .../graphs/io/graphs-dimacs/small_t.col | 0 .../graphs/io/graphs-dimacs/small_t.map | 0 .../graphs/io/temp/.empty | 0 .../graphs/io/temp/30_f.col | 0 .../graphs/io/temp/30_t.col | 0 .../graphs/io/temp/30_t.map | 0 .../graphs/io/temp/50p1_f.col | 0 .../graphs/io/temp/50p1_t.col | 0 .../graphs/io/temp/50p1_t.map | 0 .../graphs/io/temp/small_f.col | 0 .../graphs/io/temp/small_t.col | 0 .../graphs/io/temp/small_t.map | 0 .../wms/file_rwms_wcnf_L2_V100_C300_0.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_0.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_1.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_2.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_3.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_4.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_5.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_6.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_7.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_8.wcnf | 0 .../wms/file_rwms_wcnf_L3_V70_C300_9.wcnf | 0 .../longrunning/wms/frb10-6-1.wcnf | 0 .../longrunning/wms/frb10-6-2.wcnf | 0 .../longrunning/wms/frb10-6-3.wcnf | 0 .../longrunning/wms/frb10-6-4.wcnf | 0 .../longrunning/wms/frb15-9-1.wcnf | 0 .../longrunning/wms/frb15-9-2.wcnf | 0 .../longrunning/wms/frb15-9-3.wcnf | 0 .../longrunning/wms/frb15-9-4.wcnf | 0 .../longrunning/wms/frb15-9-5.wcnf | 0 .../longrunning/wms/frb20-11-1.wcnf | 0 .../longrunning/wms/frb20-11-2.wcnf | 0 .../longrunning/wms/frb20-11-3.wcnf | 0 .../longrunning/wms/frb20-11-4.wcnf | 0 .../longrunning/wms/frb20-11-5.wcnf | 0 .../longrunning/wms/frb25-13-1.wcnf | 0 .../longrunning/wms/frb25-13-2.wcnf | 0 .../longrunning/wms/frb25-13-3.wcnf | 0 .../longrunning/wms/frb25-13-4.wcnf | 0 .../longrunning/wms/frb25-13-5.wcnf | 0 .../longrunning/wms/ram_k3_n4.ra1.wcnf | 0 .../longrunning/wms/ram_k3_n5.ra1.wcnf | 0 .../longrunning/wms/ram_k3_n6.ra1.wcnf | 0 .../longrunning/wms/result.txt | 0 .../maxsat/c-fat200-2.clq.cnf | 0 .../c5315-bug-gate-0.dimacs.seq.filtered.cnf | 0 .../c6288-bug-gate-0.dimacs.seq.filtered.cnf | 0 .../c7552-bug-gate-0.dimacs.seq.filtered.cnf | 0 ..._comb1._red-gate-0.dimacs.seq.filtered.cnf | 0 ..._comb2._red-gate-0.dimacs.seq.filtered.cnf | 0 ..._comb3._red-gate-0.dimacs.seq.filtered.cnf | 0 ...-bug-onevec-gate-0.dimacs.seq.filtered.cnf | 0 .../c1355_F1001gat-1048gat@1.wcnf | 0 .../c1355_F1183gat-1262gat@1.wcnf | 0 .../partialmaxsat/c1355_F1229gat@1.wcnf | 0 .../c1355_F176gat-1278gat@1.wcnf | 0 .../partialmaxsat/normalized-s3-3-3-1pb.wcnf | 0 .../partialmaxsat/normalized-s3-3-3-2pb.wcnf | 0 .../partialmaxsat/normalized-s3-3-3-3pb.wcnf | 0 .../term1_gr_2pin_w4.shuffled.cnf | 0 .../partialweightedmaxsat/404.wcsp.log.wcnf | 0 .../partialweightedmaxsat/54.wcsp.log.wcnf | 0 .../partialweightedmaxsat/8.wcsp.log.wcnf | 0 ...rmalized-factor-size=9-P=11-Q=283.opb.wcnf | 0 ...ormalized-factor-size=9-P=11-Q=53.opb.wcnf | 0 ...rmalized-factor-size=9-P=13-Q=179.opb.wcnf | 0 ...rmalized-factor-size=9-P=17-Q=347.opb.wcnf | 0 ...rmalized-factor-size=9-P=17-Q=487.opb.wcnf | 0 ...rmalized-factor-size=9-P=23-Q=293.opb.wcnf | 0 .../large/large_industrial.wcnf | 0 .../large/large_weights.wcnf | 0 .../large/t3g3-5555.spn.wcnf | 0 .../term1_gr_2pin_w4.shuffled.cnf | 0 .../sat/3col40_5_10.shuffled.cnf | 0 .../sat/9symml_gr_rcs_w5.shuffled.cnf | 0 .../sat/9symml_gr_rcs_w6.shuffled.cnf | 0 .../sat/D1119_M23.cnf | 0 .../sat/apex7_gr_rcs_w5.shuffled.cnf | 0 .../sat/avg-checker-4-23.shuffled.cnf | 0 .../sat/bart30.shuffled.cnf | 0 .../sat/c499_gr_rcs_w6.shuffled.cnf | 0 .../sat/ca032.shuffled.cnf | 0 .../sat/ca064.shuffled.cnf | 0 .../sat/ca128.shuffled.cnf | 0 .../sat/dp02s02.shuffled.cnf | 0 .../sat/example2_gr_rcs_w6.shuffled.cnf | 0 .../sat/grid_10_20.shuffled.cnf | 0 .../sat/med19.shuffled.cnf | 0 .../resources => test_files}/sat/results.txt | 0 .../sat/term1_gr_rcs_w3.shuffled.cnf | 0 .../sat/term1_gr_rcs_w4.shuffled.cnf | 0 .../sat/too_large_gr_rcs_w5.shuffled.cnf | 0 .../sat/too_large_gr_rcs_w6.shuffled.cnf | 0 .../sat/unsat/aim-100-1_6-no-1.cnf | 0 .../sat/unsat/aim-100-1_6-no-2.cnf | 0 .../sat/unsat/aim-100-1_6-no-3.cnf | 0 .../sat/unsat/aim-100-1_6-no-4.cnf | 0 .../sat/unsat/aim-100-2_0-no-1.cnf | 0 .../sat/unsat/aim-100-2_0-no-2.cnf | 0 .../sat/unsat/aim-100-2_0-no-3.cnf | 0 .../sat/unsat/aim-100-2_0-no-4.cnf | 0 .../sat/unsat/aim-200-1_6-no-1.cnf | 0 .../sat/unsat/aim-200-1_6-no-2.cnf | 0 .../sat/unsat/aim-200-1_6-no-3.cnf | 0 .../sat/unsat/aim-200-1_6-no-4.cnf | 0 .../sat/unsat/aim-200-2_0-no-1.cnf | 0 .../sat/unsat/aim-200-2_0-no-2.cnf | 0 .../sat/unsat/aim-200-2_0-no-3.cnf | 0 .../sat/unsat/aim-200-2_0-no-4.cnf | 0 .../sat/unsat/aim-50-1_6-no-1.cnf | 0 .../sat/unsat/aim-50-1_6-no-2.cnf | 0 .../sat/unsat/aim-50-1_6-no-3.cnf | 0 .../sat/unsat/aim-50-1_6-no-4.cnf | 0 .../sat/unsat/aim-50-2_0-no-1.cnf | 0 .../sat/unsat/aim-50-2_0-no-2.cnf | 0 .../sat/unsat/aim-50-2_0-no-3.cnf | 0 .../sat/unsat/aim-50-2_0-no-4.cnf | 0 .../sat/unsat/bf0432-007.cnf | 0 .../sat/unsat/bf1355-075.cnf | 0 .../sat/unsat/bf1355-638.cnf | 0 .../sat/unsat/bf2670-001.cnf | 0 .../sat/unsat/pret150_25.cnf | 0 .../sat/unsat/pret150_40.cnf | 0 .../sat/unsat/pret150_60.cnf | 0 .../sat/unsat/pret150_75.cnf | 0 .../sat/unsat/pret60_25.cnf | 0 .../sat/unsat/pret60_40.cnf | 0 .../sat/unsat/pret60_60.cnf | 0 .../sat/unsat/pret60_75.cnf | 0 .../sat/x1_16.shuffled.cnf | 0 .../writers/bdd/a_bdd.dot | 0 .../writers/bdd/a_bdd.txt | 0 .../writers/bdd/and_bdd.dot | 0 .../writers/bdd/and_bdd.txt | 0 .../writers/bdd/equiv_bdd.dot | 0 .../writers/bdd/equiv_bdd.txt | 0 .../writers/bdd/false_bdd.dot | 0 .../writers/bdd/false_bdd.txt | 0 .../writers/bdd/formula-dynamic_bdd.dot | 0 .../writers/bdd/formula-dynamic_bdd.txt | 0 .../writers/bdd/formula-fixedStyle_bdd.dot | 0 .../writers/bdd/formula-fixedStyle_bdd.txt | 0 .../writers/bdd/formula_bdd.dot | 0 .../writers/bdd/formula_bdd.txt | 0 .../writers/bdd/impl_bdd.dot | 0 .../writers/bdd/impl_bdd.txt | 0 .../writers/bdd/not_a_bdd.dot | 0 .../writers/bdd/not_a_bdd.txt | 0 .../writers/bdd/not_bdd.dot | 0 .../writers/bdd/not_bdd.txt | 0 .../writers/bdd/or_bdd.dot | 0 .../writers/bdd/or_bdd.txt | 0 .../writers/bdd/true_bdd.dot | 0 .../writers/bdd/true_bdd.txt | 0 .../writers/formulas-ast/f1-ast.dot | 0 .../writers/formulas-ast/f1-ast.txt | 0 .../writers/formulas-ast/f10-ast.dot | 0 .../writers/formulas-ast/f10-ast.txt | 0 .../writers/formulas-ast/f2-ast.dot | 0 .../writers/formulas-ast/f2-ast.txt | 0 .../writers/formulas-ast/f3-ast.dot | 0 .../writers/formulas-ast/f3-ast.txt | 0 .../writers/formulas-ast/f4-ast.dot | 0 .../writers/formulas-ast/f4-ast.txt | 0 .../writers/formulas-ast/f5-ast.dot | 0 .../writers/formulas-ast/f5-ast.txt | 0 .../writers/formulas-ast/f6-ast.dot | 0 .../writers/formulas-ast/f6-ast.txt | 0 .../writers/formulas-ast/f7-ast.dot | 0 .../writers/formulas-ast/f7-ast.txt | 0 .../writers/formulas-ast/f8-ast.dot | 0 .../writers/formulas-ast/f8-ast.txt | 0 .../writers/formulas-ast/f8-ownLabels-ast.dot | 0 .../writers/formulas-ast/f8-ownLabels-ast.txt | 0 .../writers/formulas-ast/f9-ast.dot | 0 .../writers/formulas-ast/f9-ast.txt | 0 .../writers/formulas-ast/false-ast.dot | 0 .../writers/formulas-ast/false-ast.txt | 0 .../writers/formulas-ast/not_x-ast.dot | 0 .../writers/formulas-ast/not_x-ast.txt | 0 .../writers/formulas-ast/true-ast.dot | 0 .../writers/formulas-ast/true-ast.txt | 0 .../writers/formulas-ast/x-ast.dot | 0 .../writers/formulas-ast/x-ast.txt | 0 .../writers/formulas-dag/f1.dot | 0 .../writers/formulas-dag/f1.txt | 0 .../writers/formulas-dag/f10.dot | 0 .../writers/formulas-dag/f10.txt | 0 .../writers/formulas-dag/f2.dot | 0 .../writers/formulas-dag/f2.txt | 0 .../writers/formulas-dag/f3.dot | 0 .../writers/formulas-dag/f3.txt | 0 .../writers/formulas-dag/f4.dot | 0 .../writers/formulas-dag/f4.txt | 0 .../writers/formulas-dag/f5.dot | 0 .../writers/formulas-dag/f5.txt | 0 .../writers/formulas-dag/f6.dot | 0 .../writers/formulas-dag/f6.txt | 0 .../writers/formulas-dag/f7.dot | 0 .../writers/formulas-dag/f7.txt | 0 .../writers/formulas-dag/f8.dot | 0 .../writers/formulas-dag/f8.txt | 0 .../writers/formulas-dag/f9.dot | 0 .../writers/formulas-dag/f9.txt | 0 .../writers/formulas-dag/false.dot | 0 .../writers/formulas-dag/false.txt | 0 .../writers/formulas-dag/not_x.dot | 0 .../writers/formulas-dag/not_x.txt | 0 .../writers/formulas-dag/true.dot | 0 .../writers/formulas-dag/true.txt | 0 .../writers/formulas-dag/x.dot | 0 .../writers/formulas-dag/x.txt | 0 .../writers/formulas-dimacs/f1_f.cnf | 0 .../writers/formulas-dimacs/f1_t.cnf | 0 .../writers/formulas-dimacs/f1_t.map | 0 .../writers/formulas-dimacs/f2_f.cnf | 0 .../writers/formulas-dimacs/f2_t.cnf | 0 .../writers/formulas-dimacs/f2_t.map | 0 .../writers/formulas-dimacs/f3_f.cnf | 0 .../writers/formulas-dimacs/f3_t.cnf | 0 .../writers/formulas-dimacs/f3_t.map | 0 .../writers/formulas-dimacs/f4_f.cnf | 0 .../writers/formulas-dimacs/f4_t.cnf | 0 .../writers/formulas-dimacs/f4_t.map | 0 .../writers/formulas-dimacs/f5_f.cnf | 0 .../writers/formulas-dimacs/f5_t.cnf | 0 .../writers/formulas-dimacs/f5_t.map | 0 .../writers/formulas-dimacs/f6_f.cnf | 0 .../writers/formulas-dimacs/f6_t.cnf | 0 .../writers/formulas-dimacs/f6_t.map | 0 .../writers/formulas-dimacs/f7_f.cnf | 0 .../writers/formulas-dimacs/f7_t.cnf | 0 .../writers/formulas-dimacs/f7_t.map | 0 .../writers/formulas-dimacs/false_f.cnf | 0 .../writers/formulas-dimacs/false_t.cnf | 0 .../writers/formulas-dimacs/false_t.map | 0 .../writers/formulas-dimacs/not_x_f.cnf | 0 .../writers/formulas-dimacs/not_x_t.cnf | 0 .../writers/formulas-dimacs/not_x_t.map | 0 .../writers/formulas-dimacs/true_f.cnf | 0 .../writers/formulas-dimacs/true_t.cnf | 0 .../writers/formulas-dimacs/true_t.map | 0 .../writers/formulas-dimacs/x_f.cnf | 0 .../writers/formulas-dimacs/x_t.cnf | 0 .../writers/formulas-dimacs/x_t.map | 0 .../writers/graph/30-dynamic.dot | 0 .../writers/graph/30-dynamic.txt | 0 .../writers/graph/30.dot | 0 .../writers/graph/30.txt | 0 .../writers/graph/50p1.dot | 0 .../writers/graph/50p1.txt | 0 .../writers/graph/small-fixedStyle.dot | 0 .../writers/graph/small-fixedStyle.txt | 0 .../writers/graph/small.dot | 0 .../writers/graph/small.txt | 0 .../writers/temp/.empty | 0 328 files changed, 225 insertions(+), 215 deletions(-) delete mode 100644 parser/src/test/resources/formula1.txt delete mode 100644 parser/src/test/resources/formula2.txt rename {core/src/test/resources => test_files}/backbones/backbone_large_formula.txt (100%) rename {core/src/test/resources => test_files}/backbones/backbone_small_formulas.txt (100%) rename {core/src/test/resources => test_files}/dimacs/malformed/contains-line-without-zero.cnf (100%) rename {core/src/test/resources => test_files}/dnnf/both_bdd_dnnf_1.cnf (100%) rename {core/src/test/resources => test_files}/dnnf/both_bdd_dnnf_2.cnf (100%) rename {core/src/test/resources => test_files}/dnnf/both_bdd_dnnf_3.cnf (100%) rename {core/src/test/resources => test_files}/dnnf/both_bdd_dnnf_4.cnf (100%) rename {core/src/test/resources => test_files}/dnnf/both_bdd_dnnf_5.cnf (100%) rename {core/src/test/resources => test_files}/drup/avg_input.cnf (100%) rename {core/src/test/resources => test_files}/drup/pg4_input.cnf (100%) rename {core/src/test/resources => test_files}/drup/simple_input.cnf (100%) rename {core/src/test/resources => test_files}/formulas/formula1.txt (100%) rename {core/src/test/resources => test_files}/formulas/formula2.txt (100%) rename {core/src/test/resources => test_files}/formulas/formula3.txt (100%) rename {core/src/test/resources => test_files}/formulas/large_formula.txt (100%) rename serialization/src/test/resources/large_formula.txt => test_files/formulas/largest_formula.txt (100%) rename {core/src/test/resources => test_files}/formulas/simplify_formulas.txt (100%) rename {core/src/test/resources => test_files}/formulas/small_formulas.txt (100%) rename {core/src/test/resources => test_files}/graphs/graph30.txt (100%) rename {core/src/test/resources => test_files}/graphs/graph50.txt (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/30_f.col (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/30_t.col (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/30_t.map (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/50p1_f.col (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/50p1_t.col (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/50p1_t.map (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/small_f.col (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/small_t.col (100%) rename {core/src/test/resources => test_files}/graphs/io/graphs-dimacs/small_t.map (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/.empty (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/30_f.col (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/30_t.col (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/30_t.map (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/50p1_f.col (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/50p1_t.col (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/50p1_t.map (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/small_f.col (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/small_t.col (100%) rename {core/src/test/resources => test_files}/graphs/io/temp/small_t.map (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L2_V100_C300_0.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_0.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_2.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_3.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_4.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_5.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_6.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_7.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_8.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/file_rwms_wcnf_L3_V70_C300_9.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb10-6-1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb10-6-2.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb10-6-3.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb10-6-4.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb15-9-1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb15-9-2.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb15-9-3.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb15-9-4.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb15-9-5.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb20-11-1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb20-11-2.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb20-11-3.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb20-11-4.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb20-11-5.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb25-13-1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb25-13-2.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb25-13-3.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb25-13-4.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/frb25-13-5.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/ram_k3_n4.ra1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/ram_k3_n5.ra1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/ram_k3_n6.ra1.wcnf (100%) rename {core/src/test/resources => test_files}/longrunning/wms/result.txt (100%) rename {core/src/test/resources => test_files}/maxsat/c-fat200-2.clq.cnf (100%) rename {core/src/test/resources => test_files}/maxsat/c5315-bug-gate-0.dimacs.seq.filtered.cnf (100%) rename {core/src/test/resources => test_files}/maxsat/c6288-bug-gate-0.dimacs.seq.filtered.cnf (100%) rename {core/src/test/resources => test_files}/maxsat/c7552-bug-gate-0.dimacs.seq.filtered.cnf (100%) rename {core/src/test/resources => test_files}/maxsat/mot_comb1._red-gate-0.dimacs.seq.filtered.cnf (100%) rename {core/src/test/resources => test_files}/maxsat/mot_comb2._red-gate-0.dimacs.seq.filtered.cnf (100%) rename {core/src/test/resources => test_files}/maxsat/mot_comb3._red-gate-0.dimacs.seq.filtered.cnf (100%) rename {core/src/test/resources => test_files}/maxsat/s15850-bug-onevec-gate-0.dimacs.seq.filtered.cnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/c1355_F1001gat-1048gat@1.wcnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/c1355_F1183gat-1262gat@1.wcnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/c1355_F1229gat@1.wcnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/c1355_F176gat-1278gat@1.wcnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/normalized-s3-3-3-1pb.wcnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/normalized-s3-3-3-2pb.wcnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/normalized-s3-3-3-3pb.wcnf (100%) rename {core/src/test/resources => test_files}/partialmaxsat/term1_gr_2pin_w4.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/404.wcsp.log.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/54.wcsp.log.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/8.wcsp.log.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=283.opb.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=53.opb.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/bmo/normalized-factor-size=9-P=13-Q=179.opb.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=347.opb.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=487.opb.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/bmo/normalized-factor-size=9-P=23-Q=293.opb.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/large/large_industrial.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/large/large_weights.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/large/t3g3-5555.spn.wcnf (100%) rename {core/src/test/resources => test_files}/partialweightedmaxsat/term1_gr_2pin_w4.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/3col40_5_10.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/9symml_gr_rcs_w5.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/9symml_gr_rcs_w6.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/D1119_M23.cnf (100%) rename {core/src/test/resources => test_files}/sat/apex7_gr_rcs_w5.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/avg-checker-4-23.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/bart30.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/c499_gr_rcs_w6.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/ca032.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/ca064.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/ca128.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/dp02s02.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/example2_gr_rcs_w6.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/grid_10_20.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/med19.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/results.txt (100%) rename {core/src/test/resources => test_files}/sat/term1_gr_rcs_w3.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/term1_gr_rcs_w4.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/too_large_gr_rcs_w5.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/too_large_gr_rcs_w6.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-1_6-no-1.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-1_6-no-2.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-1_6-no-3.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-1_6-no-4.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-2_0-no-1.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-2_0-no-2.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-2_0-no-3.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-100-2_0-no-4.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-1_6-no-1.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-1_6-no-2.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-1_6-no-3.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-1_6-no-4.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-2_0-no-1.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-2_0-no-2.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-2_0-no-3.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-200-2_0-no-4.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-1_6-no-1.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-1_6-no-2.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-1_6-no-3.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-1_6-no-4.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-2_0-no-1.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-2_0-no-2.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-2_0-no-3.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/aim-50-2_0-no-4.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/bf0432-007.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/bf1355-075.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/bf1355-638.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/bf2670-001.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret150_25.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret150_40.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret150_60.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret150_75.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret60_25.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret60_40.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret60_60.cnf (100%) rename {core/src/test/resources => test_files}/sat/unsat/pret60_75.cnf (100%) rename {core/src/test/resources => test_files}/sat/x1_16.shuffled.cnf (100%) rename {core/src/test/resources => test_files}/writers/bdd/a_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/a_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/and_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/and_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/equiv_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/equiv_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/false_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/false_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/formula-dynamic_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/formula-dynamic_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/formula-fixedStyle_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/formula-fixedStyle_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/formula_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/formula_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/impl_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/impl_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/not_a_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/not_a_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/not_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/not_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/or_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/or_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/bdd/true_bdd.dot (100%) rename {core/src/test/resources => test_files}/writers/bdd/true_bdd.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f1-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f1-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f10-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f10-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f2-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f2-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f3-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f3-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f4-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f4-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f5-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f5-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f6-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f6-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f7-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f7-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f8-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f8-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f8-ownLabels-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f8-ownLabels-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f9-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/f9-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/false-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/false-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/not_x-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/not_x-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/true-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/true-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/x-ast.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-ast/x-ast.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f1.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f1.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f10.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f10.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f2.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f2.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f3.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f3.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f4.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f4.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f5.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f5.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f6.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f6.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f7.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f7.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f8.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f8.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f9.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/f9.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/false.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/false.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/not_x.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/not_x.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/true.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/true.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/x.dot (100%) rename {core/src/test/resources => test_files}/writers/formulas-dag/x.txt (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f1_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f1_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f1_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f2_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f2_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f2_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f3_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f3_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f3_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f4_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f4_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f4_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f5_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f5_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f5_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f6_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f6_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f6_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f7_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f7_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/f7_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/false_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/false_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/false_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/not_x_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/not_x_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/not_x_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/true_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/true_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/true_t.map (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/x_f.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/x_t.cnf (100%) rename {core/src/test/resources => test_files}/writers/formulas-dimacs/x_t.map (100%) rename {core/src/test/resources => test_files}/writers/graph/30-dynamic.dot (100%) rename {core/src/test/resources => test_files}/writers/graph/30-dynamic.txt (100%) rename {core/src/test/resources => test_files}/writers/graph/30.dot (100%) rename {core/src/test/resources => test_files}/writers/graph/30.txt (100%) rename {core/src/test/resources => test_files}/writers/graph/50p1.dot (100%) rename {core/src/test/resources => test_files}/writers/graph/50p1.txt (100%) rename {core/src/test/resources => test_files}/writers/graph/small-fixedStyle.dot (100%) rename {core/src/test/resources => test_files}/writers/graph/small-fixedStyle.txt (100%) rename {core/src/test/resources => test_files}/writers/graph/small.dot (100%) rename {core/src/test/resources => test_files}/writers/graph/small.txt (100%) rename {core/src/test/resources => test_files}/writers/temp/.empty (100%) diff --git a/.gitignore b/.gitignore index c80879df..8b43271b 100644 --- a/.gitignore +++ b/.gitignore @@ -14,15 +14,15 @@ target/ .sonar/ # test logs -core/src/test/resources/maxsat/log.txt -core/src/test/resources/partialmaxsat/log.txt -core/src/test/resources/partialweightedmaxsat/log.txt +test_files/maxsat/log.txt +test_files/partialmaxsat/log.txt +test_files/partialweightedmaxsat/log.txt # test temporary files -core/src/test/resources/writers/temp/*.dot -core/src/test/resources/writers/temp/*.txt -core/src/test/resources/writers/temp/*.cnf -core/src/test/resources/writers/temp/*.map +test_files/writers/temp/*.dot +test_files/writers/temp/*.txt +test_files/writers/temp/*.cnf +test_files/writers/temp/*.map # LSP .settings diff --git a/core/pom.xml b/core/pom.xml index bc2d79de..f3492871 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -207,4 +207,25 @@ test + + + + parallel-tests + + + + org.apache.maven.plugins + maven-surefire-plugin + + -Xmx16g + + true + concurrent + + + + + + + diff --git a/core/src/test/java/com/booleworks/logicng/backbones/BackboneGenerationTest.java b/core/src/test/java/com/booleworks/logicng/backbones/BackboneGenerationTest.java index 930effef..554f4985 100644 --- a/core/src/test/java/com/booleworks/logicng/backbones/BackboneGenerationTest.java +++ b/core/src/test/java/com/booleworks/logicng/backbones/BackboneGenerationTest.java @@ -22,7 +22,6 @@ import com.booleworks.logicng.solvers.SolverState; import com.booleworks.logicng.solvers.functions.BackboneFunction; import com.booleworks.logicng.util.FormulaHelper; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import java.io.IOException; @@ -114,7 +113,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(x); solver.loadState(before); @@ -122,7 +121,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(x, y); solver.loadState(before); @@ -130,7 +129,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .isEmpty(); solver.loadState(before); @@ -138,7 +137,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(x.negate(f)); solver.loadState(before); @@ -146,7 +145,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(x); solver.loadState(before); @@ -154,7 +153,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .isEmpty(); solver.loadState(before); @@ -162,7 +161,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(x, y); solver.loadState(before); @@ -170,7 +169,7 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(y); solver.loadState(before); @@ -178,14 +177,14 @@ public void testSimpleBackbones() { before = solver.saveState(); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(x.negate(f), y, z); solver.loadState(before); formula = f.and(f.or(x, y), f.or(u, v), z); solver.add(formula); assertThat( - solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) + solver.execute(BackboneFunction.builder().variables(variables).build()).getCompleteBackbone(f)) .containsExactly(z); } @@ -194,7 +193,7 @@ public void testSimpleBackbones() { public void testSmallFormulas() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.caching(); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/small_formulas.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/small_formulas.txt"); final SATSolver solver = SATSolver.newSolver(f); solver.add(formula); final Backbone backbone = solver.execute(BackboneFunction.builder().variables(formula.variables(f)).build()); @@ -205,7 +204,7 @@ public void testSmallFormulas() throws IOException, ParserException { public void testLargeFormula() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.caching(); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); final SATSolver solver = SATSolver.newSolver(f); solver.add(formula); final Backbone backbone = solver.execute(BackboneFunction.builder().variables(formula.variables(f)).build()); @@ -321,7 +320,7 @@ public void testBackboneType() { @Test public void testCancellationPoints() throws IOException { - final List formulas = DimacsReader.readCNF(f, "src/test/resources/sat/term1_gr_rcs_w4.shuffled.cnf"); + final List formulas = DimacsReader.readCNF(f, "../test_files/sat/term1_gr_rcs_w4.shuffled.cnf"); for (int numStarts = 0; numStarts < 10; numStarts++) { final ComputationHandler handler = new BoundedSatHandler(numStarts); final LNGResult result = BackboneGeneration.compute(f, formulas, FormulaHelper.variables(f, formulas), diff --git a/core/src/test/java/com/booleworks/logicng/explanations/drup/DRUPTest.java b/core/src/test/java/com/booleworks/logicng/explanations/drup/DRUPTest.java index 7cdf001f..6b827c5a 100644 --- a/core/src/test/java/com/booleworks/logicng/explanations/drup/DRUPTest.java +++ b/core/src/test/java/com/booleworks/logicng/explanations/drup/DRUPTest.java @@ -21,7 +21,6 @@ import com.booleworks.logicng.solvers.SolverState; import com.booleworks.logicng.solvers.sat.SATCall; import com.booleworks.logicng.solvers.sat.SATSolverConfig; -import org.assertj.core.api.Assertions; import org.assertj.core.api.SoftAssertions; import org.junit.jupiter.api.Test; @@ -42,9 +41,9 @@ public class DRUPTest implements LogicNGTest { @LongRunningTag public void testUnsatCoresFromDimacs() throws IOException { final List> cnfs = new ArrayList<>(3); - cnfs.add(DimacsReader.readCNF(f, "src/test/resources/drup/simple_input.cnf")); - cnfs.add(DimacsReader.readCNF(f, "src/test/resources/drup/pg4_input.cnf")); - cnfs.add(DimacsReader.readCNF(f, "src/test/resources/drup/avg_input.cnf", "var")); + cnfs.add(DimacsReader.readCNF(f, "../test_files/drup/simple_input.cnf")); + cnfs.add(DimacsReader.readCNF(f, "../test_files/drup/pg4_input.cnf")); + cnfs.add(DimacsReader.readCNF(f, "../test_files/drup/avg_input.cnf", "var")); for (final List cnf : cnfs) { final SATSolver solver = solverSupplier.get(); @@ -58,7 +57,7 @@ public void testUnsatCoresFromDimacs() throws IOException { @Test @LongRunningTag public void testUnsatCoresFromLargeTestset() throws IOException { - final File testFolder = new File("src/test/resources/sat"); + final File testFolder = new File("../test_files/sat"); final File[] files = testFolder.listFiles(); assert files != null; int count = 0; @@ -80,7 +79,7 @@ public void testUnsatCoresFromLargeTestset() throws IOException { @Test public void testUnsatCoresAimTestset() throws IOException { - final File testFolder = new File("src/test/resources/sat/unsat"); + final File testFolder = new File("../test_files/sat/unsat"); final File[] files = testFolder.listFiles(); assert files != null; int count = 0; diff --git a/core/src/test/java/com/booleworks/logicng/explanations/mus/MUSGenerationTest.java b/core/src/test/java/com/booleworks/logicng/explanations/mus/MUSGenerationTest.java index 62834a3a..f3512745 100644 --- a/core/src/test/java/com/booleworks/logicng/explanations/mus/MUSGenerationTest.java +++ b/core/src/test/java/com/booleworks/logicng/explanations/mus/MUSGenerationTest.java @@ -51,10 +51,10 @@ public MUSGenerationTest() throws IOException { pg5 = generatePGPropositions(5); pg6 = generatePGPropositions(6); pg7 = generatePGPropositions(7); - file1 = readDimacs("src/test/resources/sat/3col40_5_10.shuffled.cnf"); - file2 = readDimacs("src/test/resources/sat/x1_16.shuffled.cnf"); - file3 = readDimacs("src/test/resources/sat/grid_10_20.shuffled.cnf"); - file4 = readDimacs("src/test/resources/sat/ca032.shuffled.cnf"); + file1 = readDimacs("../test_files/sat/3col40_5_10.shuffled.cnf"); + file2 = readDimacs("../test_files/sat/x1_16.shuffled.cnf"); + file3 = readDimacs("../test_files/sat/grid_10_20.shuffled.cnf"); + file4 = readDimacs("../test_files/sat/ca032.shuffled.cnf"); } @Test @@ -126,7 +126,7 @@ public void testPlainInsertionBasedMUS() { public void testDeletionBasedCancellationPoints() throws IOException { final MUSGeneration mus = new MUSGeneration(); final List propositions = - DimacsReader.readCNF(f, "src/test/resources/sat/too_large_gr_rcs_w5.shuffled.cnf").stream() + DimacsReader.readCNF(f, "../test_files/sat/too_large_gr_rcs_w5.shuffled.cnf").stream() .map(StandardProposition::new) .collect(Collectors.toList()); for (int numStarts = 0; numStarts < 20; numStarts++) { @@ -141,7 +141,7 @@ public void testDeletionBasedCancellationPoints() throws IOException { public void testCancellationPoints() throws IOException { final MUSGeneration mus = new MUSGeneration(); final List propositions = - DimacsReader.readCNF(f, "src/test/resources/sat/unsat/bf0432-007.cnf").stream() + DimacsReader.readCNF(f, "../test_files/sat/unsat/bf0432-007.cnf").stream() .map(StandardProposition::new) .collect(Collectors.toList()); final List algorithms = diff --git a/core/src/test/java/com/booleworks/logicng/explanations/smus/SmusComputationTest.java b/core/src/test/java/com/booleworks/logicng/explanations/smus/SmusComputationTest.java index 47f16dd7..900c645d 100644 --- a/core/src/test/java/com/booleworks/logicng/explanations/smus/SmusComputationTest.java +++ b/core/src/test/java/com/booleworks/logicng/explanations/smus/SmusComputationTest.java @@ -230,7 +230,7 @@ public void testTimeoutHandlerLarge() throws ParserException, IOException { new TimeoutHandler(System.currentTimeMillis() + 1L, FIXED_END) ); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); final List formulas = formula.stream().collect(Collectors.toList()); for (final TimeoutHandler handler : handlers) { testHandler(handler, formulas, true); @@ -240,7 +240,7 @@ public void testTimeoutHandlerLarge() throws ParserException, IOException { @Test @LongRunningTag public void testCancellationPoints() throws IOException { - final List formulas = DimacsReader.readCNF(f, "src/test/resources/sat/unsat/bf0432-007.cnf"); + final List formulas = DimacsReader.readCNF(f, "../test_files/sat/unsat/bf0432-007.cnf"); for (int numOptimizationStarts = 1; numOptimizationStarts < 5; numOptimizationStarts++) { for (int numSatHandlerStarts = 1; numSatHandlerStarts < 10; numSatHandlerStarts++) { final ComputationHandler handler = diff --git a/core/src/test/java/com/booleworks/logicng/functions/MinimumPrimeImplicantTest.java b/core/src/test/java/com/booleworks/logicng/functions/MinimumPrimeImplicantTest.java index 6e0f9938..95c56444 100644 --- a/core/src/test/java/com/booleworks/logicng/functions/MinimumPrimeImplicantTest.java +++ b/core/src/test/java/com/booleworks/logicng/functions/MinimumPrimeImplicantTest.java @@ -83,7 +83,8 @@ public void testSmallExamples() throws ParserException { isPrimeImplicant(formula, pi); formula = f.parse( - "v173 + v174 + v451 + v258 + v317 + v259 + v452 + v453 + v175 + v176 + v177 + v178 + v179 + v180 + v181 + v182 + v183 + v102 + v103 + v104 + v105 = 1"); + "v173 + v174 + v451 + v258 + v317 + v259 + v452 + v453 + v175 + v176 + v177 + v178 + v179 + v180 + v181 + v182 + v183 + v102 + v103 + v104 + " + + "v105 = 1"); pi = formula.apply(new MinimumPrimeImplicantFunction(f)); assertThat(pi).hasSize(21); isPrimeImplicant(formula, pi); @@ -91,7 +92,7 @@ public void testSmallExamples() throws ParserException { @Test public void testMiddleExamples() throws IOException, ParserException { - final Formula parsed = FormulaReader.readFormula(f, "src/test/resources/formulas/formula1.txt"); + final Formula parsed = FormulaReader.readFormula(f, "../test_files/formulas/formula1.txt"); for (final Formula formula : parsed) { isPrimeImplicant(formula, formula.apply(new MinimumPrimeImplicantFunction(f))); } @@ -100,7 +101,7 @@ public void testMiddleExamples() throws IOException, ParserException { @Test public void testLargeExamples() throws IOException, ParserException { final Formula parsed = - FormulaReader.readFormula(f, "src/test/resources/formulas/small_formulas.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/small_formulas.txt"); for (final Formula formula : parsed) { isPrimeImplicant(formula, formula.apply(new MinimumPrimeImplicantFunction(f))); } diff --git a/core/src/test/java/com/booleworks/logicng/graphs/algorithms/ConnectedComponentsComputerTest.java b/core/src/test/java/com/booleworks/logicng/graphs/algorithms/ConnectedComponentsComputerTest.java index f9715949..dc132807 100644 --- a/core/src/test/java/com/booleworks/logicng/graphs/algorithms/ConnectedComponentsComputerTest.java +++ b/core/src/test/java/com/booleworks/logicng/graphs/algorithms/ConnectedComponentsComputerTest.java @@ -100,7 +100,7 @@ public void graph50Test() throws IOException { public void testFormulaSplit() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.caching(); f.putConfiguration(EncoderConfig.builder().amoEncoding(EncoderConfig.AMO_ENCODER.PURE).build()); - final Formula parsed = FormulaReader.readFormula(f, "src/test/resources/formulas/formula1.txt"); + final Formula parsed = FormulaReader.readFormula(f, "../test_files/formulas/formula1.txt"); final List formulas = new ArrayList<>(); final List originalFormulas = new ArrayList<>(); for (final Formula formula : parsed) { diff --git a/core/src/test/java/com/booleworks/logicng/graphs/datastructures/GraphTest.java b/core/src/test/java/com/booleworks/logicng/graphs/datastructures/GraphTest.java index 307e74a0..0b91118c 100644 --- a/core/src/test/java/com/booleworks/logicng/graphs/datastructures/GraphTest.java +++ b/core/src/test/java/com/booleworks/logicng/graphs/datastructures/GraphTest.java @@ -22,7 +22,7 @@ public static Graph getLongGraph(final String id) throws IOException { final Graph g = new Graph<>(id + "-Long"); final BufferedReader reader = - new BufferedReader(new FileReader("src/test/resources/graphs/graph" + id + ".txt")); + new BufferedReader(new FileReader("../test_files/graphs/graph" + id + ".txt")); while (reader.ready()) { final String line = reader.readLine().trim(); diff --git a/core/src/test/java/com/booleworks/logicng/graphs/generators/ConstraintGraphGeneratorTest.java b/core/src/test/java/com/booleworks/logicng/graphs/generators/ConstraintGraphGeneratorTest.java index 0dcbabad..0f79e3b1 100644 --- a/core/src/test/java/com/booleworks/logicng/graphs/generators/ConstraintGraphGeneratorTest.java +++ b/core/src/test/java/com/booleworks/logicng/graphs/generators/ConstraintGraphGeneratorTest.java @@ -86,10 +86,10 @@ public void testCnf() throws ParserException { expected.connect(d, a); expected.connect(d, e); assertThat(ConstraintGraphGenerator.generateFromFormulas(f, - p.parse("a | ~b | c"), - p.parse("d | ~a"), - p.parse("d + e = 1"), - p.parse("g")).toString()) + p.parse("a | ~b | c"), + p.parse("d | ~a"), + p.parse("d + e = 1"), + p.parse("g")).toString()) .isEqualTo(expected.toString()); } @@ -97,7 +97,7 @@ public void testCnf() throws ParserException { public void testRealExample() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.caching(); f.putConfiguration(EncoderConfig.builder().amoEncoding(EncoderConfig.AMO_ENCODER.PURE).build()); - final Formula parsed = FormulaReader.readFormula(f, "src/test/resources/formulas/formula1.txt"); + final Formula parsed = FormulaReader.readFormula(f, "../test_files/formulas/formula1.txt"); final List formulas = new ArrayList<>(); for (final Formula formula : parsed) { if (formula instanceof PBConstraint) { diff --git a/core/src/test/java/com/booleworks/logicng/graphs/io/GraphDimacsFileWriterTest.java b/core/src/test/java/com/booleworks/logicng/graphs/io/GraphDimacsFileWriterTest.java index 7f208a1a..4aa638a1 100644 --- a/core/src/test/java/com/booleworks/logicng/graphs/io/GraphDimacsFileWriterTest.java +++ b/core/src/test/java/com/booleworks/logicng/graphs/io/GraphDimacsFileWriterTest.java @@ -48,14 +48,14 @@ public void test50p1() throws IOException { } private void testFiles(final String fileName, final Graph g) throws IOException { - GraphDimacsFileWriter.write("src/test/resources/graphs/io/temp/" + fileName + "_t.col", g, true); - GraphDimacsFileWriter.write("src/test/resources/graphs/io/temp/" + fileName + "_f", g, false); - final File expectedT = new File("src/test/resources/graphs/io/graphs-dimacs/" + fileName + "_t.col"); - final File expectedF = new File("src/test/resources/graphs/io/graphs-dimacs/" + fileName + "_f.col"); - final File tempT = new File("src/test/resources/graphs/io/temp/" + fileName + "_t.col"); - final File tempF = new File("src/test/resources/graphs/io/temp/" + fileName + "_f.col"); - final File expectedMap = new File("src/test/resources/graphs/io/graphs-dimacs/" + fileName + "_t.map"); - final File tempMap = new File("src/test/resources/graphs/io/temp/" + fileName + "_t.map"); + GraphDimacsFileWriter.write("../test_files/graphs/io/temp/" + fileName + "_t.col", g, true); + GraphDimacsFileWriter.write("../test_files/graphs/io/temp/" + fileName + "_f", g, false); + final File expectedT = new File("../test_files/graphs/io/graphs-dimacs/" + fileName + "_t.col"); + final File expectedF = new File("../test_files/graphs/io/graphs-dimacs/" + fileName + "_f.col"); + final File tempT = new File("../test_files/graphs/io/temp/" + fileName + "_t.col"); + final File tempF = new File("../test_files/graphs/io/temp/" + fileName + "_f.col"); + final File expectedMap = new File("../test_files/graphs/io/graphs-dimacs/" + fileName + "_t.map"); + final File tempMap = new File("../test_files/graphs/io/temp/" + fileName + "_t.map"); assertFilesEqual(expectedT, tempT); assertFilesEqual(expectedF, tempF); assertMapFilesEqual(expectedMap, tempMap); diff --git a/core/src/test/java/com/booleworks/logicng/handlers/TimeoutMaxSATHandlerTest.java b/core/src/test/java/com/booleworks/logicng/handlers/TimeoutMaxSATHandlerTest.java index 62911cd9..48ab2045 100644 --- a/core/src/test/java/com/booleworks/logicng/handlers/TimeoutMaxSATHandlerTest.java +++ b/core/src/test/java/com/booleworks/logicng/handlers/TimeoutMaxSATHandlerTest.java @@ -91,7 +91,7 @@ public void testThatMethodsAreCalled() throws ParserException { @Test public void testTimeoutHandlerSingleTimeout() throws IOException { final List formulas = - DimacsReader.readCNF(f, "src/test/resources/sat/too_large_gr_rcs_w5.shuffled.cnf"); + DimacsReader.readCNF(f, "../test_files/sat/too_large_gr_rcs_w5.shuffled.cnf"); for (final MaxSATSolver solver : solvers) { final int weight = solver.isWeighted() ? 2 : 1; formulas.forEach(c -> solver.addSoftFormula(c, weight)); diff --git a/core/src/test/java/com/booleworks/logicng/handlers/TimeoutOptimizationHandlerTest.java b/core/src/test/java/com/booleworks/logicng/handlers/TimeoutOptimizationHandlerTest.java index 9d4d9b36..f725f55a 100644 --- a/core/src/test/java/com/booleworks/logicng/handlers/TimeoutOptimizationHandlerTest.java +++ b/core/src/test/java/com/booleworks/logicng/handlers/TimeoutOptimizationHandlerTest.java @@ -77,7 +77,7 @@ public void testThatMethodsAreCalled() throws ParserException { @Test public void testTimeoutHandlerSingleTimeout() throws IOException { final List formulas = - DimacsReader.readCNF(f, "src/test/resources/sat/too_large_gr_rcs_w5.shuffled.cnf"); + DimacsReader.readCNF(f, "../test_files/sat/too_large_gr_rcs_w5.shuffled.cnf"); for (final SATSolver solver : solvers) { solver.add(formulas); final TimeoutHandler handler = new TimeoutHandler(10L); @@ -92,7 +92,7 @@ public void testTimeoutHandlerSingleTimeout() throws IOException { @Test public void testTimeoutHandlerFixedEnd() throws IOException { final List formulas = - DimacsReader.readCNF(f, "src/test/resources/sat/too_large_gr_rcs_w5.shuffled.cnf"); + DimacsReader.readCNF(f, "../test_files/sat/too_large_gr_rcs_w5.shuffled.cnf"); for (final SATSolver solver : solvers) { solver.add(formulas); final TimeoutHandler handler = new TimeoutHandler(100L, FIXED_END); diff --git a/core/src/test/java/com/booleworks/logicng/io/FormulaWriterReaderTest.java b/core/src/test/java/com/booleworks/logicng/io/FormulaWriterReaderTest.java index 129bf18f..a42ae3ce 100644 --- a/core/src/test/java/com/booleworks/logicng/io/FormulaWriterReaderTest.java +++ b/core/src/test/java/com/booleworks/logicng/io/FormulaWriterReaderTest.java @@ -28,7 +28,7 @@ public class FormulaWriterReaderTest { @Test public void testSimpleFormulaOneLine() throws ParserException, IOException { - final String fileName = "src/test/resources/writers/temp/simple_formula1.txt"; + final String fileName = "../test_files/writers/temp/simple_formula1.txt"; final File file = new File(fileName); final FormulaFactory f = FormulaFactory.caching(); final Formula p1 = new PropositionalParser(f).parse("A & B & ~(C | (D => ~E))"); @@ -50,7 +50,7 @@ public void testSimpleFormulaOneLine() throws ParserException, IOException { @Test public void testSimpleFormulaMultiLine() throws ParserException, IOException { - final String fileName = "src/test/resources/writers/temp/simple_formula2.txt"; + final String fileName = "../test_files/writers/temp/simple_formula2.txt"; final File file = new File(fileName); final FormulaFactory f = FormulaFactory.caching(); final Formula p1 = new PropositionalParser(f).parse("A & B & ~(C | (D => ~E))"); @@ -70,7 +70,7 @@ public void testSimpleFormulaMultiLine() throws ParserException, IOException { @Test public void testPBFormulaOneLine() throws ParserException, IOException { - final String fileName = "src/test/resources/writers/temp/simple_formula3.txt"; + final String fileName = "../test_files/writers/temp/simple_formula3.txt"; final File file = new File(fileName); final FormulaFactory f = FormulaFactory.caching(); final Formula p1 = new PropositionalParser(f).parse("A & B & ~(C | (D => ~E)) & (2*y + 3*y >= 4) & (x <= 1)"); @@ -92,7 +92,7 @@ public void testPBFormulaOneLine() throws ParserException, IOException { @Test public void testPBFormulaMultiLine() throws ParserException, IOException { - final String fileName = "src/test/resources/writers/temp/simple_formula4.txt"; + final String fileName = "../test_files/writers/temp/simple_formula4.txt"; final File file = new File(fileName); final FormulaFactory f = FormulaFactory.caching(); final Formula p1 = new PropositionalParser(f).parse("A & B & ~(C | (D => ~E)) & (2*y + 3*y >= 4) & (x <= 1)"); @@ -112,7 +112,7 @@ public void testPBFormulaMultiLine() throws ParserException, IOException { @Test public void testSimpleFormulaOneLineFormatter() throws ParserException, IOException { - final String fileName = "src/test/resources/writers/temp/simple_formula5.txt"; + final String fileName = "../test_files/writers/temp/simple_formula5.txt"; final File file = new File(fileName); final FormulaFactory f = FormulaFactory.caching(); final Formula p1 = new PropositionalParser(f).parse("A & B & ~(C | (D => ~E))"); @@ -126,7 +126,7 @@ public void testSimpleFormulaOneLineFormatter() throws ParserException, IOExcept @Test public void testSimpleFormulaMultiLineFormatter() throws ParserException, IOException { - final String fileName = "src/test/resources/writers/temp/simple_formula6.txt"; + final String fileName = "../test_files/writers/temp/simple_formula6.txt"; final File file = new File(fileName); final FormulaFactory f = FormulaFactory.caching(); final Formula p1 = new PropositionalParser(f).parse("A & B & ~(C | (D => ~E))"); diff --git a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/BddGraphicalGeneratorTest.java b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/BddGraphicalGeneratorTest.java index d0981f18..50899b83 100644 --- a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/BddGraphicalGeneratorTest.java +++ b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/BddGraphicalGeneratorTest.java @@ -95,10 +95,10 @@ public void testDynamic() throws ParserException, IOException { private void testFiles(final String fileName, final BDD bdd, final BddGraphicalGenerator generator) throws IOException { final GraphicalRepresentation representation = generator.translate(bdd); - representation.write("src/test/resources/writers/temp/" + fileName + "_bdd.dot", GraphicalDotWriter.get()); - representation.write("src/test/resources/writers/temp/" + fileName + "_bdd.txt", GraphicalMermaidWriter.get()); - final File expectedT = new File("src/test/resources/writers/bdd/" + fileName + "_bdd.dot"); - final File tempT = new File("src/test/resources/writers/temp/" + fileName + "_bdd.dot"); + representation.write("../test_files/writers/temp/" + fileName + "_bdd.dot", GraphicalDotWriter.get()); + representation.write("../test_files/writers/temp/" + fileName + "_bdd.txt", GraphicalMermaidWriter.get()); + final File expectedT = new File("../test_files/writers/bdd/" + fileName + "_bdd.dot"); + final File tempT = new File("../test_files/writers/temp/" + fileName + "_bdd.dot"); assertThat(contentOf(tempT)).isEqualTo(contentOf(expectedT)); } diff --git a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaAstGraphicalGeneratorTest.java b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaAstGraphicalGeneratorTest.java index 4ef3f848..be5d4b9d 100644 --- a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaAstGraphicalGeneratorTest.java +++ b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaAstGraphicalGeneratorTest.java @@ -154,15 +154,15 @@ public void testWithLabelMapper() throws ParserException, IOException { private void testFiles(final String fileName, final Formula formula, final FormulaAstGraphicalGenerator generator) throws IOException { final GraphicalRepresentation representation = generator.translate(formula); - representation.write("src/test/resources/writers/temp/" + fileName + "-ast.dot", GraphicalDotWriter.get()); - representation.write("src/test/resources/writers/temp/" + fileName + "-ast.txt", GraphicalMermaidWriter.get()); + representation.write("../test_files/writers/temp/" + fileName + "-ast.dot", GraphicalDotWriter.get()); + representation.write("../test_files/writers/temp/" + fileName + "-ast.txt", GraphicalMermaidWriter.get()); - final File expectedDot = new File("src/test/resources/writers/formulas-ast/" + fileName + "-ast.dot"); - final File tempDot = new File("src/test/resources/writers/temp/" + fileName + "-ast.dot"); + final File expectedDot = new File("../test_files/writers/formulas-ast/" + fileName + "-ast.dot"); + final File tempDot = new File("../test_files/writers/temp/" + fileName + "-ast.dot"); assertThat(contentOf(tempDot)).isEqualTo(contentOf(expectedDot)); - final File expectedMermaid = new File("src/test/resources/writers/formulas-ast/" + fileName + "-ast.txt"); - final File tempMermaid = new File("src/test/resources/writers/temp/" + fileName + "-ast.txt"); + final File expectedMermaid = new File("../test_files/writers/formulas-ast/" + fileName + "-ast.txt"); + final File tempMermaid = new File("../test_files/writers/temp/" + fileName + "-ast.txt"); assertThat(contentOf(tempMermaid)).isEqualTo(contentOf(expectedMermaid)); } } diff --git a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaDagGraphicalGeneratorTest.java b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaDagGraphicalGeneratorTest.java index f5425847..5059db5f 100644 --- a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaDagGraphicalGeneratorTest.java +++ b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/FormulaDagGraphicalGeneratorTest.java @@ -140,15 +140,15 @@ public void testEdgeMapper() throws ParserException, IOException { private void testFiles(final String fileName, final Formula formula, final FormulaDagGraphicalGenerator generator) throws IOException { final GraphicalRepresentation representation = generator.translate(formula); - representation.write("src/test/resources/writers/temp/" + fileName + ".dot", GraphicalDotWriter.get()); - representation.write("src/test/resources/writers/temp/" + fileName + ".txt", GraphicalMermaidWriter.get()); + representation.write("../test_files/writers/temp/" + fileName + ".dot", GraphicalDotWriter.get()); + representation.write("../test_files/writers/temp/" + fileName + ".txt", GraphicalMermaidWriter.get()); - final File expectedDot = new File("src/test/resources/writers/formulas-dag/" + fileName + ".dot"); - final File tempDot = new File("src/test/resources/writers/temp/" + fileName + ".dot"); + final File expectedDot = new File("../test_files/writers/formulas-dag/" + fileName + ".dot"); + final File tempDot = new File("../test_files/writers/temp/" + fileName + ".dot"); assertThat(contentOf(tempDot)).isEqualTo(contentOf(expectedDot)); - final File expectedMermaid = new File("src/test/resources/writers/formulas-dag/" + fileName + ".txt"); - final File tempMermaid = new File("src/test/resources/writers/temp/" + fileName + ".txt"); + final File expectedMermaid = new File("../test_files/writers/formulas-dag/" + fileName + ".txt"); + final File tempMermaid = new File("../test_files/writers/temp/" + fileName + ".txt"); assertThat(contentOf(tempMermaid)).isEqualTo(contentOf(expectedMermaid)); } } diff --git a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/GraphGraphicalGeneratorTest.java b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/GraphGraphicalGeneratorTest.java index a2df6bbb..1517e0c2 100644 --- a/core/src/test/java/com/booleworks/logicng/io/graphical/generators/GraphGraphicalGeneratorTest.java +++ b/core/src/test/java/com/booleworks/logicng/io/graphical/generators/GraphGraphicalGeneratorTest.java @@ -107,15 +107,15 @@ public void test50p1() throws IOException { private void testFiles(final String fileName, final Graph g, final GraphGraphicalGenerator generator) throws IOException { final GraphicalRepresentation representation = generator.translate(g); - representation.write("src/test/resources/writers/temp/" + fileName + ".dot", GraphicalDotWriter.get()); - representation.write("src/test/resources/writers/temp/" + fileName + ".txt", GraphicalMermaidWriter.get()); + representation.write("../test_files/writers/temp/" + fileName + ".dot", GraphicalDotWriter.get()); + representation.write("../test_files/writers/temp/" + fileName + ".txt", GraphicalMermaidWriter.get()); - final File expectedDot = new File("src/test/resources/writers/graph/" + fileName + ".dot"); - final File tempDot = new File("src/test/resources/writers/temp/" + fileName + ".dot"); + final File expectedDot = new File("../test_files/writers/graph/" + fileName + ".dot"); + final File tempDot = new File("../test_files/writers/temp/" + fileName + ".dot"); assertThat(contentOf(tempDot)).isEqualTo(contentOf(expectedDot)); - final File expectedMermaid = new File("src/test/resources/writers/graph/" + fileName + ".txt"); - final File tempMermaid = new File("src/test/resources/writers/temp/" + fileName + ".txt"); + final File expectedMermaid = new File("../test_files/writers/graph/" + fileName + ".txt"); + final File tempMermaid = new File("../test_files/writers/temp/" + fileName + ".txt"); assertThat(contentOf(tempMermaid)).isEqualTo(contentOf(expectedMermaid)); } } diff --git a/core/src/test/java/com/booleworks/logicng/io/readers/DimacsReaderTest.java b/core/src/test/java/com/booleworks/logicng/io/readers/DimacsReaderTest.java index 537d9c48..24086bd0 100644 --- a/core/src/test/java/com/booleworks/logicng/io/readers/DimacsReaderTest.java +++ b/core/src/test/java/com/booleworks/logicng/io/readers/DimacsReaderTest.java @@ -17,7 +17,7 @@ public class DimacsReaderTest { public void testExceptionalBehavior() { assertThatThrownBy(() -> { final FormulaFactory f = FormulaFactory.caching(); - final File file = new File("src/test/resources/dimacs/malformed/contains-line-without-zero.cnf"); + final File file = new File("../test_files/dimacs/malformed/contains-line-without-zero.cnf"); DimacsReader.readCNF(f, file, "v"); }).isInstanceOf(IllegalArgumentException.class) .hasMessage("Line '2 -3' did not end with 0."); diff --git a/core/src/test/java/com/booleworks/logicng/io/writers/FormulaDimacsFileWriterTest.java b/core/src/test/java/com/booleworks/logicng/io/writers/FormulaDimacsFileWriterTest.java index 41ce9040..5fcb3e7e 100644 --- a/core/src/test/java/com/booleworks/logicng/io/writers/FormulaDimacsFileWriterTest.java +++ b/core/src/test/java/com/booleworks/logicng/io/writers/FormulaDimacsFileWriterTest.java @@ -71,14 +71,14 @@ public void testDuplicateFormulaParts() throws ParserException, IOException { } private void testFiles(final String fileName, final Formula formula) throws IOException { - FormulaDimacsFileWriter.write("src/test/resources/writers/temp/" + fileName + "_t.cnf", formula, true); - FormulaDimacsFileWriter.write("src/test/resources/writers/temp/" + fileName + "_f", formula, false); - final File expectedT = new File("src/test/resources/writers/formulas-dimacs/" + fileName + "_t.cnf"); - final File expectedF = new File("src/test/resources/writers/formulas-dimacs/" + fileName + "_f.cnf"); - final File tempT = new File("src/test/resources/writers/temp/" + fileName + "_t.cnf"); - final File tempF = new File("src/test/resources/writers/temp/" + fileName + "_f.cnf"); - final File expectedMap = new File("src/test/resources/writers/formulas-dimacs/" + fileName + "_t.map"); - final File tempMap = new File("src/test/resources/writers/temp/" + fileName + "_t.map"); + FormulaDimacsFileWriter.write("../test_files/writers/temp/" + fileName + "_t.cnf", formula, true); + FormulaDimacsFileWriter.write("../test_files/writers/temp/" + fileName + "_f", formula, false); + final File expectedT = new File("../test_files/writers/formulas-dimacs/" + fileName + "_t.cnf"); + final File expectedF = new File("../test_files/writers/formulas-dimacs/" + fileName + "_f.cnf"); + final File tempT = new File("../test_files/writers/temp/" + fileName + "_t.cnf"); + final File tempF = new File("../test_files/writers/temp/" + fileName + "_f.cnf"); + final File expectedMap = new File("../test_files/writers/formulas-dimacs/" + fileName + "_t.map"); + final File tempMap = new File("../test_files/writers/temp/" + fileName + "_t.map"); assertFilesEqual(expectedT, tempT); assertFilesEqual(expectedF, tempF); assertFilesEqual(expectedMap, tempMap); diff --git a/core/src/test/java/com/booleworks/logicng/knowledgecompilation/dnnf/DnnfCompilerTest.java b/core/src/test/java/com/booleworks/logicng/knowledgecompilation/dnnf/DnnfCompilerTest.java index d8392936..c434d967 100644 --- a/core/src/test/java/com/booleworks/logicng/knowledgecompilation/dnnf/DnnfCompilerTest.java +++ b/core/src/test/java/com/booleworks/logicng/knowledgecompilation/dnnf/DnnfCompilerTest.java @@ -85,15 +85,15 @@ public void testTrivialFormulas() throws ParserException { @LongRunningTag public void testLargeFormulas() throws IOException { final FormulaFactory f = FormulaFactory.caching(); - List dimacs = DimacsReader.readCNF(f, "src/test/resources/dnnf/both_bdd_dnnf_1.cnf"); + List dimacs = DimacsReader.readCNF(f, "../test_files/dnnf/both_bdd_dnnf_1.cnf"); testFormula(f, f.cnf(dimacs)); - dimacs = DimacsReader.readCNF(f, "src/test/resources/dnnf/both_bdd_dnnf_2.cnf"); + dimacs = DimacsReader.readCNF(f, "../test_files/dnnf/both_bdd_dnnf_2.cnf"); testFormula(f, f.cnf(dimacs)); - dimacs = DimacsReader.readCNF(f, "src/test/resources/dnnf/both_bdd_dnnf_3.cnf"); + dimacs = DimacsReader.readCNF(f, "../test_files/dnnf/both_bdd_dnnf_3.cnf"); testFormula(f, f.cnf(dimacs)); - dimacs = DimacsReader.readCNF(f, "src/test/resources/dnnf/both_bdd_dnnf_4.cnf"); + dimacs = DimacsReader.readCNF(f, "../test_files/dnnf/both_bdd_dnnf_4.cnf"); testFormula(f, f.cnf(dimacs)); - dimacs = DimacsReader.readCNF(f, "src/test/resources/dnnf/both_bdd_dnnf_5.cnf"); + dimacs = DimacsReader.readCNF(f, "../test_files/dnnf/both_bdd_dnnf_5.cnf"); testFormula(f, f.cnf(dimacs)); } @@ -108,7 +108,7 @@ public void testDnnfProperties() throws ParserException { public void testDnnfEvents() throws ParserException, IOException { final FormulaFactory f = FormulaFactory.caching(); f.putConfiguration(EncoderConfig.builder().amoEncoding(EncoderConfig.AMO_ENCODER.PURE).build()); - final Formula parsed = FormulaReader.readFormula(f, "src/test/resources/formulas/formula1.txt"); + final Formula parsed = FormulaReader.readFormula(f, "../test_files/formulas/formula1.txt"); final DnnfComputationHandler handler = new DnnfComputationHandler(); final LNGResult dnnf = DnnfCompiler.compile(f, parsed, handler); assertThat(dnnf.isSuccess()).isTrue(); @@ -132,7 +132,7 @@ public void testDnnfEvents() throws ParserException, IOException { public void testLargeFormula() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.caching(); f.putConfiguration(EncoderConfig.builder().amoEncoding(EncoderConfig.AMO_ENCODER.PURE).build()); - final Formula parsed = FormulaReader.readFormula(f, "src/test/resources/formulas/formula1.txt"); + final Formula parsed = FormulaReader.readFormula(f, "../test_files/formulas/formula1.txt"); Dnnf dnnf = DnnfCompiler.compile(f, parsed); final BigInteger dnnfCount = dnnf.execute(new DnnfModelCountFunction(f)); final List formulas = new ArrayList<>(); diff --git a/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeCompilerTest.java b/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeCompilerTest.java index f952c758..986706e4 100644 --- a/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeCompilerTest.java +++ b/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeCompilerTest.java @@ -96,7 +96,7 @@ public void testRandomized(final FormulaContext _c) { @MethodSource("contexts") @LongRunningTag public void testOriginalFormulas(final FormulaContext _c) throws IOException { - Files.lines(Paths.get("src/test/resources/formulas/simplify_formulas.txt")) + Files.lines(Paths.get("../test_files/formulas/simplify_formulas.txt")) .filter(s -> !s.isEmpty()) .forEach(s -> { try { @@ -150,7 +150,7 @@ public void testTimeoutHandlerLarge() throws ParserException, IOException { new TimeoutHandler(System.currentTimeMillis() + 1L, FIXED_END) ); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); for (final TimeoutHandler handler : handlers) { testHandler(handler, formula, compiler.first(), compiler.second(), true); } @@ -161,7 +161,7 @@ public void testTimeoutHandlerLarge() throws ParserException, IOException { public void testCancellationPoints() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.nonCaching(); final Formula formula = - f.parse(Files.readAllLines(Paths.get("src/test/resources/formulas/simplify_formulas.txt")).get(0)); + f.parse(Files.readAllLines(Paths.get("../test_files/formulas/simplify_formulas.txt")).get(0)); final List> compilers = Arrays.asList( new Pair<>(PrimeCompiler.getWithMaximization(), PrimeResult.CoverageType.IMPLICANTS_COMPLETE), new Pair<>(PrimeCompiler.getWithMaximization(), PrimeResult.CoverageType.IMPLICATES_COMPLETE), diff --git a/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicantReductionTest.java b/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicantReductionTest.java index df8f9343..13425161 100644 --- a/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicantReductionTest.java +++ b/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicantReductionTest.java @@ -67,7 +67,7 @@ public void testSimple(final FormulaContext _c) throws ParserException { @MethodSource("contexts") public void testFormula1(final FormulaContext _c) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/formula1.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/formula1.txt"); testFormula(formula); } @@ -75,7 +75,7 @@ public void testFormula1(final FormulaContext _c) throws IOException, ParserExce @MethodSource("contexts") public void testSimplifyFormulas(final FormulaContext _c) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/simplify_formulas.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/simplify_formulas.txt"); testFormula(formula); } @@ -84,7 +84,7 @@ public void testSimplifyFormulas(final FormulaContext _c) throws IOException, Pa @LongRunningTag public void testLargeFormula(final FormulaContext _c) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/large_formula.txt"); testFormula(formula); } @@ -92,7 +92,7 @@ public void testLargeFormula(final FormulaContext _c) throws IOException, Parser @MethodSource("contexts") @LongRunningTag public void testSmallFormulas(final FormulaContext _c) throws IOException, ParserException { - final List lines = Files.readAllLines(Paths.get("src/test/resources/formulas/small_formulas.txt")); + final List lines = Files.readAllLines(Paths.get("../test_files/formulas/small_formulas.txt")); for (final String line : lines) { testFormula(_c.f.parse(line)); } @@ -120,7 +120,7 @@ public void testRandom() { @Test public void testCancellationPoints() throws ParserException, IOException { final Formula formula = FormulaReader.readFormula(FormulaFactory.nonCaching(), - "src/test/resources/formulas/large_formula.txt"); + "../test_files/formulas/large_formula.txt"); for (int numStarts = 0; numStarts < 20; numStarts++) { final ComputationHandler handler = new BoundedSatHandler(numStarts); testFormula(formula, handler, true); diff --git a/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicateReductionTest.java b/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicateReductionTest.java index 3816030b..08866cd8 100644 --- a/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicateReductionTest.java +++ b/core/src/test/java/com/booleworks/logicng/primecomputation/PrimeImplicateReductionTest.java @@ -58,7 +58,7 @@ public void testPrimeImplicateNaive(final FormulaContext _c) throws ParserExcept @MethodSource("contexts") public void testFormula1(final FormulaContext _c) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/formula1.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/formula1.txt"); testFormula(formula); } @@ -66,7 +66,7 @@ public void testFormula1(final FormulaContext _c) throws IOException, ParserExce @MethodSource("contexts") public void testSimplifyFormulas(final FormulaContext _c) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/simplify_formulas.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/simplify_formulas.txt"); testFormula(formula); } @@ -74,14 +74,14 @@ public void testSimplifyFormulas(final FormulaContext _c) throws IOException, Pa @MethodSource("contexts") public void testLargeFormula(final FormulaContext _c) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/large_formula.txt"); testFormula(formula); } @ParameterizedTest @MethodSource("contexts") public void testSmallFormulas(final FormulaContext _c) throws IOException, ParserException { - final List lines = Files.readAllLines(Paths.get("src/test/resources/formulas/small_formulas.txt")); + final List lines = Files.readAllLines(Paths.get("../test_files/formulas/small_formulas.txt")); for (final String line : lines) { testFormula(_c.f.parse(line)); } @@ -109,7 +109,7 @@ public void testRandom() { @Test public void testCancellationPoints() throws ParserException, IOException { final Formula formula = FormulaReader.readFormula(FormulaFactory.nonCaching(), - "src/test/resources/formulas/large_formula.txt"); + "../test_files/formulas/large_formula.txt"); for (int numStarts = 0; numStarts < 20; numStarts++) { final ComputationHandler handler = new BoundedSatHandler(numStarts); testFormula(formula, handler, true); diff --git a/core/src/test/java/com/booleworks/logicng/solvers/functions/BackboneFunctionTest.java b/core/src/test/java/com/booleworks/logicng/solvers/functions/BackboneFunctionTest.java index 3356d6d1..9c069aee 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/functions/BackboneFunctionTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/functions/BackboneFunctionTest.java @@ -20,7 +20,6 @@ import com.booleworks.logicng.solvers.SolverState; import com.booleworks.logicng.solvers.sat.SATSolverConfig; import com.booleworks.logicng.solvers.sat.SolverTestSet; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -123,11 +122,11 @@ public void testRealFormulaIncremental1(final SATSolver solver, final String sol throws IOException, ParserException { final FormulaFactory f = solver.factory(); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); solver.add(formula); final List expectedBackbones = new ArrayList<>(); final BufferedReader reader = - new BufferedReader(new FileReader("src/test/resources/backbones/backbone_large_formula.txt")); + new BufferedReader(new FileReader("../test_files/backbones/backbone_large_formula.txt")); while (reader.ready()) { expectedBackbones.add(reader.readLine()); } @@ -167,11 +166,11 @@ public void testRealFormulaIncremental2(final SATSolver solver, final String sol throws IOException, ParserException { final FormulaFactory f = solver.factory(); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/small_formulas.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/small_formulas.txt"); solver.add(formula); final List expectedBackbones = new ArrayList<>(); final BufferedReader reader = - new BufferedReader(new FileReader("src/test/resources/backbones/backbone_small_formulas.txt")); + new BufferedReader(new FileReader("../test_files/backbones/backbone_small_formulas.txt")); while (reader.ready()) { expectedBackbones.add(reader.readLine()); } @@ -211,12 +210,12 @@ public void testRealFormulaIncrementalDecremental1(final SATSolver solver, final throws IOException, ParserException { final FormulaFactory f = solver.factory(); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); solver.add(formula); final SolverState state = solver.saveState(); final List expectedBackbones = new ArrayList<>(); final BufferedReader reader = - new BufferedReader(new FileReader("src/test/resources/backbones/backbone_large_formula.txt")); + new BufferedReader(new FileReader("../test_files/backbones/backbone_large_formula.txt")); while (reader.ready()) { expectedBackbones.add(reader.readLine()); } @@ -266,12 +265,12 @@ public void testRealFormulaIncrementalDecremental2(final SATSolver solver, final throws IOException, ParserException { final FormulaFactory f = solver.factory(); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/small_formulas.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/small_formulas.txt"); solver.add(formula); final SolverState state = solver.saveState(); final List expectedBackbones = new ArrayList<>(); final BufferedReader reader = - new BufferedReader(new FileReader("src/test/resources/backbones/backbone_small_formulas.txt")); + new BufferedReader(new FileReader("../test_files/backbones/backbone_small_formulas.txt")); while (reader.ready()) { expectedBackbones.add(reader.readLine()); } diff --git a/core/src/test/java/com/booleworks/logicng/solvers/functions/OptimizationFunctionTest.java b/core/src/test/java/com/booleworks/logicng/solvers/functions/OptimizationFunctionTest.java index 81beec4a..50243b8d 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/functions/OptimizationFunctionTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/functions/OptimizationFunctionTest.java @@ -292,7 +292,7 @@ public void testLargeFormulaMinimize(final Function s final String solverDescription) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); final List variables = randomSubset(formula.variables(f), 300); final LNGResult minimumModel = optimize(Collections.singleton(formula), variables, Collections.emptyList(), false, solver.apply(f), NopHandler.get()); @@ -306,7 +306,7 @@ public void testLargeFormulaMaximize(final Function s final String solverDescription) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); final LNGResult maximumModel = optimize(Collections.singleton(formula), formula.variables(f), Collections.emptyList(), true, solver.apply(f), NopHandler.get()); testMaximumModel(formula, maximumModel, formula.variables(f)); @@ -319,7 +319,7 @@ public void testLargerFormulaMinimize(final Function final String solverDescription) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/small_formulas.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/small_formulas.txt"); final LNGResult minimumModel = optimize(Collections.singleton(formula), formula.variables(f), Collections.emptyList(), false, solver.apply(f), NopHandler.get()); testMinimumModel(formula, minimumModel, formula.variables(f)); @@ -332,7 +332,7 @@ public void testLargerFormulaMaximize(final Function final String solverDescription) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/small_formulas.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/small_formulas.txt"); final List variables = randomSubset(formula.variables(f), 300); final LNGResult maximumModel = optimize(Collections.singleton(formula), variables, Collections.emptyList(), true, solver.apply(f), NopHandler.get()); @@ -344,7 +344,7 @@ public void compareWithMaxSat() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.caching(); final PropositionalParser p = new PropositionalParser(f); final BufferedReader reader = - new BufferedReader(new FileReader("src/test/resources/formulas/large_formula.txt")); + new BufferedReader(new FileReader("../test_files/formulas/large_formula.txt")); final List formulas = new ArrayList<>(); final SortedSet variables = new TreeSet<>(); while (reader.ready()) { @@ -375,7 +375,7 @@ public void testTimeoutOptimizationHandler(final Function maximumModel = optimize(Collections.singleton(formula), formula.variables(f), Collections.emptyList(), true, solver.apply(f), handlerMax); @@ -405,7 +405,7 @@ public void testCancellationPoints(final Function sol final String solverDescription) throws IOException { final FormulaFactory f = FormulaFactory.caching(); final SortedSet selVars = new TreeSet<>(); - final List clauses = DimacsReader.readCNF(f, "src/test/resources/sat/c499_gr_rcs_w6.shuffled.cnf"); + final List clauses = DimacsReader.readCNF(f, "../test_files/sat/c499_gr_rcs_w6.shuffled.cnf"); final List formulas = new ArrayList<>(); for (final Formula clause : clauses) { final Variable selVar = f.variable("@SEL_" + selVars.size()); diff --git a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/MaxSatLongRunningTest.java b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/MaxSatLongRunningTest.java index e4845280..43cd6ab7 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/MaxSatLongRunningTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/MaxSatLongRunningTest.java @@ -30,8 +30,8 @@ public class MaxSatLongRunningTest { @LongRunningTag public void testWeightedMaxSat() throws IOException { final FormulaFactory f = FormulaFactory.caching(); - final File folder = new File("src/test/resources/longrunning/wms"); - final Map result = readResult(new File("src/test/resources/longrunning/wms/result.txt")); + final File folder = new File("../test_files/longrunning/wms"); + final Map result = readResult(new File("../test_files/longrunning/wms/result.txt")); final List> solvers = Arrays.asList( () -> MaxSATSolver.oll(f), () -> MaxSATSolver.incWBO(f, MaxSATConfig.builder().cnfMethod(SATSolverConfig.CNFMethod.FACTORY_CNF) diff --git a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialMaxSATTest.java b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialMaxSATTest.java index 7e0ab5f5..2f878c35 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialMaxSATTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialMaxSATTest.java @@ -48,7 +48,7 @@ public class PartialMaxSATTest extends TestWithExampleFormulas { private final PrintStream logStream; public PartialMaxSATTest() throws FileNotFoundException { - logStream = new PrintStream("src/test/resources/partialmaxsat/log.txt"); + logStream = new PrintStream("../test_files/partialmaxsat/log.txt"); } @Test @@ -80,7 +80,7 @@ public void testWBO() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -92,7 +92,7 @@ public void testWBO() throws IOException { public void testOLL() throws IOException { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.oll(f); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -107,7 +107,7 @@ public void testIncWBO() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.incWBO(f, config); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -129,7 +129,7 @@ public void testLinearSU() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.linearSU(f, config); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -153,7 +153,7 @@ public void testLinearUS() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.linearUS(f, config); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -176,7 +176,7 @@ public void testMSU3() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.msu3(f, config); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -279,7 +279,7 @@ private void testTimeoutHandler(final Supplier solverGenerator) { public void testTimeoutHandlerSimple() throws IOException { MaxSATSolver solver = MaxSATSolver.wbo(f, MaxSATConfig.builder().verbosity(MaxSATConfig.Verbosity.SOME).output(logStream).build()); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/c1355_F176gat-1278gat@1.wcnf"); + readCnfToSolver(solver, "../test_files/partialmaxsat/c1355_F176gat-1278gat@1.wcnf"); MaxSatTimeoutHandlerWithApproximation handler = new MaxSatTimeoutHandlerWithApproximation(1000L); LNGResult result = solver.solve(handler); assertThat(result.isSuccess()).isFalse(); @@ -287,7 +287,7 @@ public void testTimeoutHandlerSimple() throws IOException { solver = MaxSATSolver.wbo(f, MaxSATConfig.builder().verbosity(MaxSATConfig.Verbosity.SOME).output(logStream).build()); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/c1355_F1229gat@1.wcnf"); + readCnfToSolver(solver, "../test_files/partialmaxsat/c1355_F1229gat@1.wcnf"); handler = new MaxSatTimeoutHandlerWithApproximation(5000L); result = solver.solve(handler); assertThat(result.isSuccess()).isTrue(); @@ -298,7 +298,7 @@ public void testTimeoutHandlerSimple() throws IOException { public void testTimeoutHandlerUB() throws IOException { final MaxSATSolver solver = MaxSATSolver.linearSU(f, MaxSATConfig.builder().verbosity(MaxSATConfig.Verbosity.SOME).output(logStream).build()); - readCnfToSolver(solver, "src/test/resources/partialmaxsat/c1355_F1229gat@1.wcnf"); + readCnfToSolver(solver, "../test_files/partialmaxsat/c1355_F1229gat@1.wcnf"); final MaxSatTimeoutHandlerWithApproximation handler = new MaxSatTimeoutHandlerWithApproximation(5000L); final LNGResult result = solver.solve(handler); assertThat(result.isSuccess()).isTrue(); diff --git a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialWeightedMaxSATTest.java b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialWeightedMaxSATTest.java index 42ece5a8..2bbf021e 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialWeightedMaxSATTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PartialWeightedMaxSATTest.java @@ -51,7 +51,7 @@ public class PartialWeightedMaxSATTest extends TestWithExampleFormulas { private final PrintStream logStream; public PartialWeightedMaxSATTest() throws FileNotFoundException { - logStream = new PrintStream("src/test/resources/partialweightedmaxsat/log.txt"); + logStream = new PrintStream("../test_files/partialweightedmaxsat/log.txt"); } @Test @@ -88,7 +88,7 @@ public void testWBO() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -109,7 +109,7 @@ public void testIncWBO() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.incWBO(f, config); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -132,7 +132,7 @@ public void testLinearSU() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.linearSU(f, config); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -156,7 +156,7 @@ public void testWMSU3() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.wmsu3(f, config); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -173,7 +173,7 @@ public void testWMSU3BMO() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < bmoFiles.length; i++) { final MaxSATSolver solver = MaxSATSolver.wmsu3(f, config); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/bmo/" + bmoFiles[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/bmo/" + bmoFiles[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(bmoResults[i]); @@ -191,7 +191,7 @@ public void testLinearSUBMO() throws IOException { for (final MaxSATConfig config : configs) { for (int i = 0; i < bmoFiles.length; i++) { final MaxSATSolver solver = MaxSATSolver.linearSU(f, config); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/bmo/" + bmoFiles[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/bmo/" + bmoFiles[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(bmoResults[i]); @@ -203,14 +203,14 @@ public void testLinearSUBMO() throws IOException { public void testOLL() throws IOException { for (int i = 0; i < bmoFiles.length; i++) { final MaxSATSolver solver = MaxSATSolver.oll(f); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/bmo/" + bmoFiles[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/bmo/" + bmoFiles[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(bmoResults[i]); } for (int i = 0; i < files.length; i++) { final MaxSATSolver solver = MaxSATSolver.oll(f); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/" + files[i]); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/" + files[i]); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(results[i]); @@ -221,7 +221,7 @@ public void testOLL() throws IOException { @LongRunningTag public void testLargeOLL1() throws IOException { final MaxSATSolver solver = MaxSATSolver.oll(f); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/large/large_industrial.wcnf"); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/large/large_industrial.wcnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(68974); @@ -231,7 +231,7 @@ public void testLargeOLL1() throws IOException { @LongRunningTag public void testLargeOLL2() throws IOException { final MaxSATSolver solver = MaxSATSolver.oll(f); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/large/t3g3-5555.spn.wcnf"); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/large/t3g3-5555.spn.wcnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(1100610); @@ -241,7 +241,7 @@ public void testLargeOLL2() throws IOException { @LongRunningTag public void testOLLWithLargeWeights() throws IOException { final MaxSATSolver solver = MaxSATSolver.oll(f); - readCnfToSolver(solver, "src/test/resources/partialweightedmaxsat/large/large_weights.wcnf"); + readCnfToSolver(solver, "../test_files/partialweightedmaxsat/large/large_weights.wcnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(90912); diff --git a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PureMaxSATTest.java b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PureMaxSATTest.java index 3211092b..04bef88a 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PureMaxSATTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/maxsat/PureMaxSATTest.java @@ -40,7 +40,7 @@ public class PureMaxSATTest extends TestWithExampleFormulas { private final PrintStream logStream; public PureMaxSATTest() throws FileNotFoundException { - logStream = new PrintStream("src/test/resources/maxsat/log.txt"); + logStream = new PrintStream("../test_files/maxsat/log.txt"); } @Test @@ -97,13 +97,13 @@ public void testWBO() throws IOException { for (final MaxSATConfig config : configs) { for (final String file : files) { final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/maxsat/" + file); + MaxSATReader.readCnfToSolver(solver, "../test_files/maxsat/" + file); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(1); } final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf"); + MaxSATReader.readCnfToSolver(solver, "../test_files/sat/9symml_gr_rcs_w6.shuffled.cnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(0); @@ -121,13 +121,13 @@ public void testIncWBO() throws IOException { for (final MaxSATConfig config : configs) { for (final String file : files) { final MaxSATSolver solver = MaxSATSolver.incWBO(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/maxsat/" + file); + MaxSATReader.readCnfToSolver(solver, "../test_files/maxsat/" + file); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(1); } final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf"); + MaxSATReader.readCnfToSolver(solver, "../test_files/sat/9symml_gr_rcs_w6.shuffled.cnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(0); @@ -145,13 +145,13 @@ public void testLinearSU() throws IOException { for (final MaxSATConfig config : configs) { for (final String file : files) { final MaxSATSolver solver = MaxSATSolver.linearSU(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/maxsat/" + file); + MaxSATReader.readCnfToSolver(solver, "../test_files/maxsat/" + file); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(1); } final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf"); + MaxSATReader.readCnfToSolver(solver, "../test_files/sat/9symml_gr_rcs_w6.shuffled.cnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(0); @@ -177,13 +177,13 @@ public void testLinearUS() throws IOException { for (final MaxSATConfig config : configs) { for (final String file : files) { final MaxSATSolver solver = MaxSATSolver.linearUS(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/maxsat/" + file); + MaxSATReader.readCnfToSolver(solver, "../test_files/maxsat/" + file); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(1); } final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf"); + MaxSATReader.readCnfToSolver(solver, "../test_files/sat/9symml_gr_rcs_w6.shuffled.cnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(0); @@ -209,13 +209,13 @@ public void testMSU3() throws IOException { for (final MaxSATConfig config : configs) { for (final String file : files) { final MaxSATSolver solver = MaxSATSolver.msu3(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/maxsat/" + file); + MaxSATReader.readCnfToSolver(solver, "../test_files/maxsat/" + file); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(1); } final MaxSATSolver solver = MaxSATSolver.wbo(f, config); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf"); + MaxSATReader.readCnfToSolver(solver, "../test_files/sat/9symml_gr_rcs_w6.shuffled.cnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(0); @@ -227,13 +227,13 @@ public void testMSU3() throws IOException { public void testOLL() throws IOException { for (final String file : files) { final MaxSATSolver solver = MaxSATSolver.oll(f); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/maxsat/" + file); + MaxSATReader.readCnfToSolver(solver, "../test_files/maxsat/" + file); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(1); } final MaxSATSolver solver = MaxSATSolver.oll(f); - MaxSATReader.readCnfToSolver(solver, "src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf"); + MaxSATReader.readCnfToSolver(solver, "../test_files/sat/9symml_gr_rcs_w6.shuffled.cnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(0); @@ -243,7 +243,7 @@ public void testOLL() throws IOException { public void testSingle() throws IOException { final MaxSATSolver solver = MaxSATSolver.incWBO(f, MaxSATConfig.builder() .cardinality(MaxSATConfig.CardinalityEncoding.MTOTALIZER).verbosity(SOME).output(logStream).build()); - readCnfToSolver(solver, "src/test/resources/maxsat/c-fat200-2.clq.cnf"); + readCnfToSolver(solver, "../test_files/maxsat/c-fat200-2.clq.cnf"); final MaxSATResult result = solver.solve(); assertThat(result.isSatisfiable()).isTrue(); assertThat(result.getOptimum()).isEqualTo(26); diff --git a/core/src/test/java/com/booleworks/logicng/solvers/sat/SATCallTest.java b/core/src/test/java/com/booleworks/logicng/solvers/sat/SATCallTest.java index 83dbd64f..1012f382 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/sat/SATCallTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/sat/SATCallTest.java @@ -131,7 +131,7 @@ public void testDisallowNullVariablesInModel() { @Test public void testHandler() throws IOException, ParserException { final SATSolver solver = SATSolver.newSolver(f, SATSolverConfig.builder().proofGeneration(true).build()); - solver.add(FormulaReader.readFormula(f, "src/test/resources/formulas/small_formulas.txt")); + solver.add(FormulaReader.readFormula(f, "../test_files/formulas/small_formulas.txt")); try (final SATCall satCall = solver.satCall().handler(new MaxConflictsHandler(0)).solve()) { assertThat(satCall.getSatResult().isSuccess()).isFalse(); diff --git a/core/src/test/java/com/booleworks/logicng/solvers/sat/SATTest.java b/core/src/test/java/com/booleworks/logicng/solvers/sat/SATTest.java index 457d405f..3844e9ae 100644 --- a/core/src/test/java/com/booleworks/logicng/solvers/sat/SATTest.java +++ b/core/src/test/java/com/booleworks/logicng/solvers/sat/SATTest.java @@ -405,12 +405,12 @@ public void testTimeoutSATHandlerLarge() { @LongRunningTag public void testDimacsFiles() throws IOException { final Map expectedResults = new HashMap<>(); - final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/sat/results.txt")); + final BufferedReader reader = new BufferedReader(new FileReader("../test_files/sat/results.txt")); while (reader.ready()) { final String[] tokens = reader.readLine().split(";"); expectedResults.put(tokens[0], Boolean.valueOf(tokens[1])); } - final File testFolder = new File("src/test/resources/sat"); + final File testFolder = new File("../test_files/sat"); final File[] files = testFolder.listFiles(); assert files != null; for (final Function solverSupplier : solverSuppliers) { @@ -750,7 +750,7 @@ public void testUPZeroLiterals() throws ParserException { @Test @LongRunningTag public void testUPZeroLiteralsDimacsFiles() throws IOException { - final File testFolder = new File("src/test/resources/sat"); + final File testFolder = new File("../test_files/sat"); final File[] files = testFolder.listFiles(); assert files != null; for (final Function solverSupplier : solverSuppliers) { @@ -918,12 +918,12 @@ public void testSelectionOrderSimple03() { @LongRunningTag public void testDimacsFilesWithSelectionOrder() throws IOException { final Map expectedResults = new HashMap<>(); - final BufferedReader reader = new BufferedReader(new FileReader("src/test/resources/sat/results.txt")); + final BufferedReader reader = new BufferedReader(new FileReader("../test_files/sat/results.txt")); while (reader.ready()) { final String[] tokens = reader.readLine().split(";"); expectedResults.put(tokens[0], Boolean.valueOf(tokens[1])); } - final File testFolder = new File("src/test/resources/sat"); + final File testFolder = new File("../test_files/sat"); final File[] files = testFolder.listFiles(); assert files != null; for (final Function solverSupplier : solverSuppliers) { diff --git a/core/src/test/java/com/booleworks/logicng/transformations/cnf/CNFSubsumptionTest.java b/core/src/test/java/com/booleworks/logicng/transformations/cnf/CNFSubsumptionTest.java index 5f82ef26..9ff029b9 100644 --- a/core/src/test/java/com/booleworks/logicng/transformations/cnf/CNFSubsumptionTest.java +++ b/core/src/test/java/com/booleworks/logicng/transformations/cnf/CNFSubsumptionTest.java @@ -75,7 +75,7 @@ public void testNotInCNF() { public void testEvenLargerFormula() throws IOException, ParserException { final FormulaFactory f = FormulaFactory.caching(); final Formula formula = - FormulaReader.readFormula(f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(f, "../test_files/formulas/large_formula.txt"); final Formula cnf = formula.transform(new CNFFactorization(f)); final Formula subsumed = cnf.transform(new CNFSubsumption(f)); assertThat(f.equivalence(cnf, subsumed).holds(new TautologyPredicate(f))).isTrue(); diff --git a/core/src/test/java/com/booleworks/logicng/transformations/cnf/CnfMethodComparisonTest.java b/core/src/test/java/com/booleworks/logicng/transformations/cnf/CnfMethodComparisonTest.java index bdc05efa..abe26b10 100644 --- a/core/src/test/java/com/booleworks/logicng/transformations/cnf/CnfMethodComparisonTest.java +++ b/core/src/test/java/com/booleworks/logicng/transformations/cnf/CnfMethodComparisonTest.java @@ -63,7 +63,7 @@ public static Collection cnfConfigurations() { public void compareFullBackbonesOnLargeFormulas(final CNFConfig cnfConfig, final SATSolverConfig.CNFMethod cnfMethod) throws IOException, ParserException { - final String baseDir = "src/test/resources/formulas/"; + final String baseDir = "../test_files/formulas/"; final List fileNames = Arrays.asList("formula1.txt", "formula2.txt", "formula3.txt", "large_formula.txt", "small_formulas.txt"); for (final String fileName : fileNames) { @@ -78,9 +78,9 @@ public void compareFullBackbonesOnLargeFormulas(final CNFConfig cnfConfig, @Test @LongRunningTag public void compareBackbonesForVariablesOnLargeFormulas() throws IOException, ParserException { - compareBackbonePerVariable("src/test/resources/formulas/formula1.txt"); - compareBackbonePerVariable("src/test/resources/formulas/large_formula.txt"); - compareBackbonePerVariable("src/test/resources/formulas/small_formulas.txt"); + compareBackbonePerVariable("../test_files/formulas/formula1.txt"); + compareBackbonePerVariable("../test_files/formulas/large_formula.txt"); + compareBackbonePerVariable("../test_files/formulas/small_formulas.txt"); } private Backbone computeBackbone(final String fileName, final CNFConfig cnfConfig, @@ -110,7 +110,7 @@ private void compareBackbonePerVariable(final String fileName) throws IOExceptio private Map computeBackbonePerVariable(final String fileName, final CNFConfig cnfConfig, final SATSolverConfig.CNFMethod cnfMethod) throws IOException, ParserException { -// final long start = System.currentTimeMillis(); + // final long start = System.currentTimeMillis(); final FormulaFactory f = FormulaFactory.caching(); f.putConfiguration(cnfConfig); final Formula formula = FormulaReader.readFormula(f, fileName); @@ -129,9 +129,9 @@ private Map computeBackbonePerVariable(final String fileName solver.loadState(solverState); } } -// final long stop = System.currentTimeMillis(); -// System.out.println(fileName + " " + cnfConfig.algorithm + " " + cnfConfig.fallbackAlgorithmForAdvancedEncoding + -// " " + cnfMethod + ": " + (stop - start) + " ms."); + // final long stop = System.currentTimeMillis(); + // System.out.println(fileName + " " + cnfConfig.algorithm + " " + cnfConfig.fallbackAlgorithmForAdvancedEncoding + + // " " + cnfMethod + ": " + (stop - start) + " ms."); return result; } diff --git a/core/src/test/java/com/booleworks/logicng/transformations/dnf/DNFSubsumptionTest.java b/core/src/test/java/com/booleworks/logicng/transformations/dnf/DNFSubsumptionTest.java index b821aa67..8015079a 100644 --- a/core/src/test/java/com/booleworks/logicng/transformations/dnf/DNFSubsumptionTest.java +++ b/core/src/test/java/com/booleworks/logicng/transformations/dnf/DNFSubsumptionTest.java @@ -64,7 +64,7 @@ public void testLargeDNFSubsumption(final FormulaContext _c) throws ParserExcept @LongRunningTag public void testEvenLargerFormulas(final FormulaContext _c) throws IOException, ParserException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/small_formulas.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/small_formulas.txt"); int count = 10; // test only first 10 formulas for (final Formula op : formula) { if (count == 0) { diff --git a/core/src/test/java/com/booleworks/logicng/transformations/simplification/AdvancedSimplifierTest.java b/core/src/test/java/com/booleworks/logicng/transformations/simplification/AdvancedSimplifierTest.java index 57b8b79a..39ccf7a8 100644 --- a/core/src/test/java/com/booleworks/logicng/transformations/simplification/AdvancedSimplifierTest.java +++ b/core/src/test/java/com/booleworks/logicng/transformations/simplification/AdvancedSimplifierTest.java @@ -84,7 +84,7 @@ public void testTimeoutHandlerLarge(final FormulaContext _c) throws ParserExcept new TimeoutHandler(System.currentTimeMillis() + 1L, TimeoutHandler.TimerType.FIXED_END) ); final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/large_formula.txt"); for (final TimeoutHandler handler : handlers) { testHandler(handler, formula, true); } diff --git a/core/src/test/java/com/booleworks/logicng/transformations/simplification/QuineMcCluskeyTest.java b/core/src/test/java/com/booleworks/logicng/transformations/simplification/QuineMcCluskeyTest.java index 2cce8c59..538f165c 100644 --- a/core/src/test/java/com/booleworks/logicng/transformations/simplification/QuineMcCluskeyTest.java +++ b/core/src/test/java/com/booleworks/logicng/transformations/simplification/QuineMcCluskeyTest.java @@ -78,7 +78,7 @@ public void testLarge1(final FormulaContext _c) throws ParserException { @MethodSource("contexts") public void testLarge2(final FormulaContext _c) throws ParserException, IOException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/large_formula.txt"); final SATSolver solver = SATSolver.newSolver(_c.f); solver.add(formula); final List models = solver.enumerateAllModels(Arrays.asList( @@ -106,7 +106,7 @@ public void testLarge2(final FormulaContext _c) throws ParserException, IOExcept @MethodSource("contexts") public void testLarge3(final FormulaContext _c) throws ParserException, IOException { final Formula formula = - FormulaReader.readFormula(_c.f, "src/test/resources/formulas/large_formula.txt"); + FormulaReader.readFormula(_c.f, "../test_files/formulas/large_formula.txt"); final SATSolver solver = SATSolver.newSolver(_c.f); solver.add(formula); final List models = solver.enumerateAllModels(Arrays.asList( @@ -139,7 +139,7 @@ public void testLarge3(final FormulaContext _c) throws ParserException, IOExcept @LongRunningTag public void testSmallFormulas(final FormulaContext _c) throws IOException, ParserException { final BufferedReader reader = - new BufferedReader(new FileReader("src/test/resources/formulas/small_formulas.txt")); + new BufferedReader(new FileReader("../test_files/formulas/small_formulas.txt")); while (reader.ready()) { final Formula formula = _c.p.parse(reader.readLine()); final List variables = new ArrayList<>(formula.variables(_c.f)); diff --git a/parser/src/test/java/com/booleworks/logicng/io/parsers/antlr/AntlrPropositionalParserTest.java b/parser/src/test/java/com/booleworks/logicng/io/parsers/antlr/AntlrPropositionalParserTest.java index 1d679a65..3a963c15 100644 --- a/parser/src/test/java/com/booleworks/logicng/io/parsers/antlr/AntlrPropositionalParserTest.java +++ b/parser/src/test/java/com/booleworks/logicng/io/parsers/antlr/AntlrPropositionalParserTest.java @@ -12,9 +12,14 @@ import com.booleworks.logicng.formulas.FormulaFactory; import com.booleworks.logicng.formulas.Literal; import com.booleworks.logicng.io.parsers.ParserException; +import com.booleworks.logicng.io.parsers.PropositionalParser; import org.junit.jupiter.api.Test; +import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Arrays; +import java.util.stream.Collectors; public class AntlrPropositionalParserTest { @@ -281,4 +286,16 @@ public void testAsFactoryParser() throws ParserException { f.and(f.implication(f.variable("x"), f.and(f.variable("y"), f.variable("z"))), pbc)); assertThat(f.parse("~(6 * a - 6 * ~b - -12 * ~c > -6)")).isEqualTo(f.not(pbc)); } + + @Test + public void testCompareWithStockParser() throws IOException { + final var strings = Files.readAllLines(Paths.get("../test_files/formulas/largest_formula.txt")); + final var f1 = FormulaFactory.caching(); + final var f2 = FormulaFactory.caching(); + final var p1 = new PropositionalParser(f1); + final var p2 = new AntlrPropositionalParser(f2); + final var formulasStock = strings.stream().map(p1::parseUnsafe).collect(Collectors.toList()); + final var formulasAntlr = strings.stream().map(p2::parseUnsafe).collect(Collectors.toList()); + assertThat(formulasAntlr).isEqualTo(formulasStock); + } } diff --git a/parser/src/test/resources/formula1.txt b/parser/src/test/resources/formula1.txt deleted file mode 100644 index 593db3b8..00000000 --- a/parser/src/test/resources/formula1.txt +++ /dev/null @@ -1,3 +0,0 @@ -v0 -(v1 => v0) & (~v1 => ~v0) -~v1 | v2 diff --git a/parser/src/test/resources/formula2.txt b/parser/src/test/resources/formula2.txt deleted file mode 100644 index 2b576e05..00000000 --- a/parser/src/test/resources/formula2.txt +++ /dev/null @@ -1,4 +0,0 @@ -v0 <= 1 -(v1 => v0) & (~v1 => ~v0) -v2 <= 1 -8 * v0 - 3 * ~v2 <= 6 diff --git a/pom.xml b/pom.xml index 7aca8317..e70df1cf 100644 --- a/pom.xml +++ b/pom.xml @@ -348,24 +348,5 @@ random - - - parallel-tests - - - - org.apache.maven.plugins - maven-surefire-plugin - - -Xmx16g - - true - concurrent - - - - - - diff --git a/serialization/src/test/java/com/booleworks/logicng/serialization/FormulasTest.java b/serialization/src/test/java/com/booleworks/logicng/serialization/FormulasTest.java index 76400d05..edc8376b 100644 --- a/serialization/src/test/java/com/booleworks/logicng/serialization/FormulasTest.java +++ b/serialization/src/test/java/com/booleworks/logicng/serialization/FormulasTest.java @@ -30,7 +30,7 @@ public class FormulasTest { final FormulaFactory f = FormulaFactory.caching(); - private static final Path ORIGINAL = Paths.get("src/test/resources/large_formula.txt"); + private static final Path ORIGINAL = Paths.get("../test_files/formulas/largest_formula.txt"); private static final Path PROTO = Paths.get("list.proto"); private static final Path ZIP = Paths.get("list.zip"); diff --git a/serialization/src/test/java/com/booleworks/logicng/serialization/SatSolversTest.java b/serialization/src/test/java/com/booleworks/logicng/serialization/SatSolversTest.java index 9c0a1067..ff8efa80 100644 --- a/serialization/src/test/java/com/booleworks/logicng/serialization/SatSolversTest.java +++ b/serialization/src/test/java/com/booleworks/logicng/serialization/SatSolversTest.java @@ -61,7 +61,7 @@ public static void init() throws ParserException, IOException { f = FormulaFactory.caching(); serializer = SolverSerializer.withoutPropositions(f); tempFile = Files.createTempFile("temp", "pb"); - final Formula whole = FormulaReader.readFormula(f, Paths.get("src/test/resources/large_formula.txt").toFile()); + final Formula whole = FormulaReader.readFormula(f, Paths.get("../test_files/formulas/largest_formula.txt").toFile()); variables = whole.variables(f); formula = whole.stream().collect(Collectors.toList()); } diff --git a/core/src/test/resources/backbones/backbone_large_formula.txt b/test_files/backbones/backbone_large_formula.txt similarity index 100% rename from core/src/test/resources/backbones/backbone_large_formula.txt rename to test_files/backbones/backbone_large_formula.txt diff --git a/core/src/test/resources/backbones/backbone_small_formulas.txt b/test_files/backbones/backbone_small_formulas.txt similarity index 100% rename from core/src/test/resources/backbones/backbone_small_formulas.txt rename to test_files/backbones/backbone_small_formulas.txt diff --git a/core/src/test/resources/dimacs/malformed/contains-line-without-zero.cnf b/test_files/dimacs/malformed/contains-line-without-zero.cnf similarity index 100% rename from core/src/test/resources/dimacs/malformed/contains-line-without-zero.cnf rename to test_files/dimacs/malformed/contains-line-without-zero.cnf diff --git a/core/src/test/resources/dnnf/both_bdd_dnnf_1.cnf b/test_files/dnnf/both_bdd_dnnf_1.cnf similarity index 100% rename from core/src/test/resources/dnnf/both_bdd_dnnf_1.cnf rename to test_files/dnnf/both_bdd_dnnf_1.cnf diff --git a/core/src/test/resources/dnnf/both_bdd_dnnf_2.cnf b/test_files/dnnf/both_bdd_dnnf_2.cnf similarity index 100% rename from core/src/test/resources/dnnf/both_bdd_dnnf_2.cnf rename to test_files/dnnf/both_bdd_dnnf_2.cnf diff --git a/core/src/test/resources/dnnf/both_bdd_dnnf_3.cnf b/test_files/dnnf/both_bdd_dnnf_3.cnf similarity index 100% rename from core/src/test/resources/dnnf/both_bdd_dnnf_3.cnf rename to test_files/dnnf/both_bdd_dnnf_3.cnf diff --git a/core/src/test/resources/dnnf/both_bdd_dnnf_4.cnf b/test_files/dnnf/both_bdd_dnnf_4.cnf similarity index 100% rename from core/src/test/resources/dnnf/both_bdd_dnnf_4.cnf rename to test_files/dnnf/both_bdd_dnnf_4.cnf diff --git a/core/src/test/resources/dnnf/both_bdd_dnnf_5.cnf b/test_files/dnnf/both_bdd_dnnf_5.cnf similarity index 100% rename from core/src/test/resources/dnnf/both_bdd_dnnf_5.cnf rename to test_files/dnnf/both_bdd_dnnf_5.cnf diff --git a/core/src/test/resources/drup/avg_input.cnf b/test_files/drup/avg_input.cnf similarity index 100% rename from core/src/test/resources/drup/avg_input.cnf rename to test_files/drup/avg_input.cnf diff --git a/core/src/test/resources/drup/pg4_input.cnf b/test_files/drup/pg4_input.cnf similarity index 100% rename from core/src/test/resources/drup/pg4_input.cnf rename to test_files/drup/pg4_input.cnf diff --git a/core/src/test/resources/drup/simple_input.cnf b/test_files/drup/simple_input.cnf similarity index 100% rename from core/src/test/resources/drup/simple_input.cnf rename to test_files/drup/simple_input.cnf diff --git a/core/src/test/resources/formulas/formula1.txt b/test_files/formulas/formula1.txt similarity index 100% rename from core/src/test/resources/formulas/formula1.txt rename to test_files/formulas/formula1.txt diff --git a/core/src/test/resources/formulas/formula2.txt b/test_files/formulas/formula2.txt similarity index 100% rename from core/src/test/resources/formulas/formula2.txt rename to test_files/formulas/formula2.txt diff --git a/core/src/test/resources/formulas/formula3.txt b/test_files/formulas/formula3.txt similarity index 100% rename from core/src/test/resources/formulas/formula3.txt rename to test_files/formulas/formula3.txt diff --git a/core/src/test/resources/formulas/large_formula.txt b/test_files/formulas/large_formula.txt similarity index 100% rename from core/src/test/resources/formulas/large_formula.txt rename to test_files/formulas/large_formula.txt diff --git a/serialization/src/test/resources/large_formula.txt b/test_files/formulas/largest_formula.txt similarity index 100% rename from serialization/src/test/resources/large_formula.txt rename to test_files/formulas/largest_formula.txt diff --git a/core/src/test/resources/formulas/simplify_formulas.txt b/test_files/formulas/simplify_formulas.txt similarity index 100% rename from core/src/test/resources/formulas/simplify_formulas.txt rename to test_files/formulas/simplify_formulas.txt diff --git a/core/src/test/resources/formulas/small_formulas.txt b/test_files/formulas/small_formulas.txt similarity index 100% rename from core/src/test/resources/formulas/small_formulas.txt rename to test_files/formulas/small_formulas.txt diff --git a/core/src/test/resources/graphs/graph30.txt b/test_files/graphs/graph30.txt similarity index 100% rename from core/src/test/resources/graphs/graph30.txt rename to test_files/graphs/graph30.txt diff --git a/core/src/test/resources/graphs/graph50.txt b/test_files/graphs/graph50.txt similarity index 100% rename from core/src/test/resources/graphs/graph50.txt rename to test_files/graphs/graph50.txt diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/30_f.col b/test_files/graphs/io/graphs-dimacs/30_f.col similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/30_f.col rename to test_files/graphs/io/graphs-dimacs/30_f.col diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/30_t.col b/test_files/graphs/io/graphs-dimacs/30_t.col similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/30_t.col rename to test_files/graphs/io/graphs-dimacs/30_t.col diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/30_t.map b/test_files/graphs/io/graphs-dimacs/30_t.map similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/30_t.map rename to test_files/graphs/io/graphs-dimacs/30_t.map diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/50p1_f.col b/test_files/graphs/io/graphs-dimacs/50p1_f.col similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/50p1_f.col rename to test_files/graphs/io/graphs-dimacs/50p1_f.col diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/50p1_t.col b/test_files/graphs/io/graphs-dimacs/50p1_t.col similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/50p1_t.col rename to test_files/graphs/io/graphs-dimacs/50p1_t.col diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/50p1_t.map b/test_files/graphs/io/graphs-dimacs/50p1_t.map similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/50p1_t.map rename to test_files/graphs/io/graphs-dimacs/50p1_t.map diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/small_f.col b/test_files/graphs/io/graphs-dimacs/small_f.col similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/small_f.col rename to test_files/graphs/io/graphs-dimacs/small_f.col diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/small_t.col b/test_files/graphs/io/graphs-dimacs/small_t.col similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/small_t.col rename to test_files/graphs/io/graphs-dimacs/small_t.col diff --git a/core/src/test/resources/graphs/io/graphs-dimacs/small_t.map b/test_files/graphs/io/graphs-dimacs/small_t.map similarity index 100% rename from core/src/test/resources/graphs/io/graphs-dimacs/small_t.map rename to test_files/graphs/io/graphs-dimacs/small_t.map diff --git a/core/src/test/resources/graphs/io/temp/.empty b/test_files/graphs/io/temp/.empty similarity index 100% rename from core/src/test/resources/graphs/io/temp/.empty rename to test_files/graphs/io/temp/.empty diff --git a/core/src/test/resources/graphs/io/temp/30_f.col b/test_files/graphs/io/temp/30_f.col similarity index 100% rename from core/src/test/resources/graphs/io/temp/30_f.col rename to test_files/graphs/io/temp/30_f.col diff --git a/core/src/test/resources/graphs/io/temp/30_t.col b/test_files/graphs/io/temp/30_t.col similarity index 100% rename from core/src/test/resources/graphs/io/temp/30_t.col rename to test_files/graphs/io/temp/30_t.col diff --git a/core/src/test/resources/graphs/io/temp/30_t.map b/test_files/graphs/io/temp/30_t.map similarity index 100% rename from core/src/test/resources/graphs/io/temp/30_t.map rename to test_files/graphs/io/temp/30_t.map diff --git a/core/src/test/resources/graphs/io/temp/50p1_f.col b/test_files/graphs/io/temp/50p1_f.col similarity index 100% rename from core/src/test/resources/graphs/io/temp/50p1_f.col rename to test_files/graphs/io/temp/50p1_f.col diff --git a/core/src/test/resources/graphs/io/temp/50p1_t.col b/test_files/graphs/io/temp/50p1_t.col similarity index 100% rename from core/src/test/resources/graphs/io/temp/50p1_t.col rename to test_files/graphs/io/temp/50p1_t.col diff --git a/core/src/test/resources/graphs/io/temp/50p1_t.map b/test_files/graphs/io/temp/50p1_t.map similarity index 100% rename from core/src/test/resources/graphs/io/temp/50p1_t.map rename to test_files/graphs/io/temp/50p1_t.map diff --git a/core/src/test/resources/graphs/io/temp/small_f.col b/test_files/graphs/io/temp/small_f.col similarity index 100% rename from core/src/test/resources/graphs/io/temp/small_f.col rename to test_files/graphs/io/temp/small_f.col diff --git a/core/src/test/resources/graphs/io/temp/small_t.col b/test_files/graphs/io/temp/small_t.col similarity index 100% rename from core/src/test/resources/graphs/io/temp/small_t.col rename to test_files/graphs/io/temp/small_t.col diff --git a/core/src/test/resources/graphs/io/temp/small_t.map b/test_files/graphs/io/temp/small_t.map similarity index 100% rename from core/src/test/resources/graphs/io/temp/small_t.map rename to test_files/graphs/io/temp/small_t.map diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L2_V100_C300_0.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L2_V100_C300_0.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L2_V100_C300_0.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L2_V100_C300_0.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_0.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_0.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_0.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_0.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_1.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_1.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_1.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_2.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_2.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_2.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_2.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_3.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_3.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_3.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_3.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_4.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_4.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_4.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_4.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_5.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_5.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_5.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_5.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_6.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_6.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_6.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_6.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_7.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_7.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_7.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_7.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_8.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_8.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_8.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_8.wcnf diff --git a/core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_9.wcnf b/test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_9.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/file_rwms_wcnf_L3_V70_C300_9.wcnf rename to test_files/longrunning/wms/file_rwms_wcnf_L3_V70_C300_9.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb10-6-1.wcnf b/test_files/longrunning/wms/frb10-6-1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb10-6-1.wcnf rename to test_files/longrunning/wms/frb10-6-1.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb10-6-2.wcnf b/test_files/longrunning/wms/frb10-6-2.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb10-6-2.wcnf rename to test_files/longrunning/wms/frb10-6-2.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb10-6-3.wcnf b/test_files/longrunning/wms/frb10-6-3.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb10-6-3.wcnf rename to test_files/longrunning/wms/frb10-6-3.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb10-6-4.wcnf b/test_files/longrunning/wms/frb10-6-4.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb10-6-4.wcnf rename to test_files/longrunning/wms/frb10-6-4.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb15-9-1.wcnf b/test_files/longrunning/wms/frb15-9-1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb15-9-1.wcnf rename to test_files/longrunning/wms/frb15-9-1.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb15-9-2.wcnf b/test_files/longrunning/wms/frb15-9-2.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb15-9-2.wcnf rename to test_files/longrunning/wms/frb15-9-2.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb15-9-3.wcnf b/test_files/longrunning/wms/frb15-9-3.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb15-9-3.wcnf rename to test_files/longrunning/wms/frb15-9-3.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb15-9-4.wcnf b/test_files/longrunning/wms/frb15-9-4.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb15-9-4.wcnf rename to test_files/longrunning/wms/frb15-9-4.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb15-9-5.wcnf b/test_files/longrunning/wms/frb15-9-5.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb15-9-5.wcnf rename to test_files/longrunning/wms/frb15-9-5.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb20-11-1.wcnf b/test_files/longrunning/wms/frb20-11-1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb20-11-1.wcnf rename to test_files/longrunning/wms/frb20-11-1.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb20-11-2.wcnf b/test_files/longrunning/wms/frb20-11-2.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb20-11-2.wcnf rename to test_files/longrunning/wms/frb20-11-2.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb20-11-3.wcnf b/test_files/longrunning/wms/frb20-11-3.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb20-11-3.wcnf rename to test_files/longrunning/wms/frb20-11-3.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb20-11-4.wcnf b/test_files/longrunning/wms/frb20-11-4.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb20-11-4.wcnf rename to test_files/longrunning/wms/frb20-11-4.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb20-11-5.wcnf b/test_files/longrunning/wms/frb20-11-5.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb20-11-5.wcnf rename to test_files/longrunning/wms/frb20-11-5.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb25-13-1.wcnf b/test_files/longrunning/wms/frb25-13-1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb25-13-1.wcnf rename to test_files/longrunning/wms/frb25-13-1.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb25-13-2.wcnf b/test_files/longrunning/wms/frb25-13-2.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb25-13-2.wcnf rename to test_files/longrunning/wms/frb25-13-2.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb25-13-3.wcnf b/test_files/longrunning/wms/frb25-13-3.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb25-13-3.wcnf rename to test_files/longrunning/wms/frb25-13-3.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb25-13-4.wcnf b/test_files/longrunning/wms/frb25-13-4.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb25-13-4.wcnf rename to test_files/longrunning/wms/frb25-13-4.wcnf diff --git a/core/src/test/resources/longrunning/wms/frb25-13-5.wcnf b/test_files/longrunning/wms/frb25-13-5.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/frb25-13-5.wcnf rename to test_files/longrunning/wms/frb25-13-5.wcnf diff --git a/core/src/test/resources/longrunning/wms/ram_k3_n4.ra1.wcnf b/test_files/longrunning/wms/ram_k3_n4.ra1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/ram_k3_n4.ra1.wcnf rename to test_files/longrunning/wms/ram_k3_n4.ra1.wcnf diff --git a/core/src/test/resources/longrunning/wms/ram_k3_n5.ra1.wcnf b/test_files/longrunning/wms/ram_k3_n5.ra1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/ram_k3_n5.ra1.wcnf rename to test_files/longrunning/wms/ram_k3_n5.ra1.wcnf diff --git a/core/src/test/resources/longrunning/wms/ram_k3_n6.ra1.wcnf b/test_files/longrunning/wms/ram_k3_n6.ra1.wcnf similarity index 100% rename from core/src/test/resources/longrunning/wms/ram_k3_n6.ra1.wcnf rename to test_files/longrunning/wms/ram_k3_n6.ra1.wcnf diff --git a/core/src/test/resources/longrunning/wms/result.txt b/test_files/longrunning/wms/result.txt similarity index 100% rename from core/src/test/resources/longrunning/wms/result.txt rename to test_files/longrunning/wms/result.txt diff --git a/core/src/test/resources/maxsat/c-fat200-2.clq.cnf b/test_files/maxsat/c-fat200-2.clq.cnf similarity index 100% rename from core/src/test/resources/maxsat/c-fat200-2.clq.cnf rename to test_files/maxsat/c-fat200-2.clq.cnf diff --git a/core/src/test/resources/maxsat/c5315-bug-gate-0.dimacs.seq.filtered.cnf b/test_files/maxsat/c5315-bug-gate-0.dimacs.seq.filtered.cnf similarity index 100% rename from core/src/test/resources/maxsat/c5315-bug-gate-0.dimacs.seq.filtered.cnf rename to test_files/maxsat/c5315-bug-gate-0.dimacs.seq.filtered.cnf diff --git a/core/src/test/resources/maxsat/c6288-bug-gate-0.dimacs.seq.filtered.cnf b/test_files/maxsat/c6288-bug-gate-0.dimacs.seq.filtered.cnf similarity index 100% rename from core/src/test/resources/maxsat/c6288-bug-gate-0.dimacs.seq.filtered.cnf rename to test_files/maxsat/c6288-bug-gate-0.dimacs.seq.filtered.cnf diff --git a/core/src/test/resources/maxsat/c7552-bug-gate-0.dimacs.seq.filtered.cnf b/test_files/maxsat/c7552-bug-gate-0.dimacs.seq.filtered.cnf similarity index 100% rename from core/src/test/resources/maxsat/c7552-bug-gate-0.dimacs.seq.filtered.cnf rename to test_files/maxsat/c7552-bug-gate-0.dimacs.seq.filtered.cnf diff --git a/core/src/test/resources/maxsat/mot_comb1._red-gate-0.dimacs.seq.filtered.cnf b/test_files/maxsat/mot_comb1._red-gate-0.dimacs.seq.filtered.cnf similarity index 100% rename from core/src/test/resources/maxsat/mot_comb1._red-gate-0.dimacs.seq.filtered.cnf rename to test_files/maxsat/mot_comb1._red-gate-0.dimacs.seq.filtered.cnf diff --git a/core/src/test/resources/maxsat/mot_comb2._red-gate-0.dimacs.seq.filtered.cnf b/test_files/maxsat/mot_comb2._red-gate-0.dimacs.seq.filtered.cnf similarity index 100% rename from core/src/test/resources/maxsat/mot_comb2._red-gate-0.dimacs.seq.filtered.cnf rename to test_files/maxsat/mot_comb2._red-gate-0.dimacs.seq.filtered.cnf diff --git a/core/src/test/resources/maxsat/mot_comb3._red-gate-0.dimacs.seq.filtered.cnf b/test_files/maxsat/mot_comb3._red-gate-0.dimacs.seq.filtered.cnf similarity index 100% rename from core/src/test/resources/maxsat/mot_comb3._red-gate-0.dimacs.seq.filtered.cnf rename to test_files/maxsat/mot_comb3._red-gate-0.dimacs.seq.filtered.cnf diff --git a/core/src/test/resources/maxsat/s15850-bug-onevec-gate-0.dimacs.seq.filtered.cnf b/test_files/maxsat/s15850-bug-onevec-gate-0.dimacs.seq.filtered.cnf similarity index 100% rename from core/src/test/resources/maxsat/s15850-bug-onevec-gate-0.dimacs.seq.filtered.cnf rename to test_files/maxsat/s15850-bug-onevec-gate-0.dimacs.seq.filtered.cnf diff --git a/core/src/test/resources/partialmaxsat/c1355_F1001gat-1048gat@1.wcnf b/test_files/partialmaxsat/c1355_F1001gat-1048gat@1.wcnf similarity index 100% rename from core/src/test/resources/partialmaxsat/c1355_F1001gat-1048gat@1.wcnf rename to test_files/partialmaxsat/c1355_F1001gat-1048gat@1.wcnf diff --git a/core/src/test/resources/partialmaxsat/c1355_F1183gat-1262gat@1.wcnf b/test_files/partialmaxsat/c1355_F1183gat-1262gat@1.wcnf similarity index 100% rename from core/src/test/resources/partialmaxsat/c1355_F1183gat-1262gat@1.wcnf rename to test_files/partialmaxsat/c1355_F1183gat-1262gat@1.wcnf diff --git a/core/src/test/resources/partialmaxsat/c1355_F1229gat@1.wcnf b/test_files/partialmaxsat/c1355_F1229gat@1.wcnf similarity index 100% rename from core/src/test/resources/partialmaxsat/c1355_F1229gat@1.wcnf rename to test_files/partialmaxsat/c1355_F1229gat@1.wcnf diff --git a/core/src/test/resources/partialmaxsat/c1355_F176gat-1278gat@1.wcnf b/test_files/partialmaxsat/c1355_F176gat-1278gat@1.wcnf similarity index 100% rename from core/src/test/resources/partialmaxsat/c1355_F176gat-1278gat@1.wcnf rename to test_files/partialmaxsat/c1355_F176gat-1278gat@1.wcnf diff --git a/core/src/test/resources/partialmaxsat/normalized-s3-3-3-1pb.wcnf b/test_files/partialmaxsat/normalized-s3-3-3-1pb.wcnf similarity index 100% rename from core/src/test/resources/partialmaxsat/normalized-s3-3-3-1pb.wcnf rename to test_files/partialmaxsat/normalized-s3-3-3-1pb.wcnf diff --git a/core/src/test/resources/partialmaxsat/normalized-s3-3-3-2pb.wcnf b/test_files/partialmaxsat/normalized-s3-3-3-2pb.wcnf similarity index 100% rename from core/src/test/resources/partialmaxsat/normalized-s3-3-3-2pb.wcnf rename to test_files/partialmaxsat/normalized-s3-3-3-2pb.wcnf diff --git a/core/src/test/resources/partialmaxsat/normalized-s3-3-3-3pb.wcnf b/test_files/partialmaxsat/normalized-s3-3-3-3pb.wcnf similarity index 100% rename from core/src/test/resources/partialmaxsat/normalized-s3-3-3-3pb.wcnf rename to test_files/partialmaxsat/normalized-s3-3-3-3pb.wcnf diff --git a/core/src/test/resources/partialmaxsat/term1_gr_2pin_w4.shuffled.cnf b/test_files/partialmaxsat/term1_gr_2pin_w4.shuffled.cnf similarity index 100% rename from core/src/test/resources/partialmaxsat/term1_gr_2pin_w4.shuffled.cnf rename to test_files/partialmaxsat/term1_gr_2pin_w4.shuffled.cnf diff --git a/core/src/test/resources/partialweightedmaxsat/404.wcsp.log.wcnf b/test_files/partialweightedmaxsat/404.wcsp.log.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/404.wcsp.log.wcnf rename to test_files/partialweightedmaxsat/404.wcsp.log.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/54.wcsp.log.wcnf b/test_files/partialweightedmaxsat/54.wcsp.log.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/54.wcsp.log.wcnf rename to test_files/partialweightedmaxsat/54.wcsp.log.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/8.wcsp.log.wcnf b/test_files/partialweightedmaxsat/8.wcsp.log.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/8.wcsp.log.wcnf rename to test_files/partialweightedmaxsat/8.wcsp.log.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=283.opb.wcnf b/test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=283.opb.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=283.opb.wcnf rename to test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=283.opb.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=53.opb.wcnf b/test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=53.opb.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=53.opb.wcnf rename to test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=11-Q=53.opb.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=13-Q=179.opb.wcnf b/test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=13-Q=179.opb.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=13-Q=179.opb.wcnf rename to test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=13-Q=179.opb.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=347.opb.wcnf b/test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=347.opb.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=347.opb.wcnf rename to test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=347.opb.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=487.opb.wcnf b/test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=487.opb.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=487.opb.wcnf rename to test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=17-Q=487.opb.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=23-Q=293.opb.wcnf b/test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=23-Q=293.opb.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/bmo/normalized-factor-size=9-P=23-Q=293.opb.wcnf rename to test_files/partialweightedmaxsat/bmo/normalized-factor-size=9-P=23-Q=293.opb.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/large/large_industrial.wcnf b/test_files/partialweightedmaxsat/large/large_industrial.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/large/large_industrial.wcnf rename to test_files/partialweightedmaxsat/large/large_industrial.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/large/large_weights.wcnf b/test_files/partialweightedmaxsat/large/large_weights.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/large/large_weights.wcnf rename to test_files/partialweightedmaxsat/large/large_weights.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/large/t3g3-5555.spn.wcnf b/test_files/partialweightedmaxsat/large/t3g3-5555.spn.wcnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/large/t3g3-5555.spn.wcnf rename to test_files/partialweightedmaxsat/large/t3g3-5555.spn.wcnf diff --git a/core/src/test/resources/partialweightedmaxsat/term1_gr_2pin_w4.shuffled.cnf b/test_files/partialweightedmaxsat/term1_gr_2pin_w4.shuffled.cnf similarity index 100% rename from core/src/test/resources/partialweightedmaxsat/term1_gr_2pin_w4.shuffled.cnf rename to test_files/partialweightedmaxsat/term1_gr_2pin_w4.shuffled.cnf diff --git a/core/src/test/resources/sat/3col40_5_10.shuffled.cnf b/test_files/sat/3col40_5_10.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/3col40_5_10.shuffled.cnf rename to test_files/sat/3col40_5_10.shuffled.cnf diff --git a/core/src/test/resources/sat/9symml_gr_rcs_w5.shuffled.cnf b/test_files/sat/9symml_gr_rcs_w5.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/9symml_gr_rcs_w5.shuffled.cnf rename to test_files/sat/9symml_gr_rcs_w5.shuffled.cnf diff --git a/core/src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf b/test_files/sat/9symml_gr_rcs_w6.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/9symml_gr_rcs_w6.shuffled.cnf rename to test_files/sat/9symml_gr_rcs_w6.shuffled.cnf diff --git a/core/src/test/resources/sat/D1119_M23.cnf b/test_files/sat/D1119_M23.cnf similarity index 100% rename from core/src/test/resources/sat/D1119_M23.cnf rename to test_files/sat/D1119_M23.cnf diff --git a/core/src/test/resources/sat/apex7_gr_rcs_w5.shuffled.cnf b/test_files/sat/apex7_gr_rcs_w5.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/apex7_gr_rcs_w5.shuffled.cnf rename to test_files/sat/apex7_gr_rcs_w5.shuffled.cnf diff --git a/core/src/test/resources/sat/avg-checker-4-23.shuffled.cnf b/test_files/sat/avg-checker-4-23.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/avg-checker-4-23.shuffled.cnf rename to test_files/sat/avg-checker-4-23.shuffled.cnf diff --git a/core/src/test/resources/sat/bart30.shuffled.cnf b/test_files/sat/bart30.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/bart30.shuffled.cnf rename to test_files/sat/bart30.shuffled.cnf diff --git a/core/src/test/resources/sat/c499_gr_rcs_w6.shuffled.cnf b/test_files/sat/c499_gr_rcs_w6.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/c499_gr_rcs_w6.shuffled.cnf rename to test_files/sat/c499_gr_rcs_w6.shuffled.cnf diff --git a/core/src/test/resources/sat/ca032.shuffled.cnf b/test_files/sat/ca032.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/ca032.shuffled.cnf rename to test_files/sat/ca032.shuffled.cnf diff --git a/core/src/test/resources/sat/ca064.shuffled.cnf b/test_files/sat/ca064.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/ca064.shuffled.cnf rename to test_files/sat/ca064.shuffled.cnf diff --git a/core/src/test/resources/sat/ca128.shuffled.cnf b/test_files/sat/ca128.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/ca128.shuffled.cnf rename to test_files/sat/ca128.shuffled.cnf diff --git a/core/src/test/resources/sat/dp02s02.shuffled.cnf b/test_files/sat/dp02s02.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/dp02s02.shuffled.cnf rename to test_files/sat/dp02s02.shuffled.cnf diff --git a/core/src/test/resources/sat/example2_gr_rcs_w6.shuffled.cnf b/test_files/sat/example2_gr_rcs_w6.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/example2_gr_rcs_w6.shuffled.cnf rename to test_files/sat/example2_gr_rcs_w6.shuffled.cnf diff --git a/core/src/test/resources/sat/grid_10_20.shuffled.cnf b/test_files/sat/grid_10_20.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/grid_10_20.shuffled.cnf rename to test_files/sat/grid_10_20.shuffled.cnf diff --git a/core/src/test/resources/sat/med19.shuffled.cnf b/test_files/sat/med19.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/med19.shuffled.cnf rename to test_files/sat/med19.shuffled.cnf diff --git a/core/src/test/resources/sat/results.txt b/test_files/sat/results.txt similarity index 100% rename from core/src/test/resources/sat/results.txt rename to test_files/sat/results.txt diff --git a/core/src/test/resources/sat/term1_gr_rcs_w3.shuffled.cnf b/test_files/sat/term1_gr_rcs_w3.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/term1_gr_rcs_w3.shuffled.cnf rename to test_files/sat/term1_gr_rcs_w3.shuffled.cnf diff --git a/core/src/test/resources/sat/term1_gr_rcs_w4.shuffled.cnf b/test_files/sat/term1_gr_rcs_w4.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/term1_gr_rcs_w4.shuffled.cnf rename to test_files/sat/term1_gr_rcs_w4.shuffled.cnf diff --git a/core/src/test/resources/sat/too_large_gr_rcs_w5.shuffled.cnf b/test_files/sat/too_large_gr_rcs_w5.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/too_large_gr_rcs_w5.shuffled.cnf rename to test_files/sat/too_large_gr_rcs_w5.shuffled.cnf diff --git a/core/src/test/resources/sat/too_large_gr_rcs_w6.shuffled.cnf b/test_files/sat/too_large_gr_rcs_w6.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/too_large_gr_rcs_w6.shuffled.cnf rename to test_files/sat/too_large_gr_rcs_w6.shuffled.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-1_6-no-1.cnf b/test_files/sat/unsat/aim-100-1_6-no-1.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-1_6-no-1.cnf rename to test_files/sat/unsat/aim-100-1_6-no-1.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-1_6-no-2.cnf b/test_files/sat/unsat/aim-100-1_6-no-2.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-1_6-no-2.cnf rename to test_files/sat/unsat/aim-100-1_6-no-2.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-1_6-no-3.cnf b/test_files/sat/unsat/aim-100-1_6-no-3.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-1_6-no-3.cnf rename to test_files/sat/unsat/aim-100-1_6-no-3.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-1_6-no-4.cnf b/test_files/sat/unsat/aim-100-1_6-no-4.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-1_6-no-4.cnf rename to test_files/sat/unsat/aim-100-1_6-no-4.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-2_0-no-1.cnf b/test_files/sat/unsat/aim-100-2_0-no-1.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-2_0-no-1.cnf rename to test_files/sat/unsat/aim-100-2_0-no-1.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-2_0-no-2.cnf b/test_files/sat/unsat/aim-100-2_0-no-2.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-2_0-no-2.cnf rename to test_files/sat/unsat/aim-100-2_0-no-2.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-2_0-no-3.cnf b/test_files/sat/unsat/aim-100-2_0-no-3.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-2_0-no-3.cnf rename to test_files/sat/unsat/aim-100-2_0-no-3.cnf diff --git a/core/src/test/resources/sat/unsat/aim-100-2_0-no-4.cnf b/test_files/sat/unsat/aim-100-2_0-no-4.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-100-2_0-no-4.cnf rename to test_files/sat/unsat/aim-100-2_0-no-4.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-1_6-no-1.cnf b/test_files/sat/unsat/aim-200-1_6-no-1.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-1_6-no-1.cnf rename to test_files/sat/unsat/aim-200-1_6-no-1.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-1_6-no-2.cnf b/test_files/sat/unsat/aim-200-1_6-no-2.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-1_6-no-2.cnf rename to test_files/sat/unsat/aim-200-1_6-no-2.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-1_6-no-3.cnf b/test_files/sat/unsat/aim-200-1_6-no-3.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-1_6-no-3.cnf rename to test_files/sat/unsat/aim-200-1_6-no-3.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-1_6-no-4.cnf b/test_files/sat/unsat/aim-200-1_6-no-4.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-1_6-no-4.cnf rename to test_files/sat/unsat/aim-200-1_6-no-4.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-2_0-no-1.cnf b/test_files/sat/unsat/aim-200-2_0-no-1.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-2_0-no-1.cnf rename to test_files/sat/unsat/aim-200-2_0-no-1.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-2_0-no-2.cnf b/test_files/sat/unsat/aim-200-2_0-no-2.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-2_0-no-2.cnf rename to test_files/sat/unsat/aim-200-2_0-no-2.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-2_0-no-3.cnf b/test_files/sat/unsat/aim-200-2_0-no-3.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-2_0-no-3.cnf rename to test_files/sat/unsat/aim-200-2_0-no-3.cnf diff --git a/core/src/test/resources/sat/unsat/aim-200-2_0-no-4.cnf b/test_files/sat/unsat/aim-200-2_0-no-4.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-200-2_0-no-4.cnf rename to test_files/sat/unsat/aim-200-2_0-no-4.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-1_6-no-1.cnf b/test_files/sat/unsat/aim-50-1_6-no-1.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-1_6-no-1.cnf rename to test_files/sat/unsat/aim-50-1_6-no-1.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-1_6-no-2.cnf b/test_files/sat/unsat/aim-50-1_6-no-2.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-1_6-no-2.cnf rename to test_files/sat/unsat/aim-50-1_6-no-2.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-1_6-no-3.cnf b/test_files/sat/unsat/aim-50-1_6-no-3.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-1_6-no-3.cnf rename to test_files/sat/unsat/aim-50-1_6-no-3.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-1_6-no-4.cnf b/test_files/sat/unsat/aim-50-1_6-no-4.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-1_6-no-4.cnf rename to test_files/sat/unsat/aim-50-1_6-no-4.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-2_0-no-1.cnf b/test_files/sat/unsat/aim-50-2_0-no-1.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-2_0-no-1.cnf rename to test_files/sat/unsat/aim-50-2_0-no-1.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-2_0-no-2.cnf b/test_files/sat/unsat/aim-50-2_0-no-2.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-2_0-no-2.cnf rename to test_files/sat/unsat/aim-50-2_0-no-2.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-2_0-no-3.cnf b/test_files/sat/unsat/aim-50-2_0-no-3.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-2_0-no-3.cnf rename to test_files/sat/unsat/aim-50-2_0-no-3.cnf diff --git a/core/src/test/resources/sat/unsat/aim-50-2_0-no-4.cnf b/test_files/sat/unsat/aim-50-2_0-no-4.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/aim-50-2_0-no-4.cnf rename to test_files/sat/unsat/aim-50-2_0-no-4.cnf diff --git a/core/src/test/resources/sat/unsat/bf0432-007.cnf b/test_files/sat/unsat/bf0432-007.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/bf0432-007.cnf rename to test_files/sat/unsat/bf0432-007.cnf diff --git a/core/src/test/resources/sat/unsat/bf1355-075.cnf b/test_files/sat/unsat/bf1355-075.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/bf1355-075.cnf rename to test_files/sat/unsat/bf1355-075.cnf diff --git a/core/src/test/resources/sat/unsat/bf1355-638.cnf b/test_files/sat/unsat/bf1355-638.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/bf1355-638.cnf rename to test_files/sat/unsat/bf1355-638.cnf diff --git a/core/src/test/resources/sat/unsat/bf2670-001.cnf b/test_files/sat/unsat/bf2670-001.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/bf2670-001.cnf rename to test_files/sat/unsat/bf2670-001.cnf diff --git a/core/src/test/resources/sat/unsat/pret150_25.cnf b/test_files/sat/unsat/pret150_25.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret150_25.cnf rename to test_files/sat/unsat/pret150_25.cnf diff --git a/core/src/test/resources/sat/unsat/pret150_40.cnf b/test_files/sat/unsat/pret150_40.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret150_40.cnf rename to test_files/sat/unsat/pret150_40.cnf diff --git a/core/src/test/resources/sat/unsat/pret150_60.cnf b/test_files/sat/unsat/pret150_60.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret150_60.cnf rename to test_files/sat/unsat/pret150_60.cnf diff --git a/core/src/test/resources/sat/unsat/pret150_75.cnf b/test_files/sat/unsat/pret150_75.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret150_75.cnf rename to test_files/sat/unsat/pret150_75.cnf diff --git a/core/src/test/resources/sat/unsat/pret60_25.cnf b/test_files/sat/unsat/pret60_25.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret60_25.cnf rename to test_files/sat/unsat/pret60_25.cnf diff --git a/core/src/test/resources/sat/unsat/pret60_40.cnf b/test_files/sat/unsat/pret60_40.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret60_40.cnf rename to test_files/sat/unsat/pret60_40.cnf diff --git a/core/src/test/resources/sat/unsat/pret60_60.cnf b/test_files/sat/unsat/pret60_60.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret60_60.cnf rename to test_files/sat/unsat/pret60_60.cnf diff --git a/core/src/test/resources/sat/unsat/pret60_75.cnf b/test_files/sat/unsat/pret60_75.cnf similarity index 100% rename from core/src/test/resources/sat/unsat/pret60_75.cnf rename to test_files/sat/unsat/pret60_75.cnf diff --git a/core/src/test/resources/sat/x1_16.shuffled.cnf b/test_files/sat/x1_16.shuffled.cnf similarity index 100% rename from core/src/test/resources/sat/x1_16.shuffled.cnf rename to test_files/sat/x1_16.shuffled.cnf diff --git a/core/src/test/resources/writers/bdd/a_bdd.dot b/test_files/writers/bdd/a_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/a_bdd.dot rename to test_files/writers/bdd/a_bdd.dot diff --git a/core/src/test/resources/writers/bdd/a_bdd.txt b/test_files/writers/bdd/a_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/a_bdd.txt rename to test_files/writers/bdd/a_bdd.txt diff --git a/core/src/test/resources/writers/bdd/and_bdd.dot b/test_files/writers/bdd/and_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/and_bdd.dot rename to test_files/writers/bdd/and_bdd.dot diff --git a/core/src/test/resources/writers/bdd/and_bdd.txt b/test_files/writers/bdd/and_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/and_bdd.txt rename to test_files/writers/bdd/and_bdd.txt diff --git a/core/src/test/resources/writers/bdd/equiv_bdd.dot b/test_files/writers/bdd/equiv_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/equiv_bdd.dot rename to test_files/writers/bdd/equiv_bdd.dot diff --git a/core/src/test/resources/writers/bdd/equiv_bdd.txt b/test_files/writers/bdd/equiv_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/equiv_bdd.txt rename to test_files/writers/bdd/equiv_bdd.txt diff --git a/core/src/test/resources/writers/bdd/false_bdd.dot b/test_files/writers/bdd/false_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/false_bdd.dot rename to test_files/writers/bdd/false_bdd.dot diff --git a/core/src/test/resources/writers/bdd/false_bdd.txt b/test_files/writers/bdd/false_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/false_bdd.txt rename to test_files/writers/bdd/false_bdd.txt diff --git a/core/src/test/resources/writers/bdd/formula-dynamic_bdd.dot b/test_files/writers/bdd/formula-dynamic_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/formula-dynamic_bdd.dot rename to test_files/writers/bdd/formula-dynamic_bdd.dot diff --git a/core/src/test/resources/writers/bdd/formula-dynamic_bdd.txt b/test_files/writers/bdd/formula-dynamic_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/formula-dynamic_bdd.txt rename to test_files/writers/bdd/formula-dynamic_bdd.txt diff --git a/core/src/test/resources/writers/bdd/formula-fixedStyle_bdd.dot b/test_files/writers/bdd/formula-fixedStyle_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/formula-fixedStyle_bdd.dot rename to test_files/writers/bdd/formula-fixedStyle_bdd.dot diff --git a/core/src/test/resources/writers/bdd/formula-fixedStyle_bdd.txt b/test_files/writers/bdd/formula-fixedStyle_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/formula-fixedStyle_bdd.txt rename to test_files/writers/bdd/formula-fixedStyle_bdd.txt diff --git a/core/src/test/resources/writers/bdd/formula_bdd.dot b/test_files/writers/bdd/formula_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/formula_bdd.dot rename to test_files/writers/bdd/formula_bdd.dot diff --git a/core/src/test/resources/writers/bdd/formula_bdd.txt b/test_files/writers/bdd/formula_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/formula_bdd.txt rename to test_files/writers/bdd/formula_bdd.txt diff --git a/core/src/test/resources/writers/bdd/impl_bdd.dot b/test_files/writers/bdd/impl_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/impl_bdd.dot rename to test_files/writers/bdd/impl_bdd.dot diff --git a/core/src/test/resources/writers/bdd/impl_bdd.txt b/test_files/writers/bdd/impl_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/impl_bdd.txt rename to test_files/writers/bdd/impl_bdd.txt diff --git a/core/src/test/resources/writers/bdd/not_a_bdd.dot b/test_files/writers/bdd/not_a_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/not_a_bdd.dot rename to test_files/writers/bdd/not_a_bdd.dot diff --git a/core/src/test/resources/writers/bdd/not_a_bdd.txt b/test_files/writers/bdd/not_a_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/not_a_bdd.txt rename to test_files/writers/bdd/not_a_bdd.txt diff --git a/core/src/test/resources/writers/bdd/not_bdd.dot b/test_files/writers/bdd/not_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/not_bdd.dot rename to test_files/writers/bdd/not_bdd.dot diff --git a/core/src/test/resources/writers/bdd/not_bdd.txt b/test_files/writers/bdd/not_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/not_bdd.txt rename to test_files/writers/bdd/not_bdd.txt diff --git a/core/src/test/resources/writers/bdd/or_bdd.dot b/test_files/writers/bdd/or_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/or_bdd.dot rename to test_files/writers/bdd/or_bdd.dot diff --git a/core/src/test/resources/writers/bdd/or_bdd.txt b/test_files/writers/bdd/or_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/or_bdd.txt rename to test_files/writers/bdd/or_bdd.txt diff --git a/core/src/test/resources/writers/bdd/true_bdd.dot b/test_files/writers/bdd/true_bdd.dot similarity index 100% rename from core/src/test/resources/writers/bdd/true_bdd.dot rename to test_files/writers/bdd/true_bdd.dot diff --git a/core/src/test/resources/writers/bdd/true_bdd.txt b/test_files/writers/bdd/true_bdd.txt similarity index 100% rename from core/src/test/resources/writers/bdd/true_bdd.txt rename to test_files/writers/bdd/true_bdd.txt diff --git a/core/src/test/resources/writers/formulas-ast/f1-ast.dot b/test_files/writers/formulas-ast/f1-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f1-ast.dot rename to test_files/writers/formulas-ast/f1-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f1-ast.txt b/test_files/writers/formulas-ast/f1-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f1-ast.txt rename to test_files/writers/formulas-ast/f1-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f10-ast.dot b/test_files/writers/formulas-ast/f10-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f10-ast.dot rename to test_files/writers/formulas-ast/f10-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f10-ast.txt b/test_files/writers/formulas-ast/f10-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f10-ast.txt rename to test_files/writers/formulas-ast/f10-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f2-ast.dot b/test_files/writers/formulas-ast/f2-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f2-ast.dot rename to test_files/writers/formulas-ast/f2-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f2-ast.txt b/test_files/writers/formulas-ast/f2-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f2-ast.txt rename to test_files/writers/formulas-ast/f2-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f3-ast.dot b/test_files/writers/formulas-ast/f3-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f3-ast.dot rename to test_files/writers/formulas-ast/f3-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f3-ast.txt b/test_files/writers/formulas-ast/f3-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f3-ast.txt rename to test_files/writers/formulas-ast/f3-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f4-ast.dot b/test_files/writers/formulas-ast/f4-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f4-ast.dot rename to test_files/writers/formulas-ast/f4-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f4-ast.txt b/test_files/writers/formulas-ast/f4-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f4-ast.txt rename to test_files/writers/formulas-ast/f4-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f5-ast.dot b/test_files/writers/formulas-ast/f5-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f5-ast.dot rename to test_files/writers/formulas-ast/f5-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f5-ast.txt b/test_files/writers/formulas-ast/f5-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f5-ast.txt rename to test_files/writers/formulas-ast/f5-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f6-ast.dot b/test_files/writers/formulas-ast/f6-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f6-ast.dot rename to test_files/writers/formulas-ast/f6-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f6-ast.txt b/test_files/writers/formulas-ast/f6-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f6-ast.txt rename to test_files/writers/formulas-ast/f6-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f7-ast.dot b/test_files/writers/formulas-ast/f7-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f7-ast.dot rename to test_files/writers/formulas-ast/f7-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f7-ast.txt b/test_files/writers/formulas-ast/f7-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f7-ast.txt rename to test_files/writers/formulas-ast/f7-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f8-ast.dot b/test_files/writers/formulas-ast/f8-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f8-ast.dot rename to test_files/writers/formulas-ast/f8-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f8-ast.txt b/test_files/writers/formulas-ast/f8-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f8-ast.txt rename to test_files/writers/formulas-ast/f8-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f8-ownLabels-ast.dot b/test_files/writers/formulas-ast/f8-ownLabels-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f8-ownLabels-ast.dot rename to test_files/writers/formulas-ast/f8-ownLabels-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f8-ownLabels-ast.txt b/test_files/writers/formulas-ast/f8-ownLabels-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f8-ownLabels-ast.txt rename to test_files/writers/formulas-ast/f8-ownLabels-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/f9-ast.dot b/test_files/writers/formulas-ast/f9-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f9-ast.dot rename to test_files/writers/formulas-ast/f9-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/f9-ast.txt b/test_files/writers/formulas-ast/f9-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/f9-ast.txt rename to test_files/writers/formulas-ast/f9-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/false-ast.dot b/test_files/writers/formulas-ast/false-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/false-ast.dot rename to test_files/writers/formulas-ast/false-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/false-ast.txt b/test_files/writers/formulas-ast/false-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/false-ast.txt rename to test_files/writers/formulas-ast/false-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/not_x-ast.dot b/test_files/writers/formulas-ast/not_x-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/not_x-ast.dot rename to test_files/writers/formulas-ast/not_x-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/not_x-ast.txt b/test_files/writers/formulas-ast/not_x-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/not_x-ast.txt rename to test_files/writers/formulas-ast/not_x-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/true-ast.dot b/test_files/writers/formulas-ast/true-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/true-ast.dot rename to test_files/writers/formulas-ast/true-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/true-ast.txt b/test_files/writers/formulas-ast/true-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/true-ast.txt rename to test_files/writers/formulas-ast/true-ast.txt diff --git a/core/src/test/resources/writers/formulas-ast/x-ast.dot b/test_files/writers/formulas-ast/x-ast.dot similarity index 100% rename from core/src/test/resources/writers/formulas-ast/x-ast.dot rename to test_files/writers/formulas-ast/x-ast.dot diff --git a/core/src/test/resources/writers/formulas-ast/x-ast.txt b/test_files/writers/formulas-ast/x-ast.txt similarity index 100% rename from core/src/test/resources/writers/formulas-ast/x-ast.txt rename to test_files/writers/formulas-ast/x-ast.txt diff --git a/core/src/test/resources/writers/formulas-dag/f1.dot b/test_files/writers/formulas-dag/f1.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f1.dot rename to test_files/writers/formulas-dag/f1.dot diff --git a/core/src/test/resources/writers/formulas-dag/f1.txt b/test_files/writers/formulas-dag/f1.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f1.txt rename to test_files/writers/formulas-dag/f1.txt diff --git a/core/src/test/resources/writers/formulas-dag/f10.dot b/test_files/writers/formulas-dag/f10.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f10.dot rename to test_files/writers/formulas-dag/f10.dot diff --git a/core/src/test/resources/writers/formulas-dag/f10.txt b/test_files/writers/formulas-dag/f10.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f10.txt rename to test_files/writers/formulas-dag/f10.txt diff --git a/core/src/test/resources/writers/formulas-dag/f2.dot b/test_files/writers/formulas-dag/f2.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f2.dot rename to test_files/writers/formulas-dag/f2.dot diff --git a/core/src/test/resources/writers/formulas-dag/f2.txt b/test_files/writers/formulas-dag/f2.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f2.txt rename to test_files/writers/formulas-dag/f2.txt diff --git a/core/src/test/resources/writers/formulas-dag/f3.dot b/test_files/writers/formulas-dag/f3.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f3.dot rename to test_files/writers/formulas-dag/f3.dot diff --git a/core/src/test/resources/writers/formulas-dag/f3.txt b/test_files/writers/formulas-dag/f3.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f3.txt rename to test_files/writers/formulas-dag/f3.txt diff --git a/core/src/test/resources/writers/formulas-dag/f4.dot b/test_files/writers/formulas-dag/f4.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f4.dot rename to test_files/writers/formulas-dag/f4.dot diff --git a/core/src/test/resources/writers/formulas-dag/f4.txt b/test_files/writers/formulas-dag/f4.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f4.txt rename to test_files/writers/formulas-dag/f4.txt diff --git a/core/src/test/resources/writers/formulas-dag/f5.dot b/test_files/writers/formulas-dag/f5.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f5.dot rename to test_files/writers/formulas-dag/f5.dot diff --git a/core/src/test/resources/writers/formulas-dag/f5.txt b/test_files/writers/formulas-dag/f5.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f5.txt rename to test_files/writers/formulas-dag/f5.txt diff --git a/core/src/test/resources/writers/formulas-dag/f6.dot b/test_files/writers/formulas-dag/f6.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f6.dot rename to test_files/writers/formulas-dag/f6.dot diff --git a/core/src/test/resources/writers/formulas-dag/f6.txt b/test_files/writers/formulas-dag/f6.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f6.txt rename to test_files/writers/formulas-dag/f6.txt diff --git a/core/src/test/resources/writers/formulas-dag/f7.dot b/test_files/writers/formulas-dag/f7.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f7.dot rename to test_files/writers/formulas-dag/f7.dot diff --git a/core/src/test/resources/writers/formulas-dag/f7.txt b/test_files/writers/formulas-dag/f7.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f7.txt rename to test_files/writers/formulas-dag/f7.txt diff --git a/core/src/test/resources/writers/formulas-dag/f8.dot b/test_files/writers/formulas-dag/f8.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f8.dot rename to test_files/writers/formulas-dag/f8.dot diff --git a/core/src/test/resources/writers/formulas-dag/f8.txt b/test_files/writers/formulas-dag/f8.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f8.txt rename to test_files/writers/formulas-dag/f8.txt diff --git a/core/src/test/resources/writers/formulas-dag/f9.dot b/test_files/writers/formulas-dag/f9.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f9.dot rename to test_files/writers/formulas-dag/f9.dot diff --git a/core/src/test/resources/writers/formulas-dag/f9.txt b/test_files/writers/formulas-dag/f9.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/f9.txt rename to test_files/writers/formulas-dag/f9.txt diff --git a/core/src/test/resources/writers/formulas-dag/false.dot b/test_files/writers/formulas-dag/false.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/false.dot rename to test_files/writers/formulas-dag/false.dot diff --git a/core/src/test/resources/writers/formulas-dag/false.txt b/test_files/writers/formulas-dag/false.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/false.txt rename to test_files/writers/formulas-dag/false.txt diff --git a/core/src/test/resources/writers/formulas-dag/not_x.dot b/test_files/writers/formulas-dag/not_x.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/not_x.dot rename to test_files/writers/formulas-dag/not_x.dot diff --git a/core/src/test/resources/writers/formulas-dag/not_x.txt b/test_files/writers/formulas-dag/not_x.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/not_x.txt rename to test_files/writers/formulas-dag/not_x.txt diff --git a/core/src/test/resources/writers/formulas-dag/true.dot b/test_files/writers/formulas-dag/true.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/true.dot rename to test_files/writers/formulas-dag/true.dot diff --git a/core/src/test/resources/writers/formulas-dag/true.txt b/test_files/writers/formulas-dag/true.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/true.txt rename to test_files/writers/formulas-dag/true.txt diff --git a/core/src/test/resources/writers/formulas-dag/x.dot b/test_files/writers/formulas-dag/x.dot similarity index 100% rename from core/src/test/resources/writers/formulas-dag/x.dot rename to test_files/writers/formulas-dag/x.dot diff --git a/core/src/test/resources/writers/formulas-dag/x.txt b/test_files/writers/formulas-dag/x.txt similarity index 100% rename from core/src/test/resources/writers/formulas-dag/x.txt rename to test_files/writers/formulas-dag/x.txt diff --git a/core/src/test/resources/writers/formulas-dimacs/f1_f.cnf b/test_files/writers/formulas-dimacs/f1_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f1_f.cnf rename to test_files/writers/formulas-dimacs/f1_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f1_t.cnf b/test_files/writers/formulas-dimacs/f1_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f1_t.cnf rename to test_files/writers/formulas-dimacs/f1_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f1_t.map b/test_files/writers/formulas-dimacs/f1_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f1_t.map rename to test_files/writers/formulas-dimacs/f1_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/f2_f.cnf b/test_files/writers/formulas-dimacs/f2_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f2_f.cnf rename to test_files/writers/formulas-dimacs/f2_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f2_t.cnf b/test_files/writers/formulas-dimacs/f2_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f2_t.cnf rename to test_files/writers/formulas-dimacs/f2_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f2_t.map b/test_files/writers/formulas-dimacs/f2_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f2_t.map rename to test_files/writers/formulas-dimacs/f2_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/f3_f.cnf b/test_files/writers/formulas-dimacs/f3_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f3_f.cnf rename to test_files/writers/formulas-dimacs/f3_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f3_t.cnf b/test_files/writers/formulas-dimacs/f3_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f3_t.cnf rename to test_files/writers/formulas-dimacs/f3_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f3_t.map b/test_files/writers/formulas-dimacs/f3_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f3_t.map rename to test_files/writers/formulas-dimacs/f3_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/f4_f.cnf b/test_files/writers/formulas-dimacs/f4_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f4_f.cnf rename to test_files/writers/formulas-dimacs/f4_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f4_t.cnf b/test_files/writers/formulas-dimacs/f4_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f4_t.cnf rename to test_files/writers/formulas-dimacs/f4_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f4_t.map b/test_files/writers/formulas-dimacs/f4_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f4_t.map rename to test_files/writers/formulas-dimacs/f4_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/f5_f.cnf b/test_files/writers/formulas-dimacs/f5_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f5_f.cnf rename to test_files/writers/formulas-dimacs/f5_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f5_t.cnf b/test_files/writers/formulas-dimacs/f5_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f5_t.cnf rename to test_files/writers/formulas-dimacs/f5_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f5_t.map b/test_files/writers/formulas-dimacs/f5_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f5_t.map rename to test_files/writers/formulas-dimacs/f5_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/f6_f.cnf b/test_files/writers/formulas-dimacs/f6_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f6_f.cnf rename to test_files/writers/formulas-dimacs/f6_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f6_t.cnf b/test_files/writers/formulas-dimacs/f6_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f6_t.cnf rename to test_files/writers/formulas-dimacs/f6_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f6_t.map b/test_files/writers/formulas-dimacs/f6_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f6_t.map rename to test_files/writers/formulas-dimacs/f6_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/f7_f.cnf b/test_files/writers/formulas-dimacs/f7_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f7_f.cnf rename to test_files/writers/formulas-dimacs/f7_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f7_t.cnf b/test_files/writers/formulas-dimacs/f7_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f7_t.cnf rename to test_files/writers/formulas-dimacs/f7_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/f7_t.map b/test_files/writers/formulas-dimacs/f7_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/f7_t.map rename to test_files/writers/formulas-dimacs/f7_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/false_f.cnf b/test_files/writers/formulas-dimacs/false_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/false_f.cnf rename to test_files/writers/formulas-dimacs/false_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/false_t.cnf b/test_files/writers/formulas-dimacs/false_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/false_t.cnf rename to test_files/writers/formulas-dimacs/false_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/false_t.map b/test_files/writers/formulas-dimacs/false_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/false_t.map rename to test_files/writers/formulas-dimacs/false_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/not_x_f.cnf b/test_files/writers/formulas-dimacs/not_x_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/not_x_f.cnf rename to test_files/writers/formulas-dimacs/not_x_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/not_x_t.cnf b/test_files/writers/formulas-dimacs/not_x_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/not_x_t.cnf rename to test_files/writers/formulas-dimacs/not_x_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/not_x_t.map b/test_files/writers/formulas-dimacs/not_x_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/not_x_t.map rename to test_files/writers/formulas-dimacs/not_x_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/true_f.cnf b/test_files/writers/formulas-dimacs/true_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/true_f.cnf rename to test_files/writers/formulas-dimacs/true_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/true_t.cnf b/test_files/writers/formulas-dimacs/true_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/true_t.cnf rename to test_files/writers/formulas-dimacs/true_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/true_t.map b/test_files/writers/formulas-dimacs/true_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/true_t.map rename to test_files/writers/formulas-dimacs/true_t.map diff --git a/core/src/test/resources/writers/formulas-dimacs/x_f.cnf b/test_files/writers/formulas-dimacs/x_f.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/x_f.cnf rename to test_files/writers/formulas-dimacs/x_f.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/x_t.cnf b/test_files/writers/formulas-dimacs/x_t.cnf similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/x_t.cnf rename to test_files/writers/formulas-dimacs/x_t.cnf diff --git a/core/src/test/resources/writers/formulas-dimacs/x_t.map b/test_files/writers/formulas-dimacs/x_t.map similarity index 100% rename from core/src/test/resources/writers/formulas-dimacs/x_t.map rename to test_files/writers/formulas-dimacs/x_t.map diff --git a/core/src/test/resources/writers/graph/30-dynamic.dot b/test_files/writers/graph/30-dynamic.dot similarity index 100% rename from core/src/test/resources/writers/graph/30-dynamic.dot rename to test_files/writers/graph/30-dynamic.dot diff --git a/core/src/test/resources/writers/graph/30-dynamic.txt b/test_files/writers/graph/30-dynamic.txt similarity index 100% rename from core/src/test/resources/writers/graph/30-dynamic.txt rename to test_files/writers/graph/30-dynamic.txt diff --git a/core/src/test/resources/writers/graph/30.dot b/test_files/writers/graph/30.dot similarity index 100% rename from core/src/test/resources/writers/graph/30.dot rename to test_files/writers/graph/30.dot diff --git a/core/src/test/resources/writers/graph/30.txt b/test_files/writers/graph/30.txt similarity index 100% rename from core/src/test/resources/writers/graph/30.txt rename to test_files/writers/graph/30.txt diff --git a/core/src/test/resources/writers/graph/50p1.dot b/test_files/writers/graph/50p1.dot similarity index 100% rename from core/src/test/resources/writers/graph/50p1.dot rename to test_files/writers/graph/50p1.dot diff --git a/core/src/test/resources/writers/graph/50p1.txt b/test_files/writers/graph/50p1.txt similarity index 100% rename from core/src/test/resources/writers/graph/50p1.txt rename to test_files/writers/graph/50p1.txt diff --git a/core/src/test/resources/writers/graph/small-fixedStyle.dot b/test_files/writers/graph/small-fixedStyle.dot similarity index 100% rename from core/src/test/resources/writers/graph/small-fixedStyle.dot rename to test_files/writers/graph/small-fixedStyle.dot diff --git a/core/src/test/resources/writers/graph/small-fixedStyle.txt b/test_files/writers/graph/small-fixedStyle.txt similarity index 100% rename from core/src/test/resources/writers/graph/small-fixedStyle.txt rename to test_files/writers/graph/small-fixedStyle.txt diff --git a/core/src/test/resources/writers/graph/small.dot b/test_files/writers/graph/small.dot similarity index 100% rename from core/src/test/resources/writers/graph/small.dot rename to test_files/writers/graph/small.dot diff --git a/core/src/test/resources/writers/graph/small.txt b/test_files/writers/graph/small.txt similarity index 100% rename from core/src/test/resources/writers/graph/small.txt rename to test_files/writers/graph/small.txt diff --git a/core/src/test/resources/writers/temp/.empty b/test_files/writers/temp/.empty similarity index 100% rename from core/src/test/resources/writers/temp/.empty rename to test_files/writers/temp/.empty