From 2bcdf4964e7c265067c5f20b0c1b5f93b22953ef Mon Sep 17 00:00:00 2001 From: Filipe Marques Date: Sat, 3 Aug 2024 11:20:44 +0200 Subject: [PATCH] Reorganise some stuff --- example/dune | 2 +- example/{test => in}/teste01.in | 0 example/{test => in}/teste02.in | 0 example/{test => in}/teste03.in | 0 example/{test => in}/teste04.in | 0 example/{test => in}/teste05.in | 0 example/{test => in}/teste06.in | 0 example/{test => in}/teste07.in | 0 example/{test => in}/teste08.in | 0 example/{test => in}/teste09.in | 0 example/{test => in}/teste10.in | 0 example/{test => in}/teste11.in | 0 example/{test => in}/teste12.in | 0 example/product_mix.t | 24 ++++++++++++------------ test/{ => solver}/dune | 0 test/{ => solver}/test_bitwuzla.expected | 0 test/solver/test_bitwuzla.ml | 10 ++++++++++ test/{ => solver}/test_bv.ml | 0 test/{ => solver}/test_colibri2.expected | 0 test/solver/test_colibri2.ml | 11 +++++++++++ test/{ => solver}/test_fp.ml | 0 test/{ => solver}/test_harness.ml | 0 test/{ => solver}/test_lia.ml | 0 test/{ => solver}/test_lra.ml | 0 test/{ => solver}/test_optimizer.ml | 0 test/{ => solver}/test_solver.ml | 0 test/{ => solver}/test_solver_params.ml | 0 test/{ => solver}/test_z3.expected | 0 test/solver/test_z3.ml | 14 ++++++++++++++ test/test_bitwuzla.ml | 9 --------- test/test_colibri2.ml | 10 ---------- test/test_z3.ml | 12 ------------ 32 files changed, 48 insertions(+), 44 deletions(-) rename example/{test => in}/teste01.in (100%) rename example/{test => in}/teste02.in (100%) rename example/{test => in}/teste03.in (100%) rename example/{test => in}/teste04.in (100%) rename example/{test => in}/teste05.in (100%) rename example/{test => in}/teste06.in (100%) rename example/{test => in}/teste07.in (100%) rename example/{test => in}/teste08.in (100%) rename example/{test => in}/teste09.in (100%) rename example/{test => in}/teste10.in (100%) rename example/{test => in}/teste11.in (100%) rename example/{test => in}/teste12.in (100%) rename test/{ => solver}/dune (100%) rename test/{ => solver}/test_bitwuzla.expected (100%) create mode 100644 test/solver/test_bitwuzla.ml rename test/{ => solver}/test_bv.ml (100%) rename test/{ => solver}/test_colibri2.expected (100%) create mode 100644 test/solver/test_colibri2.ml rename test/{ => solver}/test_fp.ml (100%) rename test/{ => solver}/test_harness.ml (100%) rename test/{ => solver}/test_lia.ml (100%) rename test/{ => solver}/test_lra.ml (100%) rename test/{ => solver}/test_optimizer.ml (100%) rename test/{ => solver}/test_solver.ml (100%) rename test/{ => solver}/test_solver_params.ml (100%) rename test/{ => solver}/test_z3.expected (100%) create mode 100644 test/solver/test_z3.ml delete mode 100644 test/test_bitwuzla.ml delete mode 100644 test/test_colibri2.ml delete mode 100644 test/test_z3.ml diff --git a/example/dune b/example/dune index 91da71b3..4ccaf85f 100644 --- a/example/dune +++ b/example/dune @@ -6,4 +6,4 @@ (enabled_if %{lib-available:z3}) (deps ./product_mix.exe - (source_tree test))) + (source_tree in))) diff --git a/example/test/teste01.in b/example/in/teste01.in similarity index 100% rename from example/test/teste01.in rename to example/in/teste01.in diff --git a/example/test/teste02.in b/example/in/teste02.in similarity index 100% rename from example/test/teste02.in rename to example/in/teste02.in diff --git a/example/test/teste03.in b/example/in/teste03.in similarity index 100% rename from example/test/teste03.in rename to example/in/teste03.in diff --git a/example/test/teste04.in b/example/in/teste04.in similarity index 100% rename from example/test/teste04.in rename to example/in/teste04.in diff --git a/example/test/teste05.in b/example/in/teste05.in similarity index 100% rename from example/test/teste05.in rename to example/in/teste05.in diff --git a/example/test/teste06.in b/example/in/teste06.in similarity index 100% rename from example/test/teste06.in rename to example/in/teste06.in diff --git a/example/test/teste07.in b/example/in/teste07.in similarity index 100% rename from example/test/teste07.in rename to example/in/teste07.in diff --git a/example/test/teste08.in b/example/in/teste08.in similarity index 100% rename from example/test/teste08.in rename to example/in/teste08.in diff --git a/example/test/teste09.in b/example/in/teste09.in similarity index 100% rename from example/test/teste09.in rename to example/in/teste09.in diff --git a/example/test/teste10.in b/example/in/teste10.in similarity index 100% rename from example/test/teste10.in rename to example/in/teste10.in diff --git a/example/test/teste11.in b/example/in/teste11.in similarity index 100% rename from example/test/teste11.in rename to example/in/teste11.in diff --git a/example/test/teste12.in b/example/in/teste12.in similarity index 100% rename from example/test/teste12.in rename to example/in/teste12.in diff --git a/example/product_mix.t b/example/product_mix.t index f237e1b2..59e8c3ea 100644 --- a/example/product_mix.t +++ b/example/product_mix.t @@ -1,25 +1,25 @@ Tests Product Mix: - $ ./product_mix.exe < test/teste01.in + $ ./product_mix.exe < in/teste01.in 6440 - $ ./product_mix.exe < test/teste02.in + $ ./product_mix.exe < in/teste02.in 750 - $ ./product_mix.exe < test/teste03.in + $ ./product_mix.exe < in/teste03.in 50 - $ ./product_mix.exe < test/teste04.in + $ ./product_mix.exe < in/teste04.in 60 - $ ./product_mix.exe < test/teste05.in + $ ./product_mix.exe < in/teste05.in 56 - $ ./product_mix.exe < test/teste06.in + $ ./product_mix.exe < in/teste06.in 55 - $ ./product_mix.exe < test/teste07.in + $ ./product_mix.exe < in/teste07.in 40 - $ ./product_mix.exe < test/teste08.in + $ ./product_mix.exe < in/teste08.in 60 - $ ./product_mix.exe < test/teste09.in + $ ./product_mix.exe < in/teste09.in 95 - $ ./product_mix.exe < test/teste10.in + $ ./product_mix.exe < in/teste10.in 215 - $ ./product_mix.exe < test/teste11.in + $ ./product_mix.exe < in/teste11.in 4204 - $ ./product_mix.exe < test/teste12.in + $ ./product_mix.exe < in/teste12.in 0 diff --git a/test/dune b/test/solver/dune similarity index 100% rename from test/dune rename to test/solver/dune diff --git a/test/test_bitwuzla.expected b/test/solver/test_bitwuzla.expected similarity index 100% rename from test/test_bitwuzla.expected rename to test/solver/test_bitwuzla.expected diff --git a/test/solver/test_bitwuzla.ml b/test/solver/test_bitwuzla.ml new file mode 100644 index 00000000..7b01fecb --- /dev/null +++ b/test/solver/test_bitwuzla.ml @@ -0,0 +1,10 @@ +open Smtml +open Smtml_tests + +let () = + assert Bitwuzla_mappings.is_available; + let module Test_solver_params = + Test_solver_params.Make (Bitwuzla_mappings.Fresh.Make ()) in + let module Test_bv = Test_bv.Make (Bitwuzla_mappings) in + let module Test_fp = Test_fp.Make (Bitwuzla_mappings) in + () diff --git a/test/test_bv.ml b/test/solver/test_bv.ml similarity index 100% rename from test/test_bv.ml rename to test/solver/test_bv.ml diff --git a/test/test_colibri2.expected b/test/solver/test_colibri2.expected similarity index 100% rename from test/test_colibri2.expected rename to test/solver/test_colibri2.expected diff --git a/test/solver/test_colibri2.ml b/test/solver/test_colibri2.ml new file mode 100644 index 00000000..73ad0b3c --- /dev/null +++ b/test/solver/test_colibri2.ml @@ -0,0 +1,11 @@ +open Smtml +open Smtml_tests + +let () = + assert Colibri2_mappings.is_available; + let module Test_solver_params = Test_solver_params.Make (Colibri2_mappings) in + let module Test_solver = Test_solver.Make (Colibri2_mappings) in + let module Test_bv = Test_bv.Make (Colibri2_mappings) in + let module Test_fp = Test_fp.Make (Colibri2_mappings) in + let module Test_lia = Test_lia.Make (Colibri2_mappings) in + () diff --git a/test/test_fp.ml b/test/solver/test_fp.ml similarity index 100% rename from test/test_fp.ml rename to test/solver/test_fp.ml diff --git a/test/test_harness.ml b/test/solver/test_harness.ml similarity index 100% rename from test/test_harness.ml rename to test/solver/test_harness.ml diff --git a/test/test_lia.ml b/test/solver/test_lia.ml similarity index 100% rename from test/test_lia.ml rename to test/solver/test_lia.ml diff --git a/test/test_lra.ml b/test/solver/test_lra.ml similarity index 100% rename from test/test_lra.ml rename to test/solver/test_lra.ml diff --git a/test/test_optimizer.ml b/test/solver/test_optimizer.ml similarity index 100% rename from test/test_optimizer.ml rename to test/solver/test_optimizer.ml diff --git a/test/test_solver.ml b/test/solver/test_solver.ml similarity index 100% rename from test/test_solver.ml rename to test/solver/test_solver.ml diff --git a/test/test_solver_params.ml b/test/solver/test_solver_params.ml similarity index 100% rename from test/test_solver_params.ml rename to test/solver/test_solver_params.ml diff --git a/test/test_z3.expected b/test/solver/test_z3.expected similarity index 100% rename from test/test_z3.expected rename to test/solver/test_z3.expected diff --git a/test/solver/test_z3.ml b/test/solver/test_z3.ml new file mode 100644 index 00000000..8b03ba26 --- /dev/null +++ b/test/solver/test_z3.ml @@ -0,0 +1,14 @@ +open Smtml +open Smtml_tests + +let () = + assert Z3_mappings.is_available; + let module Test_solver_params = + Test_solver_params.Make (Z3_mappings.Fresh.Make ()) in + let module Test_solver = Test_solver.Make (Z3_mappings.Fresh.Make ()) in + let module Test_optimizer = Test_optimizer.Make (Z3_mappings.Fresh.Make ()) in + let module Test_bv = Test_bv.Make (Z3_mappings.Fresh.Make ()) in + let module Test_fp = Test_fp.Make (Z3_mappings.Fresh.Make ()) in + let module Test_lia = Test_lia.Make (Z3_mappings.Fresh.Make ()) in + let module Test_lra = Test_lra.Make (Z3_mappings.Fresh.Make ()) in + () diff --git a/test/test_bitwuzla.ml b/test/test_bitwuzla.ml deleted file mode 100644 index 4331f70a..00000000 --- a/test/test_bitwuzla.ml +++ /dev/null @@ -1,9 +0,0 @@ -open Smtml -open Smtml_tests - -let () = assert Bitwuzla_mappings.is_available - -module Test_solver_params = - Test_solver_params.Make (Bitwuzla_mappings.Fresh.Make ()) -module Test_bv = Test_bv.Make (Bitwuzla_mappings) -module Test_fp = Test_fp.Make (Bitwuzla_mappings) diff --git a/test/test_colibri2.ml b/test/test_colibri2.ml deleted file mode 100644 index 1c95befc..00000000 --- a/test/test_colibri2.ml +++ /dev/null @@ -1,10 +0,0 @@ -open Smtml -open Smtml_tests - -let () = assert Colibri2_mappings.is_available - -module Test_solver_params = Test_solver_params.Make (Colibri2_mappings) -module Test_solver = Test_solver.Make (Colibri2_mappings) -module Test_bv = Test_bv.Make (Colibri2_mappings) -module Test_fp = Test_fp.Make (Colibri2_mappings) -module Test_lia = Test_lia.Make (Colibri2_mappings) diff --git a/test/test_z3.ml b/test/test_z3.ml deleted file mode 100644 index 4de68842..00000000 --- a/test/test_z3.ml +++ /dev/null @@ -1,12 +0,0 @@ -open Smtml -open Smtml_tests - -let () = assert Z3_mappings.is_available - -module Test_solver_params = Test_solver_params.Make (Z3_mappings.Fresh.Make ()) -module Test_solver = Test_solver.Make (Z3_mappings.Fresh.Make ()) -module Test_optimizer = Test_optimizer.Make (Z3_mappings.Fresh.Make ()) -module Test_bv = Test_bv.Make (Z3_mappings.Fresh.Make ()) -module Test_fp = Test_fp.Make (Z3_mappings.Fresh.Make ()) -module Test_lia = Test_lia.Make (Z3_mappings.Fresh.Make ()) -module Test_lra = Test_lra.Make (Z3_mappings.Fresh.Make ())