From f4f2fc5b2b5a6545e8da2e123221ac7e3fbe2ed3 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Wed, 18 Nov 2026 19:03:37 +1100 Subject: [PATCH 01/13] Add float performance benchmarks --- DEVELOPMENT.md | 34 +++++++++++++++++++++++ tests/performance/float/addition.lp | 4 +++ tests/performance/float/cancellation.lp | 5 ++++ tests/performance/float/comparisons.lp | 8 ++++++ tests/performance/float/division.lp | 6 ++++ tests/performance/float/input.lp | 9 ++++++ tests/performance/float/multiplication.lp | 4 +++ tests/performance/float/sqrt.lp | 6 ++++ tests/performance/float/trigonometry.lp | 9 ++++++ tests/test_performance_engines.py | 29 +++++++++++++++++-- 10 files changed, 112 insertions(+), 2 deletions(-) create mode 100644 tests/performance/float/addition.lp create mode 100644 tests/performance/float/cancellation.lp create mode 100644 tests/performance/float/comparisons.lp create mode 100644 tests/performance/float/division.lp create mode 100644 tests/performance/float/input.lp create mode 100644 tests/performance/float/multiplication.lp create mode 100644 tests/performance/float/sqrt.lp create mode 100644 tests/performance/float/trigonometry.lp diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 1256d709..404a8c03 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -75,6 +75,40 @@ runs may exceed the average when the overall mean still passes. The default `nox -s test` session excludes `performance` tests so the normal test matrix stays practical. +### Float Computation Benchmarks + +The ASP programs under `tests/performance/float/` cover addition chains, +integer and fractional multiplication, equality and ordering near a small +separation, cancellation after adding a large offset, division with +multiplicative recovery, square root with squaring, and sine/cosine with the +sum of their squares. A shared three-value +input domain includes negative, exact dyadic, and repeating-fraction inputs. +The workloads have three models regardless of size and expose `value/2`. + +Each workload runs at sizes 16 and 64 with `compile`, `compile2`, `fch`, +`ground`, `propagator`, and `propagator_check`. +FCH trigonometry cases are skipped because its native operator set lacks +`sin` and `cos`. +Timings include control setup, loading, grounding, and solving, using one +warmup and three measured runs. The 30-second mean limit is a generous safety +ceiling for comparing implementations, rather than a calibrated baseline. + +```bash +# capture all float benchmarks +nox -s performance -- -k 'float/' + +# capture only FCH float benchmarks +nox -s performance -- -k 'fch and float/' + +# smoke-run the workloads once each, without timing repetitions +nox -Rs test -- tests/test_performance_engines.py -m performance -k 'float/' --benchmark-disable +``` + +Use the same workload sizes and engine selection when comparing saved runs +with `nox -s benchmark_compare`. Engine and workload constants are recorded in +the benchmark metadata. Additional representations can use these same ASP +inputs through their engine implementations. + ## Expectation Fixtures Encoding tests pair a program named `[name].lp` with optional expectation files diff --git a/tests/performance/float/addition.lp b/tests/performance/float/addition.lp new file mode 100644 index 00000000..d4e41e46 --- /dev/null +++ b/tests/performance/float/addition.lp @@ -0,0 +1,4 @@ +#include "input.lp". + +variable_define(result(0),variable(input)). +variable_define(result(I),operation(add,(variable(result(I-1)),(val(float,float("0.125")),())))) :- step(I). \ No newline at end of file diff --git a/tests/performance/float/cancellation.lp b/tests/performance/float/cancellation.lp new file mode 100644 index 00000000..cdd33ca1 --- /dev/null +++ b/tests/performance/float/cancellation.lp @@ -0,0 +1,5 @@ +#include "input.lp". + +variable_define(result(0),variable(input)). +variable_define(shifted(I),operation(add,(variable(result(I-1)),(val(int,1048576),())))) :- step(I). +variable_define(result(I),operation(sub,(variable(shifted(I)),(val(int,1048576),())))) :- step(I). \ No newline at end of file diff --git a/tests/performance/float/comparisons.lp b/tests/performance/float/comparisons.lp new file mode 100644 index 00000000..1c7b4083 --- /dev/null +++ b/tests/performance/float/comparisons.lp @@ -0,0 +1,8 @@ +#include "input.lp". + +variable_define(result(Operator,Index),operation(Operator,(Left,(Right,())))) :- + step(Index), Operator = (eq;neq;lt;leq;gt;geq), + Left = operation(add,(variable(input),(val(int,Index),()))), + Right = operation(add,(Left,(val(float,float("0.000000001")),()))). +variable_define(equal(Index),operation(eq,(Operand,(Operand,())))) :- + step(Index), Operand = operation(add,(variable(input),(val(int,Index),()))). \ No newline at end of file diff --git a/tests/performance/float/division.lp b/tests/performance/float/division.lp new file mode 100644 index 00000000..e067985f --- /dev/null +++ b/tests/performance/float/division.lp @@ -0,0 +1,6 @@ +#include "input.lp". + +variable_define(recovered(Index),operation(mult,(Quotient,(val(int,30),())))) :- + step(Index), + Numerator = operation(add,(variable(input),(val(int,Index),()))), + Quotient = operation(float_div,(Numerator,(val(int,30),()))). \ No newline at end of file diff --git a/tests/performance/float/input.lp b/tests/performance/float/input.lp new file mode 100644 index 00000000..204164e4 --- /dev/null +++ b/tests/performance/float/input.lp @@ -0,0 +1,9 @@ +#const size = 64. + +step(1..size). +variable_declare(input,fromFacts). +variable_domain(input,val(float,float("-0.75"))). +variable_domain(input,val(float,float("0.9666666666666667"))). +variable_domain(input,val(float,float("1.25"))). + +#show value/2. \ No newline at end of file diff --git a/tests/performance/float/multiplication.lp b/tests/performance/float/multiplication.lp new file mode 100644 index 00000000..d7f6f915 --- /dev/null +++ b/tests/performance/float/multiplication.lp @@ -0,0 +1,4 @@ +#include "input.lp". + +variable_define(fractional(Index),operation(mult,(Product,(val(float,float("1.125")),())))) :- + step(Index), Product = operation(mult,(variable(input),(val(int,Index),()))). \ No newline at end of file diff --git a/tests/performance/float/sqrt.lp b/tests/performance/float/sqrt.lp new file mode 100644 index 00000000..8a535a6a --- /dev/null +++ b/tests/performance/float/sqrt.lp @@ -0,0 +1,6 @@ +#include "input.lp". + +variable_define(squared(Index),operation(mult,(Root,(Root,())))) :- + step(Index), + Argument = operation(add,(variable(input),(val(int,Index),()))), + Root = operation(sqrt,(Argument,())). \ No newline at end of file diff --git a/tests/performance/float/trigonometry.lp b/tests/performance/float/trigonometry.lp new file mode 100644 index 00000000..6927b745 --- /dev/null +++ b/tests/performance/float/trigonometry.lp @@ -0,0 +1,9 @@ +#include "input.lp". + +variable_define(result(Index),operation(add,(SineSquared,(CosineSquared,())))) :- + step(Index), + Angle = operation(add,(variable(input),(val(int,Index),()))), + Sine = operation(sin,(Angle,())), + Cosine = operation(cos,(Angle,())), + SineSquared = operation(mult,(Sine,(Sine,()))), + CosineSquared = operation(mult,(Cosine,(Cosine,()))). \ No newline at end of file diff --git a/tests/test_performance_engines.py b/tests/test_performance_engines.py index 17303e6e..1e02f004 100644 --- a/tests/test_performance_engines.py +++ b/tests/test_performance_engines.py @@ -6,7 +6,7 @@ import pytest import constraint_handler -from constraint_handler.engine import Engine, compile, ground, propagator, propagator_check +from constraint_handler.engine import Engine, compile, compile2, fch, ground, propagator, propagator_check ctrl_options = ["1000", "--heuristic=Domain"] performance_examples_dir = Path("tests/performance") @@ -19,10 +19,11 @@ class PerformanceBenchmark: measured_runs: int = 1 warmup_runs: int = 0 constants: dict[str, int] | None = None + program_name: str | None = None @property def program_path(self) -> str: - return performance_examples_dir / f"{self.name}.lp" + return performance_examples_dir / f"{self.program_name or self.name}.lp" def run_benchmark_program(benchmark_case: PerformanceBenchmark, engine: Engine) -> None: @@ -97,11 +98,35 @@ def benchmark_param(benchmark_case: PerformanceBenchmark, engine: Engine, marks: PerformanceBenchmark("assignment_chain", 5.0, constants={"chain_length": 200}), ] +float_benchmarks = [ + PerformanceBenchmark( + f"float/{name}-{size}", + 30.0, + measured_runs=3, + warmup_runs=1, + constants={"size": size}, + program_name=f"float/{name}", + ) + for name in ("addition", "cancellation", "comparisons", "division", "multiplication", "sqrt", "trigonometry") + for size in (16, 64) +] + all_benchmarks = ( [benchmark_param(benchmark_case, compile) for benchmark_case in compile_benchmarks] + [benchmark_param(benchmark_case, ground) for benchmark_case in ground_benchmarks] + [benchmark_param(benchmark_case, propagator_check) for benchmark_case in propagator_check_benchmarks] + [benchmark_param(benchmark_case, propagator) for benchmark_case in propagator_solve_benchmarks] + + [ + benchmark_param( + benchmark_case, + engine, + marks=(pytest.mark.skip(reason="FCH does not support native sin/cos operators"),) + if engine == fch and benchmark_case.program_name == "float/trigonometry" + else (), + ) + for engine in (compile, compile2, fch, ground, propagator, propagator_check) + for benchmark_case in float_benchmarks + ] + [ benchmark_param( PerformanceBenchmark("large_int_domain", 300.0, constants={"int_domain_size": 3000}), From 0e7ea9144aa113141d8cb661ba4df9772ac9da48 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Thu, 19 Nov 2026 15:24:01 +1100 Subject: [PATCH 02/13] Add tight and choices to .expected.stats format --- CHANGES.md | 1 + DEVELOPMENT.md | 7 +- tests/flat_ch/test_correctness.py | 12 +- tests/test_encoding.py | 288 +----------------------------- tests/utils/testing.py | 37 ++-- 5 files changed, 38 insertions(+), 307 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index c7e268c4..0349da78 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,7 @@ ## Ongoing +- introduce fields `tight` and `choices` to `.expected.stats` format and simplify the testing framework usage - add `variable_declared(X)` output for user-facing variables with an active declaration. - add `variable_defined(X)` output for user-facing variables with a non-`bad` diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 404a8c03..2e2b4d79 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -135,8 +135,11 @@ The supported suffixes are: enumeration mode. - `optall`, `optany`, and `optnone`: atom must occur in every, any, or no optimal model respectively. -- `stats`: one `key=value` entry per line. `models=` asserts the exact - number of models. +- `stats`: one `key=value` entry per line. All keys are optional. + `models=` asserts the exact number of models. `tight=true` asserts zero + strongly connected components, and `tight=false` asserts at least one. `choices=false` + asserts zero solver choices, and `choices=true` asserts at least one. + Boolean values are lowercase `true` or `false`; omitted fields are unchecked. `all`, `none`, `first`, `last`, `optall`, and `optnone` implicitly also require at least one model unless an `any`, `brave`, `cautious`, or `optany` diff --git a/tests/flat_ch/test_correctness.py b/tests/flat_ch/test_correctness.py index 1cabe8ce..04c9479e 100644 --- a/tests/flat_ch/test_correctness.py +++ b/tests/flat_ch/test_correctness.py @@ -279,8 +279,8 @@ def generate_flat_ch_files() -> None: flat_ch_supported_non_core_tests = [name for name in flat_ch_supported_tests if not name.startswith("core/")] -def solve_with_flat_ch(name: str, test, extra_args: list[str]): - ctl = clingo.Control([*ctrl_options, *extra_args]) +def solve_with_flat_ch(name: str, test, extra_args: list[str], expected_stats: dict[str, str] = {}): + ctl = clingo.Control([*ctrl_options, *extra_args, "--stats=2"]) add_to_control(ctl, {}, engine=fch) if name.startswith("tests/correctness/optimization/"): ctl.add("base", [], "_fch_enable_optimize_value_output.") @@ -288,7 +288,7 @@ def solve_with_flat_ch(name: str, test, extra_args: list[str]): ctl.load(name + ".lp") ctl.ground() - if not test.outcome().is_certain(): + if not test.outcome().is_certain() or expected_stats: ctl.solve( on_core=test.on_core, on_finish=test.on_finish, @@ -296,12 +296,14 @@ def solve_with_flat_ch(name: str, test, extra_args: list[str]): on_unsat=test.on_unsat, on_statistics=test.on_statistics, ) + chut.assert_statistics(ctl.statistics, expected_stats) def run_test(name: str): file_name = "tests/correctness/" + name - for test, extra_args in chut.build_expectations(file_name): - solve_with_flat_ch(file_name, test, extra_args) + expectations, expected_stats = chut.build_expectations(file_name) + for test, extra_args in expectations: + solve_with_flat_ch(file_name, test, extra_args, expected_stats if not extra_args else {}) test.assert_() diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 1de9b9ba..3356f07e 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -1,4 +1,3 @@ -import clingo import pytest import constraint_handler @@ -10,26 +9,14 @@ ctrl_options = ["0", "--heuristic=Domain"] -def solve_with_clingo_statistics(name: str, selected_engine: engine.Engine = engine.compile) -> dict: - ctl = clingo.Control(["--stats=2"]) - constraint_handler.add_to_control(ctl, engine=selected_engine) - ctl.load(f"tests/correctness/{name}.lp") - ctl.ground() - - result = ctl.solve() - assert result.satisfiable - - return ctl.statistics - - def run_test(name: str, selected_engine: engine.Engine): name = "tests/correctness/" + name - expectations = chut.build_expectations(name) + expectations, expected_stats = chut.build_expectations(name) assert expectations, f"Missing expectations: {name}" for test, extra_args in expectations: options = ctrl_options + extra_args solver = chut.Solver(options, files=[name + ".lp"], engine=selected_engine) - solver.solve(test) + solver.solve(test, expected_stats if not extra_args else {}) test.assert_() @@ -776,274 +763,3 @@ def param_marks( ) def test_engine(name: str, selected_engine: engine.Engine): run_test(name, selected_engine) - - -choice_statistics_skip: set[str] = { - "core/bool_evaluate/basic", - "core/bool_evaluate/forbidden", - "core/boolean_shortcut_optional_presence", - "core/check", - "core/conditional_declare", - "core/conditional_declare_definition", - "core/conditional_declare_domain", - "core/conditional_declare_empty_domain", - "core/conditional_declare_set", - "core/conditional_declare_set_multiple", - "core/conditional_definitions", - "core/empty_set_execution", - "core/evaluate_dynamic", - "core/optional_set_empty_execution", - "core/python_set_bool_brave", - "core/set_interface_value_marker", - "core/shared_optional_output_domains", - "core/unprojected_optional_equality", - "core/variable/defined", - "datatype/bool/conj_disj/none", - "datatype/bool/conj_disj/variable", - "datatype/bool/leqv_lxor/none", - "datatype/bool/leqv_lxor/variable", - "datatype/bool/negation/variable", - "datatype/conditional/if/variable", - "datatype/conditional/orElse/variable", - "datatype/float/abs/variable", - "datatype/float/add/variable", - "datatype/float/ceil_floor/variable", - "datatype/float/float_div/zero_divisor", - "datatype/float/int_div/zero_divisor", - "datatype/float/mult/variable", - "datatype/float/mod/variable", - "datatype/float/pow/variable", - "datatype/float/sqrt/variable", - "datatype/float/sub/variable", - "datatype/int/abs/variable", - "datatype/int/add/nary", - "datatype/int/add/variable", - "datatype/int/int_div/variable", - "datatype/int/minus/variable", - "datatype/int/mod/variable", - "datatype/int/mult/nary", - "datatype/int/mult/variable", - "datatype/int/pow/variable", - "datatype/int/sub/variable", - "datatype/string/concat/variable", - "datatype/string/length/bad", - "datatype/string/length/variable", - "datatype/string/order/variable", - "datatype/string/mixed", - "default/define/condition", - "default/define/disabled", - "default/define/single", - "default/define/with_domain_unsat", - "default/define/with_domain", - "default/depends/condition", - "default/depends/disabled", - "default/depends/single", - "default/depends/with_domain", - "default/depends/with_domain_bydepends", - "error/recovery_check", - "execution/conditional_string_equality_single_model", - "execution/python_integrity_should_be_ignored", - "execution/python_syntax_error_return", - "execution/python_syntax_error_through", - "execution/python_syntax_error", - "execution/run_condition", - "execution/warning_spurious", - "execution/warning_spurious2", - "expression/python_extract/dynamic", - "expression/python_extract/succeeds", - "multimap/conditional_assign", - "optimization/label_int", - "optimization/label_string", - "optimization/optional_absent_linked_value", - "set/conditional_assign", - "set/conditional_assign_dynamic", - "set/conditional_base_domain", - "python/dynamic", - "type/bool/has_value", - "type/warning/python", - "type/warning/type", - "unit/bad/bad_eq", - "unit/bad/bad_float_div", - "unit/bad/bad_geq", - "unit/bad/bad_gt", - "unit/bad/bad_leq", - "unit/bad/bad_lt", - "unit/bad/bad_max", - "unit/bad/bad_min", - "unit/bad/bad_neq", - "unit/boolean/boolean_default", - "unit/boolean/boolean_if", - "unit/boolean/boolean_ite", - "unit/boolean/boolean_limp", - "unit/boolean/boolean_limp_none_bug", - "unit/equality_eq", - "unit/equality_neq", - "unit/float/float_eq", - "unit/float/float_float_div", - "unit/float/float_geq", - "unit/float/float_gt", - "unit/float/float_int_div", - "unit/float/float_leq", - "unit/float/float_lt", - "unit/float/float_max", - "unit/float/float_min", - "unit/float/float_neq", - "unit/int/int_geq", - "unit/int/int_gt", - "unit/int/int_leq", - "unit/int/int_lt", - "unit/int/int_max", - "unit/int/int_min", - "unit/nullary/python_python", - "unit/nullary/python_pythonExtract", - "unit/python_python", - "unit/python_pythonExtract", - "unit/set/set_diff", - "unit/set/set_eq", - "unit/set/set_inter", - "unit/set/set_neq", - "unit/set/set_set_isin", - "unit/set/set_set_make", - "unit/set/set_set_notin", - "unit/set/set_subset", - "unit/set/set_union", - "unit/symbol/symbol_geq", - "unit/symbol/symbol_gt", - "unit/symbol/symbol_leq", - "unit/symbol/symbol_lt", - "unit/tuple_eq", - "unit/tuple_neq", - "unit/unary/bad_hasValue", - "unit/unary/bad_length", - "unit/unary/bad_lnot", - "unit/unary/bad_snot", - "unit/unary/bad_wnot", - "unit/unary/boolean_hasValue", - "unit/unary/boolean_lnot", - "unit/unary/boolean_snot", - "unit/unary/boolean_wnot", - "unit/unary/float_minus", - "unit/unary/set_length", - "warning/forbid_labeled_match", - "warning/mutually_exclusive_declarations", - "warning/python_extract/statement_error", - "warning/raise/controls", - "warning/raise/dynamic", -} -choice_statistics_xfail: set[str] = { - "core/conditional_assign", - "core/integrity", - "core/reasoning_modes", - "core/reasoning_modes_sets", - "core/reasoning_modes_with_show", - "datatype/bool/derived_relations", - "datatype/bool/equivalence_bad", - "datatype/bool/implication_bad", - "error/recovery_ensure", - "execution/assert", - "execution/change", - "execution/conditional", - "execution/main_absolut", - "execution/main_swap", - "execution/optional_run", - "execution/python_integrity", - "expression/bad_equality", - "optimization/multimap_bool", - "optimization/multimap_float", - "optimization/multimap_float_precision", - "optimization/multimap_int", - "optimization/multimap_labeled_values", - "optimization/no_multimap_bool", - "optimization/no_multimap_float", - "optimization/no_multimap_float_precision", - "optimization/no_multimap_int", - "optimization/no_multimap_labeled_values", - "optimization/preferences", - "optimization/priority", - "set/diff_flat", - "set/eq_neq_flat", - "set/from_domain", - "set/inter_flat", - "set/length_flat", - "set/membership_decomposed", - "set/membership_python", - "set/nondet_simple", - "set/overapprox_boundaries", - "set/same_val_multi_expr", - "set/selfref", - "set/set_in_set_notin", - "set/set_make_flat", - "set/subset_flat", - "set/union_flat", - "type/checking/invalid", - "type/checking/membership_set_polymorphic", - "type/checking/regression_guards", - "type/multimap/membership", - "type/python_extract/non_deterministic_python_type_inference", - "type/statement_python/nondeterministic_inference", - "type/statement_python/unknown_vs_untyped_nondeterministic", - "variable/dynamic_type", - "variable/flexible_domain", - "variable/main", - "variable/parallel_declaration", - "variable/same_val_multi_expr", - "warning/bad", - "warning/fake_forbid", - "warning/ignore_labeled", - "warning/variable/reserved_name", - "warning/variable/undeclared", - "warning/variables", -} - - -@pytest.mark.parametrize( - "name", - [ - pytest.param( - name, - marks=param_marks(name, choice_statistics_skip, choice_statistics_xfail, "compile statistics choices"), - ) - for name in base_tests - ], -) -def test_compile_statistics_have_zero_choices(name: str): - statistics = solve_with_clingo_statistics(name) - assert statistics["solving"]["solvers"]["choices"] == 0.0 - - -tightness_statistics_skip: set[str] = { - "core/python_set_bool_brave", - "default/define/with_domain_unsat", - "default/depends/single", - "default/depends/with_domain_bydepends", - "warning/forbid_labeled_match", -} -tightness_statistics_xfail: set[str] = { - "default/define/single", - "execution/python_syntax_error", - "execution/warning_spurious", - "optimization/multimap_bool", - "optimization/multimap_float", - "optimization/multimap_float_precision", - "optimization/multimap_int", - "optimization/multimap_labeled_values", - "optimization/priority", - "variable/dynamic_type", -} - - -@pytest.mark.parametrize( - "name", - [ - pytest.param( - name, - marks=param_marks( - name, tightness_statistics_skip, tightness_statistics_xfail, "compile statistics tightness" - ), - ) - for name in base_tests - ], -) -def test_compile_statistics_are_tight(name: str): - statistics = solve_with_clingo_statistics(name) - assert statistics["problem"]["lp"]["sccs"] == 0.0 diff --git a/tests/utils/testing.py b/tests/utils/testing.py index 875c6a61..0f6ea76f 100644 --- a/tests/utils/testing.py +++ b/tests/utils/testing.py @@ -44,7 +44,7 @@ def absent(atom): return clintest.assertion.Not(clintest.assertion.Or(clintest.assertion.Contains(atom), TheoryContains(atom))) -def build_expectations(name) -> list[tuple[clintest.test.Test, list[str]]]: +def build_expectations(name) -> tuple[list[tuple[clintest.test.Test, list[str]]], dict[str, str]]: name = name + ".expected." tests = [] @@ -74,7 +74,7 @@ def build_expectations(name) -> list[tuple[clintest.test.Test, list[str]]]: if satisfiability_implicit and not satisfiability_asserted: test_noargs.append(satisfiable) - if test_noargs: + if test_noargs or expected_stats.keys() & {"tight", "choices"}: tests.append((clintest.test.And(*test_noargs), [])) test_brave = [clintest.test.Assert(Last(), contains(atom)) for atom in atoms_from_file(name + "brave")] @@ -95,7 +95,7 @@ def build_expectations(name) -> list[tuple[clintest.test.Test, list[str]]]: if test_optimize: tests.append((clintest.test.And(*test_optimize), ["--opt-mode=optN"])) - return tests + return tests, expected_stats class TheoryContains(clintest.assertion.Assertion): @@ -147,6 +147,15 @@ def outcome(self) -> Outcome: return self.__quantifier.outcome() +def assert_statistics(statistics: dict, expected: dict[str, str]) -> None: + if "tight" in expected: + actual = statistics["problem"]["lp"]["sccs"] == 0.0 + assert actual == (expected["tight"] == "true"), f"tight: expected {expected['tight']}, got {actual}" + if "choices" in expected: + actual = statistics["solving"]["solvers"]["choices"] > 0.0 + assert actual == (expected["choices"] == "true"), f"choices: expected {expected['choices']}, got {actual}" + + class Solver(clintest.solver.Solver): def __init__( self, @@ -160,11 +169,11 @@ def __init__( self.__files = [] if files is None else files self.__engine = engine - def solve(self, test: clintest.test.Test) -> None: - if test.outcome().is_certain(): + def solve(self, test: clintest.test.Test, expected_stats: dict[str, str] = {}) -> None: + if test.outcome().is_certain() and not expected_stats: return - ctl = clingo.Control(self.__arguments) + ctl = clingo.Control([*self.__arguments, "--stats=2"]) constraint_handler.add_to_control(ctl, engine=self.__engine) ctl.add(self.__program) @@ -173,14 +182,14 @@ def solve(self, test: clintest.test.Test) -> None: ctl.load(file_name) ctl.ground() - if not test.outcome().is_certain(): - ctl.solve( - on_core=test.on_core, - on_finish=test.on_finish, - on_model=test.on_model, - on_unsat=test.on_unsat, - on_statistics=test.on_statistics, - ) + ctl.solve( + on_core=test.on_core, + on_finish=test.on_finish, + on_model=test.on_model, + on_unsat=test.on_unsat, + on_statistics=test.on_statistics, + ) + assert_statistics(ctl.statistics, expected_stats) def __repr__(self): name = self.__class__.__name__ From 43e9d94b9437912fd019b056b212385662459626 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Thu, 19 Nov 2026 15:28:17 +1100 Subject: [PATCH 03/13] Update .stats files in the test suite to use tight and choices fields --- CHANGES.md | 3 +- DEVELOPMENT.md | 34 +++++++++---------- .../core/basic_assignments.expected.stats | 2 ++ .../core/bool_evaluate/basic.expected.stats | 1 + .../bool_evaluate/forbidden.expected.stats | 1 + .../bool_evaluate/immediate.expected.stats | 2 ++ .../bool_evaluate/inconsistent.expected.stats | 2 ++ .../bool_evaluate/internal.expected.stats | 2 ++ ..._shortcut_optional_presence.expected.stats | 1 + tests/correctness/core/check.expected.stats | 1 + .../core/conditional_assign.expected.stats | 1 + .../core/conditional_declare.expected.stats | 1 + ...ditional_declare_definition.expected.stats | 1 + .../conditional_declare_domain.expected.stats | 1 + ...tional_declare_empty_domain.expected.stats | 1 + ...nal_declare_inactive_domain.expected.stats | 2 ++ .../conditional_declare_set.expected.stats | 1 + ...tional_declare_set_multiple.expected.stats | 1 + .../core/conditional_define.expected.stats | 2 ++ .../conditional_definitions.expected.stats | 1 + .../core/conditional_domain.expected.stats | 2 ++ ...itional_domain_shared_entry.expected.stats | 2 ++ .../conj_bad_none_recovery.expected.stats | 2 ++ .../core/custom_globals.expected.stats | 2 ++ .../core/empty_set_execution.expected.stats | 1 + .../core/empty_variadics.expected.stats | 2 ++ tests/correctness/core/ensure.expected.stats | 2 ++ .../core/evaluate_dynamic.expected.stats | 1 + .../correctness/core/integrity.expected.stats | 1 + ...bsent_comparison_evaluation.expected.stats | 2 ++ ...tring_comparison_evaluation.expected.stats | 2 ++ .../core/reasoning_modes.expected.stats | 1 + .../core/reasoning_modes_sets.expected.stats | 1 + .../reasoning_modes_with_show.expected.stats | 1 + .../set_execution_input_alias.expected.stats | 2 ++ .../set_interface_value_marker.expected.stats | 1 + .../core/set_to_variable.expected.stats | 2 ++ ...red_optional_output_domains.expected.stats | 1 + ...projected_optional_equality.expected.stats | 1 + .../bool/conj_disj/bad.expected.stats | 2 ++ .../bool/conj_disj/basic.expected.stats | 2 ++ .../bool/conj_disj/mixed.expected.stats | 2 ++ .../bool/conj_disj/none.expected.stats | 1 + .../bool/conj_disj/variable.expected.stats | 1 + .../bool/conj_disj/variadic.expected.stats | 2 ++ .../bool/derived_relations.expected.stats | 1 + .../bool/equivalence_bad.expected.stats | 1 + .../bool/implication_bad.expected.stats | 1 + .../bool/leqv_lxor/bad.expected.stats | 2 ++ .../bool/leqv_lxor/leqv_basic.expected.stats | 2 ++ .../bool/leqv_lxor/lxor_basic.expected.stats | 2 ++ .../bool/leqv_lxor/none.expected.stats | 1 + .../bool/leqv_lxor/variable.expected.stats | 1 + .../bool/leqv_lxor/variadic.expected.stats | 2 ++ .../bool/negation/logical_bad.expected.stats | 2 ++ .../negation/logical_basic.expected.stats | 2 ++ .../bool/negation/logical_none.expected.stats | 2 ++ .../bool/negation/strong_bad.expected.stats | 2 ++ .../bool/negation/strong_basic.expected.stats | 2 ++ .../bool/negation/strong_none.expected.stats | 2 ++ .../bool/negation/variable.expected.stats | 1 + .../bool/negation/weak_bad.expected.stats | 2 ++ .../bool/negation/weak_basic.expected.stats | 2 ++ .../bool/negation/weak_none.expected.stats | 2 ++ .../datatype/casting.expected.stats | 2 ++ .../conditional/if/bad.expected.stats | 2 ++ .../conditional/if/basic.expected.stats | 2 ++ .../conditional/if/recovery.expected.stats | 2 ++ .../conditional/if/variable.expected.stats | 1 + .../conditional/orElse/bad.expected.stats | 2 ++ .../conditional/orElse/basic.expected.stats | 2 ++ .../orElse/recovery.expected.stats | 2 ++ .../orElse/variable.expected.stats | 1 + .../datatype/float/abs/basic.expected.stats | 2 ++ .../float/abs/variable.expected.stats | 1 + .../datatype/float/add/bad.expected.stats | 2 ++ .../datatype/float/add/basic.expected.stats | 2 ++ .../datatype/float/add/mixed.expected.stats | 2 ++ .../datatype/float/add/none.expected.stats | 2 ++ .../float/add/variable.expected.stats | 1 + .../float/add/variadic.expected.stats | 2 ++ .../float/ceil_floor/bad.expected.stats | 2 ++ .../float/ceil_floor/basic.expected.stats | 2 ++ .../float/ceil_floor/mixed.expected.stats | 2 ++ .../float/ceil_floor/none.expected.stats | 2 ++ .../float/ceil_floor/variable.expected.stats | 1 + .../datatype/float/division.expected.stats | 2 ++ .../float/division_with_int.expected.stats | 2 ++ .../float/equality_basic.expected.stats | 2 ++ .../float/equality_cross_type.expected.stats | 2 ++ .../datatype/float/extrema.expected.stats | 2 ++ .../float_div/zero_divisor.expected.stats | 1 + .../float/int_div/zero_divisor.expected.stats | 1 + .../datatype/float/mod/bad.expected.stats | 2 ++ .../datatype/float/mod/basic.expected.stats | 2 ++ .../float/mod/negative.expected.stats | 2 ++ .../datatype/float/mod/none.expected.stats | 2 ++ .../float/mod/variable.expected.stats | 1 + .../datatype/float/mult/bad.expected.stats | 2 ++ .../datatype/float/mult/basic.expected.stats | 2 ++ .../datatype/float/mult/mixed.expected.stats | 2 ++ .../datatype/float/mult/nary.expected.stats | 2 ++ .../datatype/float/mult/none.expected.stats | 2 ++ .../float/mult/recovery.expected.stats | 2 ++ .../float/mult/variable.expected.stats | 1 + .../float/mult/variadic.expected.stats | 2 ++ .../float/ordering_cross_type.expected.stats | 2 ++ .../float/ordering_with_int.expected.stats | 2 ++ .../datatype/float/pow/bad.expected.stats | 2 ++ .../datatype/float/pow/basic.expected.stats | 2 ++ .../datatype/float/pow/mixed.expected.stats | 2 ++ .../datatype/float/pow/none.expected.stats | 2 ++ .../float/pow/variable.expected.stats | 1 + .../datatype/float/rounding.expected.stats | 2 ++ .../float/sqrt/variable.expected.stats | 1 + .../datatype/float/sub/bad.expected.stats | 2 ++ .../datatype/float/sub/basic.expected.stats | 2 ++ .../datatype/float/sub/none.expected.stats | 2 ++ .../float/sub/variable.expected.stats | 1 + .../datatype/int/abs/bad.expected.stats | 2 ++ .../datatype/int/abs/basic.expected.stats | 2 ++ .../datatype/int/abs/none.expected.stats | 2 ++ .../datatype/int/abs/variable.expected.stats | 1 + .../datatype/int/add/bad.expected.stats | 2 ++ .../datatype/int/add/basic.expected.stats | 2 ++ .../datatype/int/add/nary.expected.stats | 1 + .../datatype/int/add/none.expected.stats | 2 ++ .../datatype/int/add/variable.expected.stats | 1 + .../datatype/int/add/variadic.expected.stats | 2 ++ .../datatype/int/comparison.expected.stats | 2 ++ .../datatype/int/division.expected.stats | 2 ++ .../equality_compound_basic.expected.stats | 2 ++ .../int/equality_cross_type.expected.stats | 2 ++ .../datatype/int/extrema.expected.stats | 2 ++ .../datatype/int/int_div/bad.expected.stats | 2 ++ .../datatype/int/int_div/basic.expected.stats | 2 ++ .../int/int_div/negative.expected.stats | 2 ++ .../datatype/int/int_div/none.expected.stats | 2 ++ .../int/int_div/variable.expected.stats | 1 + .../datatype/int/minus/bad.expected.stats | 2 ++ .../datatype/int/minus/basic.expected.stats | 2 ++ .../datatype/int/minus/none.expected.stats | 2 ++ .../int/minus/variable.expected.stats | 1 + .../datatype/int/mod/variable.expected.stats | 1 + .../datatype/int/mult/bad.expected.stats | 2 ++ .../datatype/int/mult/basic.expected.stats | 2 ++ .../datatype/int/mult/nary.expected.stats | 1 + .../datatype/int/mult/none.expected.stats | 2 ++ .../datatype/int/mult/variable.expected.stats | 1 + .../datatype/int/mult/variadic.expected.stats | 2 ++ .../int/ordering_cross_type.expected.stats | 2 ++ .../datatype/int/pow/bad.expected.stats | 2 ++ .../datatype/int/pow/basic.expected.stats | 2 ++ .../datatype/int/pow/none.expected.stats | 2 ++ .../datatype/int/pow/recovery.expected.stats | 2 ++ .../datatype/int/pow/variable.expected.stats | 1 + .../datatype/int/sub/bad.expected.stats | 2 ++ .../datatype/int/sub/basic.expected.stats | 2 ++ .../datatype/int/sub/none.expected.stats | 2 ++ .../datatype/int/sub/variable.expected.stats | 1 + .../datatype/string/concat/bad.expected.stats | 2 ++ .../string/concat/basic.expected.stats | 2 ++ .../string/concat/none.expected.stats | 2 ++ .../string/concat/variable.expected.stats | 1 + .../datatype/string/length/bad.expected.stats | 1 + .../string/length/basic.expected.stats | 2 ++ .../string/length/none.expected.stats | 2 ++ .../string/length/variable.expected.stats | 1 + .../datatype/string/mixed.expected.stats | 1 + .../datatype/string/order/bad.expected.stats | 2 ++ .../datatype/string/order/geq.expected.stats | 2 ++ .../datatype/string/order/gt.expected.stats | 2 ++ .../datatype/string/order/leq.expected.stats | 2 ++ .../datatype/string/order/lt.expected.stats | 2 ++ .../datatype/string/order/none.expected.stats | 2 ++ .../string/order/variable.expected.stats | 1 + .../default/basic_true.expected.stats | 2 ++ .../default/define/condition.expected.stats | 1 + .../default/define/disabled.expected.stats | 1 + .../default/define/no_domain.expected.stats | 2 ++ .../default/define/with_domain.expected.stats | 1 + .../with_domain_bothdefined.expected.stats | 2 ++ .../default/depends/condition.expected.stats | 1 + .../default/depends/disabled.expected.stats | 1 + .../depends/disabled_bydefine.expected.stats | 2 ++ .../default/depends/no_domain.expected.stats | 2 ++ .../depends/with_domain.expected.stats | 1 + .../with_domain_bothdefined.expected.stats | 2 ++ .../correctness/engine/request.expected.stats | 2 ++ .../engine/request_interaction.expected.stats | 2 ++ .../engine/request_mixed_trig.expected.stats | 2 ++ .../engine/request_mult.expected.stats | 2 ++ .../engine/request_set_ref.expected.stats | 2 ++ .../correctness/error/recovery.expected.stats | 2 ++ .../error/recovery_bool.expected.stats | 2 ++ .../error/recovery_check.expected.stats | 1 + .../recovery_conditionals.expected.stats | 2 ++ .../error/recovery_ensure.expected.stats | 1 + .../execution/assert.expected.stats | 1 + .../execution/bad_interface.expected.stats | 2 ++ .../execution/change.expected.stats | 1 + .../execution/conditional.expected.stats | 1 + .../conditional_assert.expected.stats | 2 ++ .../conditional_input_domain.expected.stats | 2 ++ ...tional_input_domain_dynamic.expected.stats | 2 ++ ...tring_equality_single_model.expected.stats | 1 + .../implicit_variable.expected.stats | 2 ++ .../execution/main_absolut.expected.stats | 1 + .../execution/main_pyt.expected.stats | 2 ++ .../execution/main_swap.expected.stats | 1 + .../execution/optional_run.expected.stats | 1 + .../execution/python_augassign.expected.stats | 2 ++ .../python_augassign_bad.expected.stats | 2 ++ .../python_augassign_float.expected.stats | 2 ++ .../python_augassign_types.expected.stats | 2 ++ .../execution/python_integrity.expected.stats | 1 + ...integrity_should_be_ignored.expected.stats | 1 + .../execution/python_list.expected.stats | 2 ++ .../python_set_empty_equality.expected.stats | 2 ++ .../python_syntax_error_return.expected.stats | 1 + ...python_syntax_error_through.expected.stats | 1 + .../execution/run_condition.expected.stats | 1 + .../warning_spurious2.expected.stats | 1 + .../alternative_syntax/core.expected.stats | 2 ++ .../alternative_syntax/lambda.expected.stats | 2 ++ .../expression/bad_equality.expected.stats | 1 + .../expression/lambda/deeper.expected.stats | 2 ++ .../expression/lambda/lambdas.expected.stats | 2 ++ .../lambda/recursive.expected.stats | 2 ++ .../lambda/zero_args.expected.stats | 2 ++ .../expression/python.expected.stats | 2 ++ .../python_bad_result.expected.stats | 2 ++ .../python_extract/bad.expected.stats | 2 ++ .../python_extract/basic.expected.stats | 2 ++ .../binding_leak.expected.stats | 2 ++ .../python_extract/dynamic.expected.stats | 1 + .../python_extract/set_input.expected.stats | 2 ++ .../python_extract/set_output.expected.stats | 2 ++ .../set_projection.expected.stats | 2 ++ .../python_extract/static.expected.stats | 2 ++ .../python_extract/succeeds.expected.stats | 1 + .../tuple_containing_bad.expected.stats | 2 ++ .../tuple_projection.expected.stats | 2 ++ .../python_multi_args.expected.stats | 2 ++ .../expression/tuple.expected.stats | 2 ++ .../tuple_arity_mismatch.expected.stats | 2 ++ .../expression/tuple_extra.expected.stats | 2 ++ .../expression/tuple_nested.expected.stats | 2 ++ .../multimap/basics.expected.stats | 2 ++ .../conditional_assign.expected.stats | 1 + .../multimap/equality.expected.stats | 2 ++ .../multimap/executions.expected.stats | 2 ++ .../correctness/multimap/find2.expected.stats | 2 ++ .../multimap/fold_i.expected.stats | 2 ++ .../correctness/multimap/main.expected.stats | 2 ++ .../multimap/max_entries.expected.stats | 2 ++ .../multimap/min_entries.expected.stats | 2 ++ .../optimization/label_int.expected.stats | 1 + .../optimization/label_string.expected.stats | 1 + .../no_multimap_bool.expected.stats | 1 + .../no_multimap_float.expected.stats | 1 + ...no_multimap_float_precision.expected.stats | 1 + .../no_multimap_int.expected.stats | 1 + .../no_multimap_labeled_values.expected.stats | 1 + ...ptional_absent_linked_value.expected.stats | 1 + .../optimization/preferences.expected.stats | 1 + tests/correctness/python/bad.expected.stats | 2 ++ .../correctness/python/dynamic.expected.stats | 1 + .../python/set_input.expected.stats | 2 ++ .../python/set_output.expected.stats | 2 ++ .../correctness/python/static.expected.stats | 2 ++ .../set/comparisons.expected.stats | 2 ++ .../set/conditional_assign.expected.stats | 1 + .../conditional_assign_dynamic.expected.stats | 1 + .../conditional_base_domain.expected.stats | 1 + .../correctness/set/diff_flat.expected.stats | 1 + .../set/eq_neq_flat.expected.stats | 1 + .../correctness/set/executions.expected.stats | 2 ++ .../correctness/set/fold_bools.expected.stats | 2 ++ .../set/from_domain.expected.stats | 1 + .../set/inter/variadic.expected.stats | 2 ++ .../correctness/set/inter_flat.expected.stats | 1 + .../correctness/set/iterations.expected.stats | 2 ++ .../set/length_flat.expected.stats | 1 + .../set/manipulation_flat.expected.stats | 2 ++ .../set/manipulations.expected.stats | 2 ++ .../set/membership_decomposed.expected.stats | 1 + .../set/membership_nested.expected.stats | 2 ++ .../set/membership_python.expected.stats | 1 + .../set/missing_declare_repair.expected.stats | 2 ++ tests/correctness/set/nested.expected.stats | 2 ++ .../set/nondet_simple.expected.stats | 1 + .../set/overapprox_boundaries.expected.stats | 1 + .../set/same_val_multi_expr.expected.stats | 1 + tests/correctness/set/selfref.expected.stats | 1 + .../set/set_in_set_notin.expected.stats | 1 + .../set/set_make_flat.expected.stats | 1 + .../set/subset_flat.expected.stats | 1 + .../correctness/set/union_flat.expected.stats | 1 + .../type/bool/binary_ops.expected.stats | 2 ++ .../type/bool/has_value.expected.stats | 1 + .../type/bool/negation.expected.stats | 2 ++ .../type/bool/with_none_binary.expected.stats | 2 ++ .../type/bool/with_none_unary.expected.stats | 2 ++ .../type/checking/composed.expected.stats | 2 ++ .../disabled_no_inference.expected.stats | 2 ++ .../type/checking/invalid.expected.stats | 1 + .../membership_set_polymorphic.expected.stats | 1 + .../type/checking/numeric.expected.stats | 2 ++ .../checking/regression_guards.expected.stats | 1 + .../type/checking/set.expected.stats | 2 ++ .../checking/string_symbol.expected.stats | 2 ++ .../type/multimap/membership.expected.stats | 1 + .../type/multimap/operations.expected.stats | 2 ++ ...istic_python_type_inference.expected.stats | 1 + ...thon_extract_type_inference.expected.stats | 2 ++ ...hon_inference_type_warnings.expected.stats | 2 ++ ...nference_unknown_vs_no_type.expected.stats | 2 ++ .../inference_warnings.expected.stats | 2 ++ .../nondeterministic_inference.expected.stats | 1 + .../statement_python/typing.expected.stats | 2 ++ .../unknown_vs_untyped.expected.stats | 2 ++ ...vs_untyped_nondeterministic.expected.stats | 1 + .../type/variable/definition.expected.stats | 2 ++ .../type/variable/fromFacts.expected.stats | 2 ++ .../variadic/boolean_conj_disj.expected.stats | 2 ++ .../variadic/boolean_leqv_lxor.expected.stats | 2 ++ .../type/variadic/numeric.expected.stats | 2 ++ .../type/warning/python.expected.stats | 1 + .../python_unsupported_type.expected.stats | 2 ++ .../type/warning/type.expected.stats | 1 + .../unit/bad/bad_eq.expected.stats | 1 + .../unit/bad/bad_float_div.expected.stats | 1 + .../unit/bad/bad_geq.expected.stats | 1 + .../unit/bad/bad_gt.expected.stats | 1 + .../unit/bad/bad_leq.expected.stats | 1 + .../unit/bad/bad_lt.expected.stats | 1 + .../unit/bad/bad_max.expected.stats | 1 + .../unit/bad/bad_min.expected.stats | 1 + .../unit/bad/bad_neq.expected.stats | 1 + .../unit/boolean/boolean_ite.expected.stats | 1 + .../unit/boolean/boolean_limp.expected.stats | 1 + .../boolean_limp_none_bug.expected.stats | 1 + .../unit/equality_eq.expected.stats | 1 + .../unit/equality_neq.expected.stats | 1 + .../unit/float/float_eq.expected.stats | 1 + .../unit/float/float_float_div.expected.stats | 1 + .../unit/float/float_geq.expected.stats | 1 + .../unit/float/float_gt.expected.stats | 1 + .../unit/float/float_int_div.expected.stats | 1 + .../unit/float/float_leq.expected.stats | 1 + .../unit/float/float_lt.expected.stats | 1 + .../unit/float/float_max.expected.stats | 1 + .../unit/float/float_min.expected.stats | 1 + .../unit/float/float_neq.expected.stats | 1 + .../unit/int/int_geq.expected.stats | 1 + .../unit/int/int_gt.expected.stats | 1 + .../unit/int/int_leq.expected.stats | 1 + .../unit/int/int_lt.expected.stats | 1 + .../unit/int/int_max.expected.stats | 1 + .../unit/int/int_min.expected.stats | 1 + .../unit/nullary/python_python.expected.stats | 1 + .../python_pythonExtract.expected.stats | 1 + .../unit/python_python.expected.stats | 1 + .../unit/python_pythonExtract.expected.stats | 1 + .../unit/set/set_diff.expected.stats | 1 + .../unit/set/set_eq.expected.stats | 1 + .../unit/set/set_inter.expected.stats | 1 + .../unit/set/set_neq.expected.stats | 1 + .../unit/set/set_set_isin.expected.stats | 1 + .../unit/set/set_set_make.expected.stats | 1 + .../unit/set/set_set_notin.expected.stats | 1 + .../unit/set/set_subset.expected.stats | 1 + .../unit/set/set_union.expected.stats | 1 + .../unit/symbol/symbol_geq.expected.stats | 1 + .../unit/symbol/symbol_gt.expected.stats | 1 + .../unit/symbol/symbol_leq.expected.stats | 1 + .../unit/symbol/symbol_lt.expected.stats | 1 + .../correctness/unit/tuple_eq.expected.stats | 1 + .../correctness/unit/tuple_neq.expected.stats | 1 + .../unit/unary/bad_hasValue.expected.stats | 1 + .../unary/boolean_hasValue.expected.stats | 1 + .../unit/unary/float_minus.expected.stats | 1 + .../unit/unary/set_length.expected.stats | 1 + ...onal_domain_bad_propagation.expected.stats | 2 ++ .../direct_bad_propagation.expected.stats | 2 ++ .../variable/flexible_domain.expected.stats | 1 + .../correctness/variable/main.expected.stats | 1 + .../missing_domain_bad.expected.stats | 2 ++ .../parallel_declaration.expected.stats | 1 + .../same_val_multi_expr.expected.stats | 1 + tests/correctness/warning/bad.expected.stats | 1 + .../warning/bad_interface.expected.stats | 2 ++ .../warning/fake_forbid.expected.stats | 1 + .../warning/forbid_labeled.expected.stats | 2 ++ .../correctness/warning/ignore.expected.stats | 2 ++ .../warning/ignore_labeled.expected.stats | 1 + ...ally_exclusive_declarations.expected.stats | 1 + .../statement_error.expected.stats | 1 + .../undeclared_variable.expected.stats | 2 ++ .../warning/raise/basic.expected.stats | 2 ++ .../warning/raise/controls.expected.stats | 1 + .../warning/raise/dynamic.expected.stats | 1 + .../warning/statement/control.expected.stats | 2 ++ .../statement/decl_lists.expected.stats | 2 ++ .../warning/statement/python.expected.stats | 2 ++ .../statement/structure.expected.stats | 2 ++ .../correctness/warning/syntax.expected.stats | 2 ++ .../variable/confusing_name.expected.stats | 2 ++ .../variable/empty_domain.expected.stats | 2 ++ .../variable/reserved_name.expected.stats | 1 + .../variable/undeclared.expected.stats | 1 + .../undeclared_statement.expected.stats | 2 ++ .../warning/variables.expected.stats | 1 + tests/flat_ch/test_correctness.py | 1 + tests/performance/float/addition.lp | 2 +- tests/performance/float/cancellation.lp | 2 +- tests/performance/float/comparisons.lp | 2 +- tests/performance/float/division.lp | 2 +- tests/performance/float/input.lp | 2 +- tests/performance/float/multiplication.lp | 2 +- tests/performance/float/sqrt.lp | 2 +- tests/performance/float/trigonometry.lp | 2 +- tests/test_encoding.py | 1 - tests/test_performance_engines.py | 8 +++-- 425 files changed, 671 insertions(+), 30 deletions(-) create mode 100644 tests/correctness/core/basic_assignments.expected.stats create mode 100644 tests/correctness/core/bool_evaluate/basic.expected.stats create mode 100644 tests/correctness/core/bool_evaluate/forbidden.expected.stats create mode 100644 tests/correctness/core/bool_evaluate/immediate.expected.stats create mode 100644 tests/correctness/core/bool_evaluate/inconsistent.expected.stats create mode 100644 tests/correctness/core/bool_evaluate/internal.expected.stats create mode 100644 tests/correctness/core/boolean_shortcut_optional_presence.expected.stats create mode 100644 tests/correctness/core/conditional_assign.expected.stats create mode 100644 tests/correctness/core/conditional_define.expected.stats create mode 100644 tests/correctness/core/conditional_domain.expected.stats create mode 100644 tests/correctness/core/conditional_domain_shared_entry.expected.stats create mode 100644 tests/correctness/core/conj_bad_none_recovery.expected.stats create mode 100644 tests/correctness/core/custom_globals.expected.stats create mode 100644 tests/correctness/core/empty_set_execution.expected.stats create mode 100644 tests/correctness/core/empty_variadics.expected.stats create mode 100644 tests/correctness/core/evaluate_dynamic.expected.stats create mode 100644 tests/correctness/core/integrity.expected.stats create mode 100644 tests/correctness/core/optional_absent_string_comparison_evaluation.expected.stats create mode 100644 tests/correctness/core/reasoning_modes.expected.stats create mode 100644 tests/correctness/core/reasoning_modes_sets.expected.stats create mode 100644 tests/correctness/core/reasoning_modes_with_show.expected.stats create mode 100644 tests/correctness/core/set_interface_value_marker.expected.stats create mode 100644 tests/correctness/core/set_to_variable.expected.stats create mode 100644 tests/correctness/datatype/bool/conj_disj/bad.expected.stats create mode 100644 tests/correctness/datatype/bool/conj_disj/basic.expected.stats create mode 100644 tests/correctness/datatype/bool/conj_disj/mixed.expected.stats create mode 100644 tests/correctness/datatype/bool/conj_disj/variadic.expected.stats create mode 100644 tests/correctness/datatype/bool/derived_relations.expected.stats create mode 100644 tests/correctness/datatype/bool/equivalence_bad.expected.stats create mode 100644 tests/correctness/datatype/bool/implication_bad.expected.stats create mode 100644 tests/correctness/datatype/bool/leqv_lxor/bad.expected.stats create mode 100644 tests/correctness/datatype/bool/leqv_lxor/variadic.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/logical_bad.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/logical_basic.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/logical_none.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/strong_bad.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/strong_basic.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/strong_none.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/weak_bad.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/weak_basic.expected.stats create mode 100644 tests/correctness/datatype/bool/negation/weak_none.expected.stats create mode 100644 tests/correctness/datatype/casting.expected.stats create mode 100644 tests/correctness/datatype/conditional/orElse/bad.expected.stats create mode 100644 tests/correctness/datatype/float/division.expected.stats create mode 100644 tests/correctness/datatype/float/division_with_int.expected.stats create mode 100644 tests/correctness/datatype/float/equality_basic.expected.stats create mode 100644 tests/correctness/datatype/float/equality_cross_type.expected.stats create mode 100644 tests/correctness/datatype/float/extrema.expected.stats create mode 100644 tests/correctness/datatype/float/mod/negative.expected.stats create mode 100644 tests/correctness/datatype/float/mult/nary.expected.stats create mode 100644 tests/correctness/datatype/float/mult/recovery.expected.stats create mode 100644 tests/correctness/datatype/float/ordering_cross_type.expected.stats create mode 100644 tests/correctness/datatype/float/ordering_with_int.expected.stats create mode 100644 tests/correctness/datatype/float/rounding.expected.stats create mode 100644 tests/correctness/datatype/int/add/nary.expected.stats create mode 100644 tests/correctness/datatype/int/comparison.expected.stats create mode 100644 tests/correctness/datatype/int/division.expected.stats create mode 100644 tests/correctness/datatype/int/equality_compound_basic.expected.stats create mode 100644 tests/correctness/datatype/int/equality_cross_type.expected.stats create mode 100644 tests/correctness/datatype/int/extrema.expected.stats create mode 100644 tests/correctness/datatype/int/mult/nary.expected.stats create mode 100644 tests/correctness/datatype/int/ordering_cross_type.expected.stats create mode 100644 tests/correctness/datatype/int/pow/recovery.expected.stats create mode 100644 tests/correctness/datatype/string/concat/none.expected.stats create mode 100644 tests/correctness/datatype/string/length/none.expected.stats create mode 100644 tests/correctness/datatype/string/mixed.expected.stats create mode 100644 tests/correctness/datatype/string/order/bad.expected.stats create mode 100644 tests/correctness/datatype/string/order/none.expected.stats create mode 100644 tests/correctness/default/basic_true.expected.stats create mode 100644 tests/correctness/default/define/condition.expected.stats create mode 100644 tests/correctness/default/define/disabled.expected.stats create mode 100644 tests/correctness/default/define/no_domain.expected.stats create mode 100644 tests/correctness/default/define/with_domain_bothdefined.expected.stats create mode 100644 tests/correctness/default/depends/condition.expected.stats create mode 100644 tests/correctness/default/depends/disabled.expected.stats create mode 100644 tests/correctness/default/depends/disabled_bydefine.expected.stats create mode 100644 tests/correctness/default/depends/no_domain.expected.stats create mode 100644 tests/correctness/default/depends/with_domain.expected.stats create mode 100644 tests/correctness/default/depends/with_domain_bothdefined.expected.stats create mode 100644 tests/correctness/engine/request.expected.stats create mode 100644 tests/correctness/engine/request_interaction.expected.stats create mode 100644 tests/correctness/engine/request_mult.expected.stats create mode 100644 tests/correctness/engine/request_set_ref.expected.stats create mode 100644 tests/correctness/error/recovery.expected.stats create mode 100644 tests/correctness/error/recovery_bool.expected.stats create mode 100644 tests/correctness/error/recovery_check.expected.stats create mode 100644 tests/correctness/error/recovery_conditionals.expected.stats create mode 100644 tests/correctness/error/recovery_ensure.expected.stats create mode 100644 tests/correctness/execution/assert.expected.stats create mode 100644 tests/correctness/execution/bad_interface.expected.stats create mode 100644 tests/correctness/execution/change.expected.stats create mode 100644 tests/correctness/execution/conditional.expected.stats create mode 100644 tests/correctness/execution/conditional_assert.expected.stats create mode 100644 tests/correctness/execution/conditional_input_domain.expected.stats create mode 100644 tests/correctness/execution/conditional_input_domain_dynamic.expected.stats create mode 100644 tests/correctness/execution/conditional_string_equality_single_model.expected.stats create mode 100644 tests/correctness/execution/implicit_variable.expected.stats create mode 100644 tests/correctness/execution/main_absolut.expected.stats create mode 100644 tests/correctness/execution/main_pyt.expected.stats create mode 100644 tests/correctness/execution/main_swap.expected.stats create mode 100644 tests/correctness/execution/optional_run.expected.stats create mode 100644 tests/correctness/execution/python_augassign.expected.stats create mode 100644 tests/correctness/execution/python_augassign_bad.expected.stats create mode 100644 tests/correctness/execution/python_augassign_float.expected.stats create mode 100644 tests/correctness/execution/python_augassign_types.expected.stats create mode 100644 tests/correctness/execution/python_integrity.expected.stats create mode 100644 tests/correctness/execution/python_integrity_should_be_ignored.expected.stats create mode 100644 tests/correctness/execution/python_list.expected.stats create mode 100644 tests/correctness/execution/python_set_empty_equality.expected.stats create mode 100644 tests/correctness/execution/python_syntax_error_return.expected.stats create mode 100644 tests/correctness/execution/python_syntax_error_through.expected.stats create mode 100644 tests/correctness/expression/alternative_syntax/core.expected.stats create mode 100644 tests/correctness/expression/alternative_syntax/lambda.expected.stats create mode 100644 tests/correctness/expression/bad_equality.expected.stats create mode 100644 tests/correctness/expression/lambda/deeper.expected.stats create mode 100644 tests/correctness/expression/lambda/lambdas.expected.stats create mode 100644 tests/correctness/expression/lambda/recursive.expected.stats create mode 100644 tests/correctness/expression/lambda/zero_args.expected.stats create mode 100644 tests/correctness/expression/python.expected.stats create mode 100644 tests/correctness/expression/python_bad_result.expected.stats create mode 100644 tests/correctness/expression/python_extract/bad.expected.stats create mode 100644 tests/correctness/expression/python_extract/basic.expected.stats create mode 100644 tests/correctness/expression/python_extract/binding_leak.expected.stats create mode 100644 tests/correctness/expression/python_extract/dynamic.expected.stats create mode 100644 tests/correctness/expression/python_extract/set_input.expected.stats create mode 100644 tests/correctness/expression/python_extract/set_output.expected.stats create mode 100644 tests/correctness/expression/python_extract/static.expected.stats create mode 100644 tests/correctness/expression/python_extract/succeeds.expected.stats create mode 100644 tests/correctness/expression/python_extract/tuple_containing_bad.expected.stats create mode 100644 tests/correctness/expression/python_multi_args.expected.stats create mode 100644 tests/correctness/expression/tuple.expected.stats create mode 100644 tests/correctness/expression/tuple_arity_mismatch.expected.stats create mode 100644 tests/correctness/expression/tuple_extra.expected.stats create mode 100644 tests/correctness/expression/tuple_nested.expected.stats create mode 100644 tests/correctness/multimap/basics.expected.stats create mode 100644 tests/correctness/multimap/equality.expected.stats create mode 100644 tests/correctness/multimap/executions.expected.stats create mode 100644 tests/correctness/multimap/find2.expected.stats create mode 100644 tests/correctness/multimap/fold_i.expected.stats create mode 100644 tests/correctness/multimap/main.expected.stats create mode 100644 tests/correctness/multimap/max_entries.expected.stats create mode 100644 tests/correctness/multimap/min_entries.expected.stats create mode 100644 tests/correctness/optimization/label_int.expected.stats create mode 100644 tests/correctness/optimization/label_string.expected.stats create mode 100644 tests/correctness/optimization/no_multimap_bool.expected.stats create mode 100644 tests/correctness/optimization/no_multimap_float.expected.stats create mode 100644 tests/correctness/optimization/no_multimap_float_precision.expected.stats create mode 100644 tests/correctness/optimization/no_multimap_int.expected.stats create mode 100644 tests/correctness/optimization/no_multimap_labeled_values.expected.stats create mode 100644 tests/correctness/optimization/optional_absent_linked_value.expected.stats create mode 100644 tests/correctness/optimization/preferences.expected.stats create mode 100644 tests/correctness/python/bad.expected.stats create mode 100644 tests/correctness/python/dynamic.expected.stats create mode 100644 tests/correctness/python/set_input.expected.stats create mode 100644 tests/correctness/python/set_output.expected.stats create mode 100644 tests/correctness/python/static.expected.stats create mode 100644 tests/correctness/set/comparisons.expected.stats create mode 100644 tests/correctness/set/diff_flat.expected.stats create mode 100644 tests/correctness/set/eq_neq_flat.expected.stats create mode 100644 tests/correctness/set/executions.expected.stats create mode 100644 tests/correctness/set/fold_bools.expected.stats create mode 100644 tests/correctness/set/inter/variadic.expected.stats create mode 100644 tests/correctness/set/inter_flat.expected.stats create mode 100644 tests/correctness/set/iterations.expected.stats create mode 100644 tests/correctness/set/length_flat.expected.stats create mode 100644 tests/correctness/set/manipulation_flat.expected.stats create mode 100644 tests/correctness/set/manipulations.expected.stats create mode 100644 tests/correctness/set/membership_decomposed.expected.stats create mode 100644 tests/correctness/set/membership_nested.expected.stats create mode 100644 tests/correctness/set/membership_python.expected.stats create mode 100644 tests/correctness/set/missing_declare_repair.expected.stats create mode 100644 tests/correctness/set/nested.expected.stats create mode 100644 tests/correctness/set/nondet_simple.expected.stats create mode 100644 tests/correctness/set/overapprox_boundaries.expected.stats create mode 100644 tests/correctness/set/selfref.expected.stats create mode 100644 tests/correctness/set/set_in_set_notin.expected.stats create mode 100644 tests/correctness/set/set_make_flat.expected.stats create mode 100644 tests/correctness/set/subset_flat.expected.stats create mode 100644 tests/correctness/set/union_flat.expected.stats create mode 100644 tests/correctness/type/bool/binary_ops.expected.stats create mode 100644 tests/correctness/type/bool/has_value.expected.stats create mode 100644 tests/correctness/type/bool/negation.expected.stats create mode 100644 tests/correctness/type/bool/with_none_binary.expected.stats create mode 100644 tests/correctness/type/bool/with_none_unary.expected.stats create mode 100644 tests/correctness/type/checking/composed.expected.stats create mode 100644 tests/correctness/type/checking/disabled_no_inference.expected.stats create mode 100644 tests/correctness/type/checking/invalid.expected.stats create mode 100644 tests/correctness/type/checking/membership_set_polymorphic.expected.stats create mode 100644 tests/correctness/type/checking/numeric.expected.stats create mode 100644 tests/correctness/type/checking/regression_guards.expected.stats create mode 100644 tests/correctness/type/checking/set.expected.stats create mode 100644 tests/correctness/type/checking/string_symbol.expected.stats create mode 100644 tests/correctness/type/multimap/membership.expected.stats create mode 100644 tests/correctness/type/multimap/operations.expected.stats create mode 100644 tests/correctness/type/python_extract/non_deterministic_python_type_inference.expected.stats create mode 100644 tests/correctness/type/python_extract/python_extract_type_inference.expected.stats create mode 100644 tests/correctness/type/python_extract/python_inference_type_warnings.expected.stats create mode 100644 tests/correctness/type/python_extract/type_inference_unknown_vs_no_type.expected.stats create mode 100644 tests/correctness/type/statement_python/inference_warnings.expected.stats create mode 100644 tests/correctness/type/statement_python/nondeterministic_inference.expected.stats create mode 100644 tests/correctness/type/statement_python/typing.expected.stats create mode 100644 tests/correctness/type/statement_python/unknown_vs_untyped.expected.stats create mode 100644 tests/correctness/type/statement_python/unknown_vs_untyped_nondeterministic.expected.stats create mode 100644 tests/correctness/type/variable/definition.expected.stats create mode 100644 tests/correctness/type/variable/fromFacts.expected.stats create mode 100644 tests/correctness/type/variadic/boolean_conj_disj.expected.stats create mode 100644 tests/correctness/type/variadic/boolean_leqv_lxor.expected.stats create mode 100644 tests/correctness/type/variadic/numeric.expected.stats create mode 100644 tests/correctness/type/warning/python.expected.stats create mode 100644 tests/correctness/type/warning/python_unsupported_type.expected.stats create mode 100644 tests/correctness/type/warning/type.expected.stats create mode 100644 tests/correctness/variable/conditional_domain_bad_propagation.expected.stats create mode 100644 tests/correctness/variable/direct_bad_propagation.expected.stats create mode 100644 tests/correctness/variable/flexible_domain.expected.stats create mode 100644 tests/correctness/variable/main.expected.stats create mode 100644 tests/correctness/variable/missing_domain_bad.expected.stats create mode 100644 tests/correctness/variable/parallel_declaration.expected.stats create mode 100644 tests/correctness/warning/bad.expected.stats create mode 100644 tests/correctness/warning/bad_interface.expected.stats create mode 100644 tests/correctness/warning/fake_forbid.expected.stats create mode 100644 tests/correctness/warning/forbid_labeled.expected.stats create mode 100644 tests/correctness/warning/ignore.expected.stats create mode 100644 tests/correctness/warning/ignore_labeled.expected.stats create mode 100644 tests/correctness/warning/python_extract/undeclared_variable.expected.stats create mode 100644 tests/correctness/warning/raise/basic.expected.stats create mode 100644 tests/correctness/warning/raise/controls.expected.stats create mode 100644 tests/correctness/warning/statement/control.expected.stats create mode 100644 tests/correctness/warning/statement/decl_lists.expected.stats create mode 100644 tests/correctness/warning/statement/python.expected.stats create mode 100644 tests/correctness/warning/statement/structure.expected.stats create mode 100644 tests/correctness/warning/syntax.expected.stats create mode 100644 tests/correctness/warning/variable/confusing_name.expected.stats create mode 100644 tests/correctness/warning/variable/empty_domain.expected.stats create mode 100644 tests/correctness/warning/variable/reserved_name.expected.stats create mode 100644 tests/correctness/warning/variable/undeclared.expected.stats create mode 100644 tests/correctness/warning/variable/undeclared_statement.expected.stats create mode 100644 tests/correctness/warning/variables.expected.stats diff --git a/CHANGES.md b/CHANGES.md index 0349da78..73b30475 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,7 +2,8 @@ ## Ongoing -- introduce fields `tight` and `choices` to `.expected.stats` format and simplify the testing framework usage +- introduce fields `tight` and `choices` to `.expected.stats` format and + simplify the testing framework usage - add `variable_declared(X)` output for user-facing variables with an active declaration. - add `variable_defined(X)` output for user-facing variables with a non-`bad` diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 2e2b4d79..c246e18c 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -81,17 +81,16 @@ The ASP programs under `tests/performance/float/` cover addition chains, integer and fractional multiplication, equality and ordering near a small separation, cancellation after adding a large offset, division with multiplicative recovery, square root with squaring, and sine/cosine with the -sum of their squares. A shared three-value -input domain includes negative, exact dyadic, and repeating-fraction inputs. -The workloads have three models regardless of size and expose `value/2`. +sum of their squares. A shared three-value input domain includes negative, +exact dyadic, and repeating-fraction inputs. The workloads have three models +regardless of size and expose `value/2`. Each workload runs at sizes 16 and 64 with `compile`, `compile2`, `fch`, -`ground`, `propagator`, and `propagator_check`. -FCH trigonometry cases are skipped because its native operator set lacks -`sin` and `cos`. -Timings include control setup, loading, grounding, and solving, using one -warmup and three measured runs. The 30-second mean limit is a generous safety -ceiling for comparing implementations, rather than a calibrated baseline. +`ground`, `propagator`, and `propagator_check`. FCH trigonometry cases are +skipped because its native operator set lacks `sin` and `cos`. Timings include +control setup, loading, grounding, and solving, using one warmup and three +measured runs. The 30-second mean limit is a generous safety ceiling for +comparing implementations, rather than a calibrated baseline. ```bash # capture all float benchmarks @@ -104,10 +103,10 @@ nox -s performance -- -k 'fch and float/' nox -Rs test -- tests/test_performance_engines.py -m performance -k 'float/' --benchmark-disable ``` -Use the same workload sizes and engine selection when comparing saved runs -with `nox -s benchmark_compare`. Engine and workload constants are recorded in -the benchmark metadata. Additional representations can use these same ASP -inputs through their engine implementations. +Use the same workload sizes and engine selection when comparing saved runs with +`nox -s benchmark_compare`. Engine and workload constants are recorded in the +benchmark metadata. Additional representations can use these same ASP inputs +through their engine implementations. ## Expectation Fixtures @@ -136,10 +135,11 @@ The supported suffixes are: - `optall`, `optany`, and `optnone`: atom must occur in every, any, or no optimal model respectively. - `stats`: one `key=value` entry per line. All keys are optional. - `models=` asserts the exact number of models. `tight=true` asserts zero - strongly connected components, and `tight=false` asserts at least one. `choices=false` - asserts zero solver choices, and `choices=true` asserts at least one. - Boolean values are lowercase `true` or `false`; omitted fields are unchecked. + `models=` asserts the exact number of models. `tight=true` asserts + zero strongly connected components, and `tight=false` asserts at least one. + `choices=false` asserts zero solver choices, and `choices=true` asserts at + least one. Boolean values are lowercase `true` or `false`; omitted fields are + unchecked. `all`, `none`, `first`, `last`, `optall`, and `optnone` implicitly also require at least one model unless an `any`, `brave`, `cautious`, or `optany` diff --git a/tests/correctness/core/basic_assignments.expected.stats b/tests/correctness/core/basic_assignments.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/basic_assignments.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/bool_evaluate/basic.expected.stats b/tests/correctness/core/bool_evaluate/basic.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/bool_evaluate/basic.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/bool_evaluate/forbidden.expected.stats b/tests/correctness/core/bool_evaluate/forbidden.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/bool_evaluate/forbidden.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/bool_evaluate/immediate.expected.stats b/tests/correctness/core/bool_evaluate/immediate.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/bool_evaluate/immediate.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/bool_evaluate/inconsistent.expected.stats b/tests/correctness/core/bool_evaluate/inconsistent.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/bool_evaluate/inconsistent.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/bool_evaluate/internal.expected.stats b/tests/correctness/core/bool_evaluate/internal.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/bool_evaluate/internal.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/boolean_shortcut_optional_presence.expected.stats b/tests/correctness/core/boolean_shortcut_optional_presence.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/boolean_shortcut_optional_presence.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/check.expected.stats b/tests/correctness/core/check.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/check.expected.stats +++ b/tests/correctness/core/check.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/conditional_assign.expected.stats b/tests/correctness/core/conditional_assign.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/conditional_assign.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/conditional_declare.expected.stats b/tests/correctness/core/conditional_declare.expected.stats index 393a4fd1..7c34640a 100644 --- a/tests/correctness/core/conditional_declare.expected.stats +++ b/tests/correctness/core/conditional_declare.expected.stats @@ -1 +1,2 @@ models=24 +tight=true diff --git a/tests/correctness/core/conditional_declare_definition.expected.stats b/tests/correctness/core/conditional_declare_definition.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/conditional_declare_definition.expected.stats +++ b/tests/correctness/core/conditional_declare_definition.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/conditional_declare_domain.expected.stats b/tests/correctness/core/conditional_declare_domain.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/conditional_declare_domain.expected.stats +++ b/tests/correctness/core/conditional_declare_domain.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/conditional_declare_empty_domain.expected.stats b/tests/correctness/core/conditional_declare_empty_domain.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/conditional_declare_empty_domain.expected.stats +++ b/tests/correctness/core/conditional_declare_empty_domain.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/conditional_declare_inactive_domain.expected.stats b/tests/correctness/core/conditional_declare_inactive_domain.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/core/conditional_declare_inactive_domain.expected.stats +++ b/tests/correctness/core/conditional_declare_inactive_domain.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/core/conditional_declare_set.expected.stats b/tests/correctness/core/conditional_declare_set.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/conditional_declare_set.expected.stats +++ b/tests/correctness/core/conditional_declare_set.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/conditional_declare_set_multiple.expected.stats b/tests/correctness/core/conditional_declare_set_multiple.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/conditional_declare_set_multiple.expected.stats +++ b/tests/correctness/core/conditional_declare_set_multiple.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/conditional_define.expected.stats b/tests/correctness/core/conditional_define.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/conditional_define.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/conditional_definitions.expected.stats b/tests/correctness/core/conditional_definitions.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/conditional_definitions.expected.stats +++ b/tests/correctness/core/conditional_definitions.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/conditional_domain.expected.stats b/tests/correctness/core/conditional_domain.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/conditional_domain.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/conditional_domain_shared_entry.expected.stats b/tests/correctness/core/conditional_domain_shared_entry.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/conditional_domain_shared_entry.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/conj_bad_none_recovery.expected.stats b/tests/correctness/core/conj_bad_none_recovery.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/conj_bad_none_recovery.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/custom_globals.expected.stats b/tests/correctness/core/custom_globals.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/custom_globals.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/empty_set_execution.expected.stats b/tests/correctness/core/empty_set_execution.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/empty_set_execution.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/empty_variadics.expected.stats b/tests/correctness/core/empty_variadics.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/empty_variadics.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/ensure.expected.stats b/tests/correctness/core/ensure.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/core/ensure.expected.stats +++ b/tests/correctness/core/ensure.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/core/evaluate_dynamic.expected.stats b/tests/correctness/core/evaluate_dynamic.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/evaluate_dynamic.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/integrity.expected.stats b/tests/correctness/core/integrity.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/integrity.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/optional_absent_comparison_evaluation.expected.stats b/tests/correctness/core/optional_absent_comparison_evaluation.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/core/optional_absent_comparison_evaluation.expected.stats +++ b/tests/correctness/core/optional_absent_comparison_evaluation.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/core/optional_absent_string_comparison_evaluation.expected.stats b/tests/correctness/core/optional_absent_string_comparison_evaluation.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/optional_absent_string_comparison_evaluation.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/reasoning_modes.expected.stats b/tests/correctness/core/reasoning_modes.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/reasoning_modes.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/reasoning_modes_sets.expected.stats b/tests/correctness/core/reasoning_modes_sets.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/reasoning_modes_sets.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/reasoning_modes_with_show.expected.stats b/tests/correctness/core/reasoning_modes_with_show.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/reasoning_modes_with_show.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/set_execution_input_alias.expected.stats b/tests/correctness/core/set_execution_input_alias.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/core/set_execution_input_alias.expected.stats +++ b/tests/correctness/core/set_execution_input_alias.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/core/set_interface_value_marker.expected.stats b/tests/correctness/core/set_interface_value_marker.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/core/set_interface_value_marker.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/core/set_to_variable.expected.stats b/tests/correctness/core/set_to_variable.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/set_to_variable.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/shared_optional_output_domains.expected.stats b/tests/correctness/core/shared_optional_output_domains.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/core/shared_optional_output_domains.expected.stats +++ b/tests/correctness/core/shared_optional_output_domains.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/core/unprojected_optional_equality.expected.stats b/tests/correctness/core/unprojected_optional_equality.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/core/unprojected_optional_equality.expected.stats +++ b/tests/correctness/core/unprojected_optional_equality.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/bool/conj_disj/bad.expected.stats b/tests/correctness/datatype/bool/conj_disj/bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/conj_disj/basic.expected.stats b/tests/correctness/datatype/bool/conj_disj/basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/conj_disj/mixed.expected.stats b/tests/correctness/datatype/bool/conj_disj/mixed.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/mixed.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/conj_disj/none.expected.stats b/tests/correctness/datatype/bool/conj_disj/none.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/bool/conj_disj/none.expected.stats +++ b/tests/correctness/datatype/bool/conj_disj/none.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/bool/conj_disj/variable.expected.stats b/tests/correctness/datatype/bool/conj_disj/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/bool/conj_disj/variable.expected.stats +++ b/tests/correctness/datatype/bool/conj_disj/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/bool/conj_disj/variadic.expected.stats b/tests/correctness/datatype/bool/conj_disj/variadic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/variadic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/derived_relations.expected.stats b/tests/correctness/datatype/bool/derived_relations.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/datatype/bool/derived_relations.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/datatype/bool/equivalence_bad.expected.stats b/tests/correctness/datatype/bool/equivalence_bad.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/datatype/bool/equivalence_bad.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/datatype/bool/implication_bad.expected.stats b/tests/correctness/datatype/bool/implication_bad.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/datatype/bool/implication_bad.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/datatype/bool/leqv_lxor/bad.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.stats +++ b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.stats +++ b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/leqv_lxor/none.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/none.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/bool/leqv_lxor/none.expected.stats +++ b/tests/correctness/datatype/bool/leqv_lxor/none.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/bool/leqv_lxor/variable.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/bool/leqv_lxor/variable.expected.stats +++ b/tests/correctness/datatype/bool/leqv_lxor/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/bool/leqv_lxor/variadic.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/variadic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/variadic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/logical_bad.expected.stats b/tests/correctness/datatype/bool/negation/logical_bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/logical_bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/logical_basic.expected.stats b/tests/correctness/datatype/bool/negation/logical_basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/logical_basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/logical_none.expected.stats b/tests/correctness/datatype/bool/negation/logical_none.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/logical_none.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/strong_bad.expected.stats b/tests/correctness/datatype/bool/negation/strong_bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/strong_bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/strong_basic.expected.stats b/tests/correctness/datatype/bool/negation/strong_basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/strong_basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/strong_none.expected.stats b/tests/correctness/datatype/bool/negation/strong_none.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/strong_none.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/variable.expected.stats b/tests/correctness/datatype/bool/negation/variable.expected.stats index 393a4fd1..7c34640a 100644 --- a/tests/correctness/datatype/bool/negation/variable.expected.stats +++ b/tests/correctness/datatype/bool/negation/variable.expected.stats @@ -1 +1,2 @@ models=24 +tight=true diff --git a/tests/correctness/datatype/bool/negation/weak_bad.expected.stats b/tests/correctness/datatype/bool/negation/weak_bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/weak_bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/weak_basic.expected.stats b/tests/correctness/datatype/bool/negation/weak_basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/weak_basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/bool/negation/weak_none.expected.stats b/tests/correctness/datatype/bool/negation/weak_none.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/weak_none.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/casting.expected.stats b/tests/correctness/datatype/casting.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/casting.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/conditional/if/bad.expected.stats b/tests/correctness/datatype/conditional/if/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/conditional/if/bad.expected.stats +++ b/tests/correctness/datatype/conditional/if/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/conditional/if/basic.expected.stats b/tests/correctness/datatype/conditional/if/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/conditional/if/basic.expected.stats +++ b/tests/correctness/datatype/conditional/if/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/conditional/if/recovery.expected.stats b/tests/correctness/datatype/conditional/if/recovery.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/conditional/if/recovery.expected.stats +++ b/tests/correctness/datatype/conditional/if/recovery.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/conditional/if/variable.expected.stats b/tests/correctness/datatype/conditional/if/variable.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/datatype/conditional/if/variable.expected.stats +++ b/tests/correctness/datatype/conditional/if/variable.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/datatype/conditional/orElse/bad.expected.stats b/tests/correctness/datatype/conditional/orElse/bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/conditional/orElse/bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/conditional/orElse/basic.expected.stats b/tests/correctness/datatype/conditional/orElse/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/conditional/orElse/basic.expected.stats +++ b/tests/correctness/datatype/conditional/orElse/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/conditional/orElse/recovery.expected.stats b/tests/correctness/datatype/conditional/orElse/recovery.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/conditional/orElse/recovery.expected.stats +++ b/tests/correctness/datatype/conditional/orElse/recovery.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/conditional/orElse/variable.expected.stats b/tests/correctness/datatype/conditional/orElse/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/conditional/orElse/variable.expected.stats +++ b/tests/correctness/datatype/conditional/orElse/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/float/abs/basic.expected.stats b/tests/correctness/datatype/float/abs/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/abs/basic.expected.stats +++ b/tests/correctness/datatype/float/abs/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/abs/variable.expected.stats b/tests/correctness/datatype/float/abs/variable.expected.stats index dfb99976..5eed319b 100644 --- a/tests/correctness/datatype/float/abs/variable.expected.stats +++ b/tests/correctness/datatype/float/abs/variable.expected.stats @@ -1 +1,2 @@ models=5 +tight=true diff --git a/tests/correctness/datatype/float/add/bad.expected.stats b/tests/correctness/datatype/float/add/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/add/bad.expected.stats +++ b/tests/correctness/datatype/float/add/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/add/basic.expected.stats b/tests/correctness/datatype/float/add/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/add/basic.expected.stats +++ b/tests/correctness/datatype/float/add/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/add/mixed.expected.stats b/tests/correctness/datatype/float/add/mixed.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/add/mixed.expected.stats +++ b/tests/correctness/datatype/float/add/mixed.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/add/none.expected.stats b/tests/correctness/datatype/float/add/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/add/none.expected.stats +++ b/tests/correctness/datatype/float/add/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/add/variable.expected.stats b/tests/correctness/datatype/float/add/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/float/add/variable.expected.stats +++ b/tests/correctness/datatype/float/add/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/float/add/variadic.expected.stats b/tests/correctness/datatype/float/add/variadic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/add/variadic.expected.stats +++ b/tests/correctness/datatype/float/add/variadic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/ceil_floor/bad.expected.stats b/tests/correctness/datatype/float/ceil_floor/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/ceil_floor/bad.expected.stats +++ b/tests/correctness/datatype/float/ceil_floor/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/ceil_floor/basic.expected.stats b/tests/correctness/datatype/float/ceil_floor/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/ceil_floor/basic.expected.stats +++ b/tests/correctness/datatype/float/ceil_floor/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/ceil_floor/mixed.expected.stats b/tests/correctness/datatype/float/ceil_floor/mixed.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/ceil_floor/mixed.expected.stats +++ b/tests/correctness/datatype/float/ceil_floor/mixed.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/ceil_floor/none.expected.stats b/tests/correctness/datatype/float/ceil_floor/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/ceil_floor/none.expected.stats +++ b/tests/correctness/datatype/float/ceil_floor/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/ceil_floor/variable.expected.stats b/tests/correctness/datatype/float/ceil_floor/variable.expected.stats index dfb99976..5eed319b 100644 --- a/tests/correctness/datatype/float/ceil_floor/variable.expected.stats +++ b/tests/correctness/datatype/float/ceil_floor/variable.expected.stats @@ -1 +1,2 @@ models=5 +tight=true diff --git a/tests/correctness/datatype/float/division.expected.stats b/tests/correctness/datatype/float/division.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/division.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/division_with_int.expected.stats b/tests/correctness/datatype/float/division_with_int.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/division_with_int.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/equality_basic.expected.stats b/tests/correctness/datatype/float/equality_basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/equality_basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/equality_cross_type.expected.stats b/tests/correctness/datatype/float/equality_cross_type.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/equality_cross_type.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/extrema.expected.stats b/tests/correctness/datatype/float/extrema.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/extrema.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/float_div/zero_divisor.expected.stats b/tests/correctness/datatype/float/float_div/zero_divisor.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/datatype/float/float_div/zero_divisor.expected.stats +++ b/tests/correctness/datatype/float/float_div/zero_divisor.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/datatype/float/int_div/zero_divisor.expected.stats b/tests/correctness/datatype/float/int_div/zero_divisor.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/datatype/float/int_div/zero_divisor.expected.stats +++ b/tests/correctness/datatype/float/int_div/zero_divisor.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/datatype/float/mod/bad.expected.stats b/tests/correctness/datatype/float/mod/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mod/bad.expected.stats +++ b/tests/correctness/datatype/float/mod/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mod/basic.expected.stats b/tests/correctness/datatype/float/mod/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mod/basic.expected.stats +++ b/tests/correctness/datatype/float/mod/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mod/negative.expected.stats b/tests/correctness/datatype/float/mod/negative.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/mod/negative.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mod/none.expected.stats b/tests/correctness/datatype/float/mod/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mod/none.expected.stats +++ b/tests/correctness/datatype/float/mod/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mod/variable.expected.stats b/tests/correctness/datatype/float/mod/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/float/mod/variable.expected.stats +++ b/tests/correctness/datatype/float/mod/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/float/mult/bad.expected.stats b/tests/correctness/datatype/float/mult/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mult/bad.expected.stats +++ b/tests/correctness/datatype/float/mult/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mult/basic.expected.stats b/tests/correctness/datatype/float/mult/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mult/basic.expected.stats +++ b/tests/correctness/datatype/float/mult/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mult/mixed.expected.stats b/tests/correctness/datatype/float/mult/mixed.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mult/mixed.expected.stats +++ b/tests/correctness/datatype/float/mult/mixed.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mult/nary.expected.stats b/tests/correctness/datatype/float/mult/nary.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/mult/nary.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mult/none.expected.stats b/tests/correctness/datatype/float/mult/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mult/none.expected.stats +++ b/tests/correctness/datatype/float/mult/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mult/recovery.expected.stats b/tests/correctness/datatype/float/mult/recovery.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/mult/recovery.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/mult/variable.expected.stats b/tests/correctness/datatype/float/mult/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/float/mult/variable.expected.stats +++ b/tests/correctness/datatype/float/mult/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/float/mult/variadic.expected.stats b/tests/correctness/datatype/float/mult/variadic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/mult/variadic.expected.stats +++ b/tests/correctness/datatype/float/mult/variadic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/ordering_cross_type.expected.stats b/tests/correctness/datatype/float/ordering_cross_type.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/ordering_cross_type.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/ordering_with_int.expected.stats b/tests/correctness/datatype/float/ordering_with_int.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/ordering_with_int.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/pow/bad.expected.stats b/tests/correctness/datatype/float/pow/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/pow/bad.expected.stats +++ b/tests/correctness/datatype/float/pow/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/pow/basic.expected.stats b/tests/correctness/datatype/float/pow/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/pow/basic.expected.stats +++ b/tests/correctness/datatype/float/pow/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/pow/mixed.expected.stats b/tests/correctness/datatype/float/pow/mixed.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/pow/mixed.expected.stats +++ b/tests/correctness/datatype/float/pow/mixed.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/pow/none.expected.stats b/tests/correctness/datatype/float/pow/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/pow/none.expected.stats +++ b/tests/correctness/datatype/float/pow/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/pow/variable.expected.stats b/tests/correctness/datatype/float/pow/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/float/pow/variable.expected.stats +++ b/tests/correctness/datatype/float/pow/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/float/rounding.expected.stats b/tests/correctness/datatype/float/rounding.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/float/rounding.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/float/sqrt/variable.expected.stats b/tests/correctness/datatype/float/sqrt/variable.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/datatype/float/sqrt/variable.expected.stats +++ b/tests/correctness/datatype/float/sqrt/variable.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/datatype/float/sub/bad.expected.stats b/tests/correctness/datatype/float/sub/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/sub/bad.expected.stats +++ b/tests/correctness/datatype/float/sub/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/sub/basic.expected.stats b/tests/correctness/datatype/float/sub/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/sub/basic.expected.stats +++ b/tests/correctness/datatype/float/sub/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/sub/none.expected.stats b/tests/correctness/datatype/float/sub/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/float/sub/none.expected.stats +++ b/tests/correctness/datatype/float/sub/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/float/sub/variable.expected.stats b/tests/correctness/datatype/float/sub/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/float/sub/variable.expected.stats +++ b/tests/correctness/datatype/float/sub/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/int/abs/bad.expected.stats b/tests/correctness/datatype/int/abs/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/abs/bad.expected.stats +++ b/tests/correctness/datatype/int/abs/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/abs/basic.expected.stats b/tests/correctness/datatype/int/abs/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/abs/basic.expected.stats +++ b/tests/correctness/datatype/int/abs/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/abs/none.expected.stats b/tests/correctness/datatype/int/abs/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/abs/none.expected.stats +++ b/tests/correctness/datatype/int/abs/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/abs/variable.expected.stats b/tests/correctness/datatype/int/abs/variable.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/datatype/int/abs/variable.expected.stats +++ b/tests/correctness/datatype/int/abs/variable.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/datatype/int/add/bad.expected.stats b/tests/correctness/datatype/int/add/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/add/bad.expected.stats +++ b/tests/correctness/datatype/int/add/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/add/basic.expected.stats b/tests/correctness/datatype/int/add/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/add/basic.expected.stats +++ b/tests/correctness/datatype/int/add/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/add/nary.expected.stats b/tests/correctness/datatype/int/add/nary.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/datatype/int/add/nary.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/datatype/int/add/none.expected.stats b/tests/correctness/datatype/int/add/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/add/none.expected.stats +++ b/tests/correctness/datatype/int/add/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/add/variable.expected.stats b/tests/correctness/datatype/int/add/variable.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/datatype/int/add/variable.expected.stats +++ b/tests/correctness/datatype/int/add/variable.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/datatype/int/add/variadic.expected.stats b/tests/correctness/datatype/int/add/variadic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/add/variadic.expected.stats +++ b/tests/correctness/datatype/int/add/variadic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/comparison.expected.stats b/tests/correctness/datatype/int/comparison.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/int/comparison.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/int/division.expected.stats b/tests/correctness/datatype/int/division.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/int/division.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/int/equality_compound_basic.expected.stats b/tests/correctness/datatype/int/equality_compound_basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/int/equality_compound_basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/int/equality_cross_type.expected.stats b/tests/correctness/datatype/int/equality_cross_type.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/int/equality_cross_type.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/int/extrema.expected.stats b/tests/correctness/datatype/int/extrema.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/int/extrema.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/int/int_div/bad.expected.stats b/tests/correctness/datatype/int/int_div/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/int_div/bad.expected.stats +++ b/tests/correctness/datatype/int/int_div/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/int_div/basic.expected.stats b/tests/correctness/datatype/int/int_div/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/int_div/basic.expected.stats +++ b/tests/correctness/datatype/int/int_div/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/int_div/negative.expected.stats b/tests/correctness/datatype/int/int_div/negative.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/int_div/negative.expected.stats +++ b/tests/correctness/datatype/int/int_div/negative.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/int_div/none.expected.stats b/tests/correctness/datatype/int/int_div/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/int_div/none.expected.stats +++ b/tests/correctness/datatype/int/int_div/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/int_div/variable.expected.stats b/tests/correctness/datatype/int/int_div/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/int/int_div/variable.expected.stats +++ b/tests/correctness/datatype/int/int_div/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/int/minus/bad.expected.stats b/tests/correctness/datatype/int/minus/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/minus/bad.expected.stats +++ b/tests/correctness/datatype/int/minus/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/minus/basic.expected.stats b/tests/correctness/datatype/int/minus/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/minus/basic.expected.stats +++ b/tests/correctness/datatype/int/minus/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/minus/none.expected.stats b/tests/correctness/datatype/int/minus/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/minus/none.expected.stats +++ b/tests/correctness/datatype/int/minus/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/minus/variable.expected.stats b/tests/correctness/datatype/int/minus/variable.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/datatype/int/minus/variable.expected.stats +++ b/tests/correctness/datatype/int/minus/variable.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/datatype/int/mod/variable.expected.stats b/tests/correctness/datatype/int/mod/variable.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/datatype/int/mod/variable.expected.stats +++ b/tests/correctness/datatype/int/mod/variable.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/datatype/int/mult/bad.expected.stats b/tests/correctness/datatype/int/mult/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/mult/bad.expected.stats +++ b/tests/correctness/datatype/int/mult/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/mult/basic.expected.stats b/tests/correctness/datatype/int/mult/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/mult/basic.expected.stats +++ b/tests/correctness/datatype/int/mult/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/mult/nary.expected.stats b/tests/correctness/datatype/int/mult/nary.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/datatype/int/mult/nary.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/datatype/int/mult/none.expected.stats b/tests/correctness/datatype/int/mult/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/mult/none.expected.stats +++ b/tests/correctness/datatype/int/mult/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/mult/variable.expected.stats b/tests/correctness/datatype/int/mult/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/int/mult/variable.expected.stats +++ b/tests/correctness/datatype/int/mult/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/int/mult/variadic.expected.stats b/tests/correctness/datatype/int/mult/variadic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/mult/variadic.expected.stats +++ b/tests/correctness/datatype/int/mult/variadic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/ordering_cross_type.expected.stats b/tests/correctness/datatype/int/ordering_cross_type.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/int/ordering_cross_type.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/int/pow/bad.expected.stats b/tests/correctness/datatype/int/pow/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/pow/bad.expected.stats +++ b/tests/correctness/datatype/int/pow/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/pow/basic.expected.stats b/tests/correctness/datatype/int/pow/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/pow/basic.expected.stats +++ b/tests/correctness/datatype/int/pow/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/pow/none.expected.stats b/tests/correctness/datatype/int/pow/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/pow/none.expected.stats +++ b/tests/correctness/datatype/int/pow/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/pow/recovery.expected.stats b/tests/correctness/datatype/int/pow/recovery.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/int/pow/recovery.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/int/pow/variable.expected.stats b/tests/correctness/datatype/int/pow/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/int/pow/variable.expected.stats +++ b/tests/correctness/datatype/int/pow/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/int/sub/bad.expected.stats b/tests/correctness/datatype/int/sub/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/sub/bad.expected.stats +++ b/tests/correctness/datatype/int/sub/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/sub/basic.expected.stats b/tests/correctness/datatype/int/sub/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/sub/basic.expected.stats +++ b/tests/correctness/datatype/int/sub/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/sub/none.expected.stats b/tests/correctness/datatype/int/sub/none.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/int/sub/none.expected.stats +++ b/tests/correctness/datatype/int/sub/none.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/int/sub/variable.expected.stats b/tests/correctness/datatype/int/sub/variable.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/datatype/int/sub/variable.expected.stats +++ b/tests/correctness/datatype/int/sub/variable.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/datatype/string/concat/bad.expected.stats b/tests/correctness/datatype/string/concat/bad.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/string/concat/bad.expected.stats +++ b/tests/correctness/datatype/string/concat/bad.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/string/concat/basic.expected.stats b/tests/correctness/datatype/string/concat/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/string/concat/basic.expected.stats +++ b/tests/correctness/datatype/string/concat/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/string/concat/none.expected.stats b/tests/correctness/datatype/string/concat/none.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/string/concat/none.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/string/concat/variable.expected.stats b/tests/correctness/datatype/string/concat/variable.expected.stats index 2b7dde30..45c79195 100644 --- a/tests/correctness/datatype/string/concat/variable.expected.stats +++ b/tests/correctness/datatype/string/concat/variable.expected.stats @@ -1 +1,2 @@ models=6 +tight=true diff --git a/tests/correctness/datatype/string/length/bad.expected.stats b/tests/correctness/datatype/string/length/bad.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/datatype/string/length/bad.expected.stats +++ b/tests/correctness/datatype/string/length/bad.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/datatype/string/length/basic.expected.stats b/tests/correctness/datatype/string/length/basic.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/string/length/basic.expected.stats +++ b/tests/correctness/datatype/string/length/basic.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/string/length/none.expected.stats b/tests/correctness/datatype/string/length/none.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/string/length/none.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/string/length/variable.expected.stats b/tests/correctness/datatype/string/length/variable.expected.stats index 2b7dde30..45c79195 100644 --- a/tests/correctness/datatype/string/length/variable.expected.stats +++ b/tests/correctness/datatype/string/length/variable.expected.stats @@ -1 +1,2 @@ models=6 +tight=true diff --git a/tests/correctness/datatype/string/mixed.expected.stats b/tests/correctness/datatype/string/mixed.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/datatype/string/mixed.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/datatype/string/order/bad.expected.stats b/tests/correctness/datatype/string/order/bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/string/order/bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/string/order/geq.expected.stats b/tests/correctness/datatype/string/order/geq.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/string/order/geq.expected.stats +++ b/tests/correctness/datatype/string/order/geq.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/string/order/gt.expected.stats b/tests/correctness/datatype/string/order/gt.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/string/order/gt.expected.stats +++ b/tests/correctness/datatype/string/order/gt.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/string/order/leq.expected.stats b/tests/correctness/datatype/string/order/leq.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/string/order/leq.expected.stats +++ b/tests/correctness/datatype/string/order/leq.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/string/order/lt.expected.stats b/tests/correctness/datatype/string/order/lt.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/datatype/string/order/lt.expected.stats +++ b/tests/correctness/datatype/string/order/lt.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/datatype/string/order/none.expected.stats b/tests/correctness/datatype/string/order/none.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/datatype/string/order/none.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/datatype/string/order/variable.expected.stats b/tests/correctness/datatype/string/order/variable.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/datatype/string/order/variable.expected.stats +++ b/tests/correctness/datatype/string/order/variable.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/default/basic_true.expected.stats b/tests/correctness/default/basic_true.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/default/basic_true.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/default/define/condition.expected.stats b/tests/correctness/default/define/condition.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/default/define/condition.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/default/define/disabled.expected.stats b/tests/correctness/default/define/disabled.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/default/define/disabled.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/default/define/no_domain.expected.stats b/tests/correctness/default/define/no_domain.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/default/define/no_domain.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/default/define/with_domain.expected.stats b/tests/correctness/default/define/with_domain.expected.stats index fc149c61..7c465d7f 100644 --- a/tests/correctness/default/define/with_domain.expected.stats +++ b/tests/correctness/default/define/with_domain.expected.stats @@ -1 +1,2 @@ models=1 +tight=true diff --git a/tests/correctness/default/define/with_domain_bothdefined.expected.stats b/tests/correctness/default/define/with_domain_bothdefined.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/default/define/with_domain_bothdefined.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/default/depends/condition.expected.stats b/tests/correctness/default/depends/condition.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/default/depends/condition.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/default/depends/disabled.expected.stats b/tests/correctness/default/depends/disabled.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/default/depends/disabled.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/default/depends/disabled_bydefine.expected.stats b/tests/correctness/default/depends/disabled_bydefine.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/default/depends/disabled_bydefine.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/default/depends/no_domain.expected.stats b/tests/correctness/default/depends/no_domain.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/default/depends/no_domain.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/default/depends/with_domain.expected.stats b/tests/correctness/default/depends/with_domain.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/default/depends/with_domain.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/default/depends/with_domain_bothdefined.expected.stats b/tests/correctness/default/depends/with_domain_bothdefined.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/default/depends/with_domain_bothdefined.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/engine/request.expected.stats b/tests/correctness/engine/request.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/engine/request.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/engine/request_interaction.expected.stats b/tests/correctness/engine/request_interaction.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/engine/request_interaction.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/engine/request_mixed_trig.expected.stats b/tests/correctness/engine/request_mixed_trig.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/engine/request_mixed_trig.expected.stats +++ b/tests/correctness/engine/request_mixed_trig.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/engine/request_mult.expected.stats b/tests/correctness/engine/request_mult.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/engine/request_mult.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/engine/request_set_ref.expected.stats b/tests/correctness/engine/request_set_ref.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/engine/request_set_ref.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/error/recovery.expected.stats b/tests/correctness/error/recovery.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/error/recovery.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/error/recovery_bool.expected.stats b/tests/correctness/error/recovery_bool.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/error/recovery_bool.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/error/recovery_check.expected.stats b/tests/correctness/error/recovery_check.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/error/recovery_check.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/error/recovery_conditionals.expected.stats b/tests/correctness/error/recovery_conditionals.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/error/recovery_conditionals.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/error/recovery_ensure.expected.stats b/tests/correctness/error/recovery_ensure.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/error/recovery_ensure.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/assert.expected.stats b/tests/correctness/execution/assert.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/assert.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/bad_interface.expected.stats b/tests/correctness/execution/bad_interface.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/bad_interface.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/change.expected.stats b/tests/correctness/execution/change.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/change.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/conditional.expected.stats b/tests/correctness/execution/conditional.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/conditional.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/conditional_assert.expected.stats b/tests/correctness/execution/conditional_assert.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/conditional_assert.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/conditional_input_domain.expected.stats b/tests/correctness/execution/conditional_input_domain.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/conditional_input_domain.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/conditional_input_domain_dynamic.expected.stats b/tests/correctness/execution/conditional_input_domain_dynamic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/conditional_input_domain_dynamic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/conditional_string_equality_single_model.expected.stats b/tests/correctness/execution/conditional_string_equality_single_model.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/conditional_string_equality_single_model.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/implicit_variable.expected.stats b/tests/correctness/execution/implicit_variable.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/implicit_variable.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/main_absolut.expected.stats b/tests/correctness/execution/main_absolut.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/main_absolut.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/main_pyt.expected.stats b/tests/correctness/execution/main_pyt.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/main_pyt.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/main_swap.expected.stats b/tests/correctness/execution/main_swap.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/main_swap.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/optional_run.expected.stats b/tests/correctness/execution/optional_run.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/optional_run.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/python_augassign.expected.stats b/tests/correctness/execution/python_augassign.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/python_augassign.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/python_augassign_bad.expected.stats b/tests/correctness/execution/python_augassign_bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/python_augassign_bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/python_augassign_float.expected.stats b/tests/correctness/execution/python_augassign_float.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/python_augassign_float.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/python_augassign_types.expected.stats b/tests/correctness/execution/python_augassign_types.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/python_augassign_types.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/python_integrity.expected.stats b/tests/correctness/execution/python_integrity.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/python_integrity.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/python_integrity_should_be_ignored.expected.stats b/tests/correctness/execution/python_integrity_should_be_ignored.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/python_integrity_should_be_ignored.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/python_list.expected.stats b/tests/correctness/execution/python_list.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/python_list.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/python_set_empty_equality.expected.stats b/tests/correctness/execution/python_set_empty_equality.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/execution/python_set_empty_equality.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/execution/python_syntax_error_return.expected.stats b/tests/correctness/execution/python_syntax_error_return.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/python_syntax_error_return.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/python_syntax_error_through.expected.stats b/tests/correctness/execution/python_syntax_error_through.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/execution/python_syntax_error_through.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/execution/run_condition.expected.stats b/tests/correctness/execution/run_condition.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/execution/run_condition.expected.stats +++ b/tests/correctness/execution/run_condition.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/execution/warning_spurious2.expected.stats b/tests/correctness/execution/warning_spurious2.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/execution/warning_spurious2.expected.stats +++ b/tests/correctness/execution/warning_spurious2.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/expression/alternative_syntax/core.expected.stats b/tests/correctness/expression/alternative_syntax/core.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/alternative_syntax/core.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/alternative_syntax/lambda.expected.stats b/tests/correctness/expression/alternative_syntax/lambda.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/alternative_syntax/lambda.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/bad_equality.expected.stats b/tests/correctness/expression/bad_equality.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/expression/bad_equality.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/expression/lambda/deeper.expected.stats b/tests/correctness/expression/lambda/deeper.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/lambda/deeper.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/lambda/lambdas.expected.stats b/tests/correctness/expression/lambda/lambdas.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/lambda/lambdas.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/lambda/recursive.expected.stats b/tests/correctness/expression/lambda/recursive.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/lambda/recursive.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/lambda/zero_args.expected.stats b/tests/correctness/expression/lambda/zero_args.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/lambda/zero_args.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python.expected.stats b/tests/correctness/expression/python.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_bad_result.expected.stats b/tests/correctness/expression/python_bad_result.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_bad_result.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/bad.expected.stats b/tests/correctness/expression/python_extract/bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_extract/bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/basic.expected.stats b/tests/correctness/expression/python_extract/basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_extract/basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/binding_leak.expected.stats b/tests/correctness/expression/python_extract/binding_leak.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_extract/binding_leak.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/dynamic.expected.stats b/tests/correctness/expression/python_extract/dynamic.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/expression/python_extract/dynamic.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/expression/python_extract/set_input.expected.stats b/tests/correctness/expression/python_extract/set_input.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_extract/set_input.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/set_output.expected.stats b/tests/correctness/expression/python_extract/set_output.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_extract/set_output.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/set_projection.expected.stats b/tests/correctness/expression/python_extract/set_projection.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/expression/python_extract/set_projection.expected.stats +++ b/tests/correctness/expression/python_extract/set_projection.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/static.expected.stats b/tests/correctness/expression/python_extract/static.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_extract/static.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/succeeds.expected.stats b/tests/correctness/expression/python_extract/succeeds.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/expression/python_extract/succeeds.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/expression/python_extract/tuple_containing_bad.expected.stats b/tests/correctness/expression/python_extract/tuple_containing_bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_extract/tuple_containing_bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/python_extract/tuple_projection.expected.stats b/tests/correctness/expression/python_extract/tuple_projection.expected.stats index fc149c61..221ba7d1 100644 --- a/tests/correctness/expression/python_extract/tuple_projection.expected.stats +++ b/tests/correctness/expression/python_extract/tuple_projection.expected.stats @@ -1 +1,3 @@ models=1 +tight=true +choices=false diff --git a/tests/correctness/expression/python_multi_args.expected.stats b/tests/correctness/expression/python_multi_args.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/python_multi_args.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/tuple.expected.stats b/tests/correctness/expression/tuple.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/tuple.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/tuple_arity_mismatch.expected.stats b/tests/correctness/expression/tuple_arity_mismatch.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/tuple_arity_mismatch.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/tuple_extra.expected.stats b/tests/correctness/expression/tuple_extra.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/tuple_extra.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/expression/tuple_nested.expected.stats b/tests/correctness/expression/tuple_nested.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/expression/tuple_nested.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/basics.expected.stats b/tests/correctness/multimap/basics.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/basics.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/conditional_assign.expected.stats b/tests/correctness/multimap/conditional_assign.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/multimap/conditional_assign.expected.stats +++ b/tests/correctness/multimap/conditional_assign.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/multimap/equality.expected.stats b/tests/correctness/multimap/equality.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/equality.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/executions.expected.stats b/tests/correctness/multimap/executions.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/executions.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/find2.expected.stats b/tests/correctness/multimap/find2.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/find2.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/fold_i.expected.stats b/tests/correctness/multimap/fold_i.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/fold_i.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/main.expected.stats b/tests/correctness/multimap/main.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/main.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/max_entries.expected.stats b/tests/correctness/multimap/max_entries.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/max_entries.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/multimap/min_entries.expected.stats b/tests/correctness/multimap/min_entries.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/multimap/min_entries.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/optimization/label_int.expected.stats b/tests/correctness/optimization/label_int.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/label_int.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/label_string.expected.stats b/tests/correctness/optimization/label_string.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/label_string.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/no_multimap_bool.expected.stats b/tests/correctness/optimization/no_multimap_bool.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/no_multimap_bool.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/no_multimap_float.expected.stats b/tests/correctness/optimization/no_multimap_float.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/no_multimap_float.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/no_multimap_float_precision.expected.stats b/tests/correctness/optimization/no_multimap_float_precision.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/no_multimap_float_precision.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/no_multimap_int.expected.stats b/tests/correctness/optimization/no_multimap_int.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/no_multimap_int.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/no_multimap_labeled_values.expected.stats b/tests/correctness/optimization/no_multimap_labeled_values.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/no_multimap_labeled_values.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/optional_absent_linked_value.expected.stats b/tests/correctness/optimization/optional_absent_linked_value.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/optional_absent_linked_value.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/optimization/preferences.expected.stats b/tests/correctness/optimization/preferences.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/optimization/preferences.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/python/bad.expected.stats b/tests/correctness/python/bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/python/bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/python/dynamic.expected.stats b/tests/correctness/python/dynamic.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/python/dynamic.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/python/set_input.expected.stats b/tests/correctness/python/set_input.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/python/set_input.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/python/set_output.expected.stats b/tests/correctness/python/set_output.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/python/set_output.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/python/static.expected.stats b/tests/correctness/python/static.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/python/static.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/comparisons.expected.stats b/tests/correctness/set/comparisons.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/comparisons.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/conditional_assign.expected.stats b/tests/correctness/set/conditional_assign.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/set/conditional_assign.expected.stats +++ b/tests/correctness/set/conditional_assign.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/set/conditional_assign_dynamic.expected.stats b/tests/correctness/set/conditional_assign_dynamic.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/set/conditional_assign_dynamic.expected.stats +++ b/tests/correctness/set/conditional_assign_dynamic.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/set/conditional_base_domain.expected.stats b/tests/correctness/set/conditional_base_domain.expected.stats index 393a4fd1..7c34640a 100644 --- a/tests/correctness/set/conditional_base_domain.expected.stats +++ b/tests/correctness/set/conditional_base_domain.expected.stats @@ -1 +1,2 @@ models=24 +tight=true diff --git a/tests/correctness/set/diff_flat.expected.stats b/tests/correctness/set/diff_flat.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/diff_flat.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/eq_neq_flat.expected.stats b/tests/correctness/set/eq_neq_flat.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/eq_neq_flat.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/executions.expected.stats b/tests/correctness/set/executions.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/executions.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/fold_bools.expected.stats b/tests/correctness/set/fold_bools.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/fold_bools.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/from_domain.expected.stats b/tests/correctness/set/from_domain.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/set/from_domain.expected.stats +++ b/tests/correctness/set/from_domain.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/set/inter/variadic.expected.stats b/tests/correctness/set/inter/variadic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/inter/variadic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/inter_flat.expected.stats b/tests/correctness/set/inter_flat.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/inter_flat.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/iterations.expected.stats b/tests/correctness/set/iterations.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/iterations.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/length_flat.expected.stats b/tests/correctness/set/length_flat.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/length_flat.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/manipulation_flat.expected.stats b/tests/correctness/set/manipulation_flat.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/manipulation_flat.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/manipulations.expected.stats b/tests/correctness/set/manipulations.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/manipulations.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/membership_decomposed.expected.stats b/tests/correctness/set/membership_decomposed.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/membership_decomposed.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/membership_nested.expected.stats b/tests/correctness/set/membership_nested.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/membership_nested.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/membership_python.expected.stats b/tests/correctness/set/membership_python.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/membership_python.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/missing_declare_repair.expected.stats b/tests/correctness/set/missing_declare_repair.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/missing_declare_repair.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/nested.expected.stats b/tests/correctness/set/nested.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/set/nested.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/set/nondet_simple.expected.stats b/tests/correctness/set/nondet_simple.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/nondet_simple.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/overapprox_boundaries.expected.stats b/tests/correctness/set/overapprox_boundaries.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/overapprox_boundaries.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/same_val_multi_expr.expected.stats b/tests/correctness/set/same_val_multi_expr.expected.stats index 27a76f3b..2071f824 100644 --- a/tests/correctness/set/same_val_multi_expr.expected.stats +++ b/tests/correctness/set/same_val_multi_expr.expected.stats @@ -1 +1,2 @@ models=8 +tight=true diff --git a/tests/correctness/set/selfref.expected.stats b/tests/correctness/set/selfref.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/selfref.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/set_in_set_notin.expected.stats b/tests/correctness/set/set_in_set_notin.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/set_in_set_notin.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/set_make_flat.expected.stats b/tests/correctness/set/set_make_flat.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/set_make_flat.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/subset_flat.expected.stats b/tests/correctness/set/subset_flat.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/subset_flat.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/set/union_flat.expected.stats b/tests/correctness/set/union_flat.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/set/union_flat.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/bool/binary_ops.expected.stats b/tests/correctness/type/bool/binary_ops.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/bool/binary_ops.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/bool/has_value.expected.stats b/tests/correctness/type/bool/has_value.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/bool/has_value.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/bool/negation.expected.stats b/tests/correctness/type/bool/negation.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/bool/negation.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/bool/with_none_binary.expected.stats b/tests/correctness/type/bool/with_none_binary.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/bool/with_none_binary.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/bool/with_none_unary.expected.stats b/tests/correctness/type/bool/with_none_unary.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/bool/with_none_unary.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/checking/composed.expected.stats b/tests/correctness/type/checking/composed.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/checking/composed.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/checking/disabled_no_inference.expected.stats b/tests/correctness/type/checking/disabled_no_inference.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/checking/disabled_no_inference.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/checking/invalid.expected.stats b/tests/correctness/type/checking/invalid.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/checking/invalid.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/checking/membership_set_polymorphic.expected.stats b/tests/correctness/type/checking/membership_set_polymorphic.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/checking/membership_set_polymorphic.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/checking/numeric.expected.stats b/tests/correctness/type/checking/numeric.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/checking/numeric.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/checking/regression_guards.expected.stats b/tests/correctness/type/checking/regression_guards.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/checking/regression_guards.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/checking/set.expected.stats b/tests/correctness/type/checking/set.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/checking/set.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/checking/string_symbol.expected.stats b/tests/correctness/type/checking/string_symbol.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/checking/string_symbol.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/multimap/membership.expected.stats b/tests/correctness/type/multimap/membership.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/multimap/membership.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/multimap/operations.expected.stats b/tests/correctness/type/multimap/operations.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/multimap/operations.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/python_extract/non_deterministic_python_type_inference.expected.stats b/tests/correctness/type/python_extract/non_deterministic_python_type_inference.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/python_extract/non_deterministic_python_type_inference.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/python_extract/python_extract_type_inference.expected.stats b/tests/correctness/type/python_extract/python_extract_type_inference.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/python_extract/python_extract_type_inference.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/python_extract/python_inference_type_warnings.expected.stats b/tests/correctness/type/python_extract/python_inference_type_warnings.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/python_extract/python_inference_type_warnings.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/python_extract/type_inference_unknown_vs_no_type.expected.stats b/tests/correctness/type/python_extract/type_inference_unknown_vs_no_type.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/python_extract/type_inference_unknown_vs_no_type.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/statement_python/inference_warnings.expected.stats b/tests/correctness/type/statement_python/inference_warnings.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/statement_python/inference_warnings.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/statement_python/nondeterministic_inference.expected.stats b/tests/correctness/type/statement_python/nondeterministic_inference.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/statement_python/nondeterministic_inference.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/statement_python/typing.expected.stats b/tests/correctness/type/statement_python/typing.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/statement_python/typing.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/statement_python/unknown_vs_untyped.expected.stats b/tests/correctness/type/statement_python/unknown_vs_untyped.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/statement_python/unknown_vs_untyped.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/statement_python/unknown_vs_untyped_nondeterministic.expected.stats b/tests/correctness/type/statement_python/unknown_vs_untyped_nondeterministic.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/statement_python/unknown_vs_untyped_nondeterministic.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/variable/definition.expected.stats b/tests/correctness/type/variable/definition.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/variable/definition.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/variable/fromFacts.expected.stats b/tests/correctness/type/variable/fromFacts.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/variable/fromFacts.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/variadic/boolean_conj_disj.expected.stats b/tests/correctness/type/variadic/boolean_conj_disj.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/variadic/boolean_conj_disj.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/variadic/boolean_leqv_lxor.expected.stats b/tests/correctness/type/variadic/boolean_leqv_lxor.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/variadic/boolean_leqv_lxor.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/variadic/numeric.expected.stats b/tests/correctness/type/variadic/numeric.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/variadic/numeric.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/warning/python.expected.stats b/tests/correctness/type/warning/python.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/warning/python.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/type/warning/python_unsupported_type.expected.stats b/tests/correctness/type/warning/python_unsupported_type.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/type/warning/python_unsupported_type.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/type/warning/type.expected.stats b/tests/correctness/type/warning/type.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/type/warning/type.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/unit/bad/bad_eq.expected.stats b/tests/correctness/unit/bad/bad_eq.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/bad/bad_eq.expected.stats +++ b/tests/correctness/unit/bad/bad_eq.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/bad/bad_float_div.expected.stats b/tests/correctness/unit/bad/bad_float_div.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/bad/bad_float_div.expected.stats +++ b/tests/correctness/unit/bad/bad_float_div.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/bad/bad_geq.expected.stats b/tests/correctness/unit/bad/bad_geq.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/bad/bad_geq.expected.stats +++ b/tests/correctness/unit/bad/bad_geq.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/bad/bad_gt.expected.stats b/tests/correctness/unit/bad/bad_gt.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/bad/bad_gt.expected.stats +++ b/tests/correctness/unit/bad/bad_gt.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/bad/bad_leq.expected.stats b/tests/correctness/unit/bad/bad_leq.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/bad/bad_leq.expected.stats +++ b/tests/correctness/unit/bad/bad_leq.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/bad/bad_lt.expected.stats b/tests/correctness/unit/bad/bad_lt.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/bad/bad_lt.expected.stats +++ b/tests/correctness/unit/bad/bad_lt.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/bad/bad_max.expected.stats b/tests/correctness/unit/bad/bad_max.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/bad/bad_max.expected.stats +++ b/tests/correctness/unit/bad/bad_max.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/bad/bad_min.expected.stats b/tests/correctness/unit/bad/bad_min.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/bad/bad_min.expected.stats +++ b/tests/correctness/unit/bad/bad_min.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/bad/bad_neq.expected.stats b/tests/correctness/unit/bad/bad_neq.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/bad/bad_neq.expected.stats +++ b/tests/correctness/unit/bad/bad_neq.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/boolean/boolean_ite.expected.stats b/tests/correctness/unit/boolean/boolean_ite.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/boolean/boolean_ite.expected.stats +++ b/tests/correctness/unit/boolean/boolean_ite.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/boolean/boolean_limp.expected.stats b/tests/correctness/unit/boolean/boolean_limp.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/boolean/boolean_limp.expected.stats +++ b/tests/correctness/unit/boolean/boolean_limp.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.stats b/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.stats +++ b/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/equality_eq.expected.stats b/tests/correctness/unit/equality_eq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/equality_eq.expected.stats +++ b/tests/correctness/unit/equality_eq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/equality_neq.expected.stats b/tests/correctness/unit/equality_neq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/equality_neq.expected.stats +++ b/tests/correctness/unit/equality_neq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_eq.expected.stats b/tests/correctness/unit/float/float_eq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_eq.expected.stats +++ b/tests/correctness/unit/float/float_eq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_float_div.expected.stats b/tests/correctness/unit/float/float_float_div.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_float_div.expected.stats +++ b/tests/correctness/unit/float/float_float_div.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_geq.expected.stats b/tests/correctness/unit/float/float_geq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_geq.expected.stats +++ b/tests/correctness/unit/float/float_geq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_gt.expected.stats b/tests/correctness/unit/float/float_gt.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_gt.expected.stats +++ b/tests/correctness/unit/float/float_gt.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_int_div.expected.stats b/tests/correctness/unit/float/float_int_div.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_int_div.expected.stats +++ b/tests/correctness/unit/float/float_int_div.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_leq.expected.stats b/tests/correctness/unit/float/float_leq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_leq.expected.stats +++ b/tests/correctness/unit/float/float_leq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_lt.expected.stats b/tests/correctness/unit/float/float_lt.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_lt.expected.stats +++ b/tests/correctness/unit/float/float_lt.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_max.expected.stats b/tests/correctness/unit/float/float_max.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_max.expected.stats +++ b/tests/correctness/unit/float/float_max.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_min.expected.stats b/tests/correctness/unit/float/float_min.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_min.expected.stats +++ b/tests/correctness/unit/float/float_min.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/float/float_neq.expected.stats b/tests/correctness/unit/float/float_neq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/float/float_neq.expected.stats +++ b/tests/correctness/unit/float/float_neq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/int/int_geq.expected.stats b/tests/correctness/unit/int/int_geq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/int/int_geq.expected.stats +++ b/tests/correctness/unit/int/int_geq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/int/int_gt.expected.stats b/tests/correctness/unit/int/int_gt.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/int/int_gt.expected.stats +++ b/tests/correctness/unit/int/int_gt.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/int/int_leq.expected.stats b/tests/correctness/unit/int/int_leq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/int/int_leq.expected.stats +++ b/tests/correctness/unit/int/int_leq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/int/int_lt.expected.stats b/tests/correctness/unit/int/int_lt.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/int/int_lt.expected.stats +++ b/tests/correctness/unit/int/int_lt.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/int/int_max.expected.stats b/tests/correctness/unit/int/int_max.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/int/int_max.expected.stats +++ b/tests/correctness/unit/int/int_max.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/int/int_min.expected.stats b/tests/correctness/unit/int/int_min.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/int/int_min.expected.stats +++ b/tests/correctness/unit/int/int_min.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/nullary/python_python.expected.stats b/tests/correctness/unit/nullary/python_python.expected.stats index fc149c61..7c465d7f 100644 --- a/tests/correctness/unit/nullary/python_python.expected.stats +++ b/tests/correctness/unit/nullary/python_python.expected.stats @@ -1 +1,2 @@ models=1 +tight=true diff --git a/tests/correctness/unit/nullary/python_pythonExtract.expected.stats b/tests/correctness/unit/nullary/python_pythonExtract.expected.stats index fc149c61..7c465d7f 100644 --- a/tests/correctness/unit/nullary/python_pythonExtract.expected.stats +++ b/tests/correctness/unit/nullary/python_pythonExtract.expected.stats @@ -1 +1,2 @@ models=1 +tight=true diff --git a/tests/correctness/unit/python_python.expected.stats b/tests/correctness/unit/python_python.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/python_python.expected.stats +++ b/tests/correctness/unit/python_python.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/python_pythonExtract.expected.stats b/tests/correctness/unit/python_pythonExtract.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/python_pythonExtract.expected.stats +++ b/tests/correctness/unit/python_pythonExtract.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_diff.expected.stats b/tests/correctness/unit/set/set_diff.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_diff.expected.stats +++ b/tests/correctness/unit/set/set_diff.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_eq.expected.stats b/tests/correctness/unit/set/set_eq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_eq.expected.stats +++ b/tests/correctness/unit/set/set_eq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_inter.expected.stats b/tests/correctness/unit/set/set_inter.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_inter.expected.stats +++ b/tests/correctness/unit/set/set_inter.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_neq.expected.stats b/tests/correctness/unit/set/set_neq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_neq.expected.stats +++ b/tests/correctness/unit/set/set_neq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_set_isin.expected.stats b/tests/correctness/unit/set/set_set_isin.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_set_isin.expected.stats +++ b/tests/correctness/unit/set/set_set_isin.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_set_make.expected.stats b/tests/correctness/unit/set/set_set_make.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_set_make.expected.stats +++ b/tests/correctness/unit/set/set_set_make.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_set_notin.expected.stats b/tests/correctness/unit/set/set_set_notin.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_set_notin.expected.stats +++ b/tests/correctness/unit/set/set_set_notin.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_subset.expected.stats b/tests/correctness/unit/set/set_subset.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_subset.expected.stats +++ b/tests/correctness/unit/set/set_subset.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/set/set_union.expected.stats b/tests/correctness/unit/set/set_union.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/set/set_union.expected.stats +++ b/tests/correctness/unit/set/set_union.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/symbol/symbol_geq.expected.stats b/tests/correctness/unit/symbol/symbol_geq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/symbol/symbol_geq.expected.stats +++ b/tests/correctness/unit/symbol/symbol_geq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/symbol/symbol_gt.expected.stats b/tests/correctness/unit/symbol/symbol_gt.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/symbol/symbol_gt.expected.stats +++ b/tests/correctness/unit/symbol/symbol_gt.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/symbol/symbol_leq.expected.stats b/tests/correctness/unit/symbol/symbol_leq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/symbol/symbol_leq.expected.stats +++ b/tests/correctness/unit/symbol/symbol_leq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/symbol/symbol_lt.expected.stats b/tests/correctness/unit/symbol/symbol_lt.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/symbol/symbol_lt.expected.stats +++ b/tests/correctness/unit/symbol/symbol_lt.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/tuple_eq.expected.stats b/tests/correctness/unit/tuple_eq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/tuple_eq.expected.stats +++ b/tests/correctness/unit/tuple_eq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/tuple_neq.expected.stats b/tests/correctness/unit/tuple_neq.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/tuple_neq.expected.stats +++ b/tests/correctness/unit/tuple_neq.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/unary/bad_hasValue.expected.stats b/tests/correctness/unit/unary/bad_hasValue.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/unary/bad_hasValue.expected.stats +++ b/tests/correctness/unit/unary/bad_hasValue.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/unary/boolean_hasValue.expected.stats b/tests/correctness/unit/unary/boolean_hasValue.expected.stats index 1c974a68..d6103307 100644 --- a/tests/correctness/unit/unary/boolean_hasValue.expected.stats +++ b/tests/correctness/unit/unary/boolean_hasValue.expected.stats @@ -1 +1,2 @@ models=4 +tight=true diff --git a/tests/correctness/unit/unary/float_minus.expected.stats b/tests/correctness/unit/unary/float_minus.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/unary/float_minus.expected.stats +++ b/tests/correctness/unit/unary/float_minus.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/unit/unary/set_length.expected.stats b/tests/correctness/unit/unary/set_length.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/unit/unary/set_length.expected.stats +++ b/tests/correctness/unit/unary/set_length.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/variable/conditional_domain_bad_propagation.expected.stats b/tests/correctness/variable/conditional_domain_bad_propagation.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/variable/conditional_domain_bad_propagation.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/variable/direct_bad_propagation.expected.stats b/tests/correctness/variable/direct_bad_propagation.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/variable/direct_bad_propagation.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/variable/flexible_domain.expected.stats b/tests/correctness/variable/flexible_domain.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/variable/flexible_domain.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/variable/main.expected.stats b/tests/correctness/variable/main.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/variable/main.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/variable/missing_domain_bad.expected.stats b/tests/correctness/variable/missing_domain_bad.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/variable/missing_domain_bad.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/variable/parallel_declaration.expected.stats b/tests/correctness/variable/parallel_declaration.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/variable/parallel_declaration.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/variable/same_val_multi_expr.expected.stats b/tests/correctness/variable/same_val_multi_expr.expected.stats index 1390a335..9a9583f7 100644 --- a/tests/correctness/variable/same_val_multi_expr.expected.stats +++ b/tests/correctness/variable/same_val_multi_expr.expected.stats @@ -1 +1,2 @@ models=3 +tight=true diff --git a/tests/correctness/warning/bad.expected.stats b/tests/correctness/warning/bad.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/warning/bad.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/warning/bad_interface.expected.stats b/tests/correctness/warning/bad_interface.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/bad_interface.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/fake_forbid.expected.stats b/tests/correctness/warning/fake_forbid.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/warning/fake_forbid.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/warning/forbid_labeled.expected.stats b/tests/correctness/warning/forbid_labeled.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/forbid_labeled.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/ignore.expected.stats b/tests/correctness/warning/ignore.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/ignore.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/ignore_labeled.expected.stats b/tests/correctness/warning/ignore_labeled.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/warning/ignore_labeled.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/warning/mutually_exclusive_declarations.expected.stats b/tests/correctness/warning/mutually_exclusive_declarations.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/warning/mutually_exclusive_declarations.expected.stats +++ b/tests/correctness/warning/mutually_exclusive_declarations.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/warning/python_extract/statement_error.expected.stats b/tests/correctness/warning/python_extract/statement_error.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/warning/python_extract/statement_error.expected.stats +++ b/tests/correctness/warning/python_extract/statement_error.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/warning/python_extract/undeclared_variable.expected.stats b/tests/correctness/warning/python_extract/undeclared_variable.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/python_extract/undeclared_variable.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/raise/basic.expected.stats b/tests/correctness/warning/raise/basic.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/raise/basic.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/raise/controls.expected.stats b/tests/correctness/warning/raise/controls.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/warning/raise/controls.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/warning/raise/dynamic.expected.stats b/tests/correctness/warning/raise/dynamic.expected.stats index 9e41aaf6..c1a2d2c9 100644 --- a/tests/correctness/warning/raise/dynamic.expected.stats +++ b/tests/correctness/warning/raise/dynamic.expected.stats @@ -1 +1,2 @@ models=2 +tight=true diff --git a/tests/correctness/warning/statement/control.expected.stats b/tests/correctness/warning/statement/control.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/statement/control.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/statement/decl_lists.expected.stats b/tests/correctness/warning/statement/decl_lists.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/statement/decl_lists.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/statement/python.expected.stats b/tests/correctness/warning/statement/python.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/statement/python.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/statement/structure.expected.stats b/tests/correctness/warning/statement/structure.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/statement/structure.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/syntax.expected.stats b/tests/correctness/warning/syntax.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/syntax.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/variable/confusing_name.expected.stats b/tests/correctness/warning/variable/confusing_name.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/variable/confusing_name.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/variable/empty_domain.expected.stats b/tests/correctness/warning/variable/empty_domain.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/variable/empty_domain.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/variable/reserved_name.expected.stats b/tests/correctness/warning/variable/reserved_name.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/warning/variable/reserved_name.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/warning/variable/undeclared.expected.stats b/tests/correctness/warning/variable/undeclared.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/warning/variable/undeclared.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/correctness/warning/variable/undeclared_statement.expected.stats b/tests/correctness/warning/variable/undeclared_statement.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/warning/variable/undeclared_statement.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/warning/variables.expected.stats b/tests/correctness/warning/variables.expected.stats new file mode 100644 index 00000000..3e86c7e7 --- /dev/null +++ b/tests/correctness/warning/variables.expected.stats @@ -0,0 +1 @@ +tight=true diff --git a/tests/flat_ch/test_correctness.py b/tests/flat_ch/test_correctness.py index 04c9479e..8e82d1d4 100644 --- a/tests/flat_ch/test_correctness.py +++ b/tests/flat_ch/test_correctness.py @@ -76,6 +76,7 @@ def generate_flat_ch_files() -> None: "core/conditional_assign", "core/reasoning_modes", "core/reasoning_modes_with_show", + "core/set_execution_input_alias", "expression/python_bad_result", "expression/python_extract/basic", "expression/python_extract/tuple_containing_bad", diff --git a/tests/performance/float/addition.lp b/tests/performance/float/addition.lp index d4e41e46..2cb9b7b7 100644 --- a/tests/performance/float/addition.lp +++ b/tests/performance/float/addition.lp @@ -1,4 +1,4 @@ #include "input.lp". variable_define(result(0),variable(input)). -variable_define(result(I),operation(add,(variable(result(I-1)),(val(float,float("0.125")),())))) :- step(I). \ No newline at end of file +variable_define(result(I),operation(add,(variable(result(I-1)),(val(float,float("0.125")),())))) :- step(I). diff --git a/tests/performance/float/cancellation.lp b/tests/performance/float/cancellation.lp index cdd33ca1..ce4df83a 100644 --- a/tests/performance/float/cancellation.lp +++ b/tests/performance/float/cancellation.lp @@ -2,4 +2,4 @@ variable_define(result(0),variable(input)). variable_define(shifted(I),operation(add,(variable(result(I-1)),(val(int,1048576),())))) :- step(I). -variable_define(result(I),operation(sub,(variable(shifted(I)),(val(int,1048576),())))) :- step(I). \ No newline at end of file +variable_define(result(I),operation(sub,(variable(shifted(I)),(val(int,1048576),())))) :- step(I). diff --git a/tests/performance/float/comparisons.lp b/tests/performance/float/comparisons.lp index 1c7b4083..baf2e1ca 100644 --- a/tests/performance/float/comparisons.lp +++ b/tests/performance/float/comparisons.lp @@ -5,4 +5,4 @@ variable_define(result(Operator,Index),operation(Operator,(Left,(Right,())))) :- Left = operation(add,(variable(input),(val(int,Index),()))), Right = operation(add,(Left,(val(float,float("0.000000001")),()))). variable_define(equal(Index),operation(eq,(Operand,(Operand,())))) :- - step(Index), Operand = operation(add,(variable(input),(val(int,Index),()))). \ No newline at end of file + step(Index), Operand = operation(add,(variable(input),(val(int,Index),()))). diff --git a/tests/performance/float/division.lp b/tests/performance/float/division.lp index e067985f..9915c98f 100644 --- a/tests/performance/float/division.lp +++ b/tests/performance/float/division.lp @@ -3,4 +3,4 @@ variable_define(recovered(Index),operation(mult,(Quotient,(val(int,30),())))) :- step(Index), Numerator = operation(add,(variable(input),(val(int,Index),()))), - Quotient = operation(float_div,(Numerator,(val(int,30),()))). \ No newline at end of file + Quotient = operation(float_div,(Numerator,(val(int,30),()))). diff --git a/tests/performance/float/input.lp b/tests/performance/float/input.lp index 204164e4..47c4841b 100644 --- a/tests/performance/float/input.lp +++ b/tests/performance/float/input.lp @@ -6,4 +6,4 @@ variable_domain(input,val(float,float("-0.75"))). variable_domain(input,val(float,float("0.9666666666666667"))). variable_domain(input,val(float,float("1.25"))). -#show value/2. \ No newline at end of file +#show value/2. diff --git a/tests/performance/float/multiplication.lp b/tests/performance/float/multiplication.lp index d7f6f915..b66f06cc 100644 --- a/tests/performance/float/multiplication.lp +++ b/tests/performance/float/multiplication.lp @@ -1,4 +1,4 @@ #include "input.lp". variable_define(fractional(Index),operation(mult,(Product,(val(float,float("1.125")),())))) :- - step(Index), Product = operation(mult,(variable(input),(val(int,Index),()))). \ No newline at end of file + step(Index), Product = operation(mult,(variable(input),(val(int,Index),()))). diff --git a/tests/performance/float/sqrt.lp b/tests/performance/float/sqrt.lp index 8a535a6a..45ac9c98 100644 --- a/tests/performance/float/sqrt.lp +++ b/tests/performance/float/sqrt.lp @@ -3,4 +3,4 @@ variable_define(squared(Index),operation(mult,(Root,(Root,())))) :- step(Index), Argument = operation(add,(variable(input),(val(int,Index),()))), - Root = operation(sqrt,(Argument,())). \ No newline at end of file + Root = operation(sqrt,(Argument,())). diff --git a/tests/performance/float/trigonometry.lp b/tests/performance/float/trigonometry.lp index 6927b745..7e0f963e 100644 --- a/tests/performance/float/trigonometry.lp +++ b/tests/performance/float/trigonometry.lp @@ -6,4 +6,4 @@ variable_define(result(Index),operation(add,(SineSquared,(CosineSquared,())))) : Sine = operation(sin,(Angle,())), Cosine = operation(cos,(Angle,())), SineSquared = operation(mult,(Sine,(Sine,()))), - CosineSquared = operation(mult,(Cosine,(Cosine,()))). \ No newline at end of file + CosineSquared = operation(mult,(Cosine,(Cosine,()))). diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 3356f07e..76047369 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -1,6 +1,5 @@ import pytest -import constraint_handler import constraint_handler.engine as engine import tests.utils.testing as chut diff --git a/tests/test_performance_engines.py b/tests/test_performance_engines.py index 1e02f004..75d6c692 100644 --- a/tests/test_performance_engines.py +++ b/tests/test_performance_engines.py @@ -120,9 +120,11 @@ def benchmark_param(benchmark_case: PerformanceBenchmark, engine: Engine, marks: benchmark_param( benchmark_case, engine, - marks=(pytest.mark.skip(reason="FCH does not support native sin/cos operators"),) - if engine == fch and benchmark_case.program_name == "float/trigonometry" - else (), + marks=( + (pytest.mark.skip(reason="FCH does not support native sin/cos operators"),) + if engine == fch and benchmark_case.program_name == "float/trigonometry" + else () + ), ) for engine in (compile, compile2, fch, ground, propagator, propagator_check) for benchmark_case in float_benchmarks From c61216e19ea829c2421ce12230aba30cf6ae9905 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Thu, 19 Nov 2026 16:58:18 +1100 Subject: [PATCH 04/13] Avoid some unnecessary tuple-related choices in compile2 and improve its grounding sometimes --- .../data/6_solve/compile2/tuple.lp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/constraint_handler/data/6_solve/compile2/tuple.lp b/src/constraint_handler/data/6_solve/compile2/tuple.lp index 41ff961d..2dbecf01 100644 --- a/src/constraint_handler/data/6_solve/compile2/tuple.lp +++ b/src/constraint_handler/data/6_solve/compile2/tuple.lp @@ -1,11 +1,11 @@ -_tuple_value_index(Tuple, TupleValue, Idx, Value) :- - _se_value(Tuple, TupleValue), +_tuple_domain_index(Tuple, TupleValue, Idx, Value) :- + _se_domain(Tuple, TupleValue), _expression_tupleIndex(compile2, Tuple, Idx, _), (function, (), _, Args) = @pythonReify(TupleValue), (Idx, Value) = @pythonEnumerateElements(Args). _tuple_set_component(Tuple, TupleValue, Idx, Arg, SetValue) :- - _tuple_value_index(Tuple, TupleValue, Idx, SetValue), + _tuple_domain_index(Tuple, TupleValue, Idx, SetValue), _expression_tupleIndex(compile2, Tuple, Idx, Arg), _se_is_set(Arg). @@ -17,28 +17,28 @@ _tuple_set_value_matches_uid(Arg, SetValue, Uid) :- _tuple_set_component(_, _, _, Arg, SetValue), _se_set_domain_symbol(Arg, Uid, SetValue). -:- - _tuple_value_index(Tuple, TupleValue, Idx, Value), +:- _se_value(Tuple, TupleValue), + _tuple_domain_index(Tuple, TupleValue, Idx, Value), _expression_tupleIndex(compile2, Tuple, Idx, Arg), not _se_is_set(Arg), not _se_value(Arg, Value). -:- - _tuple_value_index(Tuple, TupleValue, Idx, SetValue), +:- _se_value(Tuple, TupleValue), + _tuple_domain_index(Tuple, TupleValue, Idx, SetValue), _expression_tupleIndex(compile2, Tuple, Idx, Arg), _se_is_set(Arg), not _tuple_set_value_matches_uid(Arg, SetValue, _). -:- - _tuple_value_index(Tuple, TupleValue, Idx, SetValue), +:- _se_value(Tuple, TupleValue), + _tuple_domain_index(Tuple, TupleValue, Idx, SetValue), _expression_tupleIndex(compile2, Tuple, Idx, Arg), _se_is_set(Arg), _tuple_set_value_matches_uid(Arg, SetValue, Uid), _se_set_domain(Uid, pos, Value), not _set_contains(Arg, Value). -:- - _tuple_value_index(Tuple, TupleValue, Idx, SetValue), +:- _se_value(Tuple, TupleValue), + _tuple_domain_index(Tuple, TupleValue, Idx, SetValue), _expression_tupleIndex(compile2, Tuple, Idx, Arg), _se_is_set(Arg), _tuple_set_value_matches_uid(Arg, SetValue, Uid), From a1b44d2f5304137b2e0c20c250829b667bbd5d8c Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Thu, 19 Nov 2026 17:13:06 +1100 Subject: [PATCH 05/13] Reduce choices and tightness issues in ground engine but some failures remain --- src/constraint_handler/data/6_solve/ground/gringoEval.lp | 5 ++--- tests/investigate/tuple_domain_grounding.lp | 6 ++++++ 2 files changed, 8 insertions(+), 3 deletions(-) create mode 100644 tests/investigate/tuple_domain_grounding.lp diff --git a/src/constraint_handler/data/6_solve/ground/gringoEval.lp b/src/constraint_handler/data/6_solve/ground/gringoEval.lp index 1816e862..b70e4cd9 100644 --- a/src/constraint_handler/data/6_solve/ground/gringoEval.lp +++ b/src/constraint_handler/data/6_solve/ground/gringoEval.lp @@ -9,7 +9,7 @@ _expression(ground,E) :- _passed(ground,LBL,share_value(E)). %%%%%%%%%%%%%%%%% variable_define/3 _ge_assign(X,E) :- _passed(ground,LBL,variable_define(X,E,C)), ge_result(C,val(bool,true)). -_expression(ground,C) :- _passed(ground,LBL,set_assign(X,E,C)). +_expression(ground,(E;C)) :- _passed(ground,LBL,set_assign(X,E,C)). _ge_set_assign(X,E) :- _passed(ground,LBL,set_assign(X,E,C)), _se_value(C,val(bool,true)). _ge_set_declare(X) :- _passed(ground,LBL,variable_declare(X,set,C)), ge_result(C,val(bool,true)). %%% TODO: make sure set assign doesn't get broken down across different engines @@ -35,8 +35,7 @@ _se_value(variable(X),T) :- ge_value(X,T), true=@pythonIsTuple(T). % TODO: fragi _variable(ground,X) :- _expression(ground,EXPR), X=@pythonExpressionVariable(EXPR). %_direct_implode(variable(X)) :- _expression(ground,EXPR), X=@pythonExpressionVariable(EXPR). -_direct_implode(variable(X)) :- _variable(ground,X), _se_value(variable(X),V). -ge_value(X,VAL) :- _variable(ground,X), _se_value(variable(X),val(T,V)), _direct_imploded(variable(X),VAL). +ge_value(X,val(T,V)) :- _variable(ground,X), _se_value(variable(X),val(T,V)). _ge_setAssignsAux(X,#inf,()) :- _ge_set_declare(X). diff --git a/tests/investigate/tuple_domain_grounding.lp b/tests/investigate/tuple_domain_grounding.lp new file mode 100644 index 00000000..e8b3eb37 --- /dev/null +++ b/tests/investigate/tuple_domain_grounding.lp @@ -0,0 +1,6 @@ +variable_declare(pool,set). +set_baseDomain(pool,val(int,1..3)). +ensure(operation(set_isin,(val(int,1),(variable(pool),())))). +ensure(operation(set_notin,(val(int,N),(variable(pool),())))) :- N=2..3. +variable_define(out,(val(string,"pool"),variable(pool))). +#show value/2. \ No newline at end of file From d7977f774daa2a443cf59e30a028bce2ec18840e Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Thu, 19 Nov 2026 17:56:57 +1100 Subject: [PATCH 06/13] Improve ground engine encoding a bit more --- src/constraint_handler/data/6_solve/README.md | 2 +- .../data/6_solve/finiteDomain.lp | 2 +- .../data/6_solve/ground/README.md | 6 ++-- .../data/6_solve/ground/gringoEval.lp | 30 ++++++++----------- 4 files changed, 16 insertions(+), 24 deletions(-) diff --git a/src/constraint_handler/data/6_solve/README.md b/src/constraint_handler/data/6_solve/README.md index 8d2bc85d..d043833c 100644 --- a/src/constraint_handler/data/6_solve/README.md +++ b/src/constraint_handler/data/6_solve/README.md @@ -13,7 +13,7 @@ _optimize_component/7. ### Output predicates -_ge_assign/2. +_ge_domain_value/2. _se_value/2. _passed(compile,LBL,DECL). _passed(compile2,LBL,DECL). diff --git a/src/constraint_handler/data/6_solve/finiteDomain.lp b/src/constraint_handler/data/6_solve/finiteDomain.lp index bc92d78b..a5e7824d 100644 --- a/src/constraint_handler/data/6_solve/finiteDomain.lp +++ b/src/constraint_handler/data/6_solve/finiteDomain.lp @@ -28,7 +28,7 @@ _passed(ground,LBL,ensure(operation(neq,(variable(X),(E,()))))) :- _finiteDomain *% 1 { _se_value(variable(X),V) : _passed(compile,LBL1,variable_domain(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V); - _ge_assign(X,V) : _passed(ground,LBL1,variable_domain(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V); + _ge_domain_value(X,V) : _passed(ground,LBL1,variable_domain(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V); _variable_emptyDomain(X) } 1 :- _passed((compile;ground),LBL,variable_declare(X,fromFacts,COND)), _se_value(COND,val(bool,true)). diff --git a/src/constraint_handler/data/6_solve/ground/README.md b/src/constraint_handler/data/6_solve/ground/README.md index 1428526c..91611738 100644 --- a/src/constraint_handler/data/6_solve/ground/README.md +++ b/src/constraint_handler/data/6_solve/ground/README.md @@ -8,7 +8,7 @@ _passed(ground,LBL,variable_define/3). _passed(ground,LBL,variable_domain/3). _passed(ground,LBL,set_assign/3). _passed(ground,LBL,share_value/1). -_direct_imploded/2. +_ge_domain_value/2. _main_solverIdentifiers/1. ### Intermediate predicates @@ -16,7 +16,7 @@ _main_solverIdentifiers/1. _expression(ground,EXPR). _ge_set_assign/2. _ge_set_declare/1. -ge_value/2. +_ge_value/2. _variable(ground,VAR). _ge_setAssignsAux/3. _ge_setAssigns/2. @@ -28,8 +28,6 @@ ge_result/2. ### Output predicates -_ge_assign/2. _se_value/2. _set_assign/2. -_direct_implode/1. _warning/3. diff --git a/src/constraint_handler/data/6_solve/ground/gringoEval.lp b/src/constraint_handler/data/6_solve/ground/gringoEval.lp index b70e4cd9..c0f37cf0 100644 --- a/src/constraint_handler/data/6_solve/ground/gringoEval.lp +++ b/src/constraint_handler/data/6_solve/ground/gringoEval.lp @@ -7,35 +7,29 @@ _expression(ground,(E;C)) :- _passed(ground,LBL,variable_domain(X,E,C)). _expression(ground,E) :- _passed(ground,LBL,share_value(E)). %%%%%%%%%%%%%%%%% variable_define/3 -_ge_assign(X,E) :- _passed(ground,LBL,variable_define(X,E,C)), ge_result(C,val(bool,true)). +_ge_value(X,V) :- _passed(ground,LBL,variable_define(X,E,C)), ge_result(C,val(bool,true)), ge_result(E,V). _expression(ground,(E;C)) :- _passed(ground,LBL,set_assign(X,E,C)). -_ge_set_assign(X,E) :- _passed(ground,LBL,set_assign(X,E,C)), _se_value(C,val(bool,true)). +_ge_set_assign(X,V) :- _passed(ground,LBL,set_assign(X,E,C)), _se_value(C,val(bool,true)), ge_result(E,V). _ge_set_declare(X) :- _passed(ground,LBL,variable_declare(X,set,C)), ge_result(C,val(bool,true)). %%% TODO: make sure set assign doesn't get broken down across different engines -ge_value(X,V) :- _ge_assign(X,EXPR), ge_result(EXPR,V). -ge_value(X,bad) :- _ge_assign(X,EXPR), _se_value(EXPR,bad). +_ge_value(X,V) :- _ge_domain_value(X,V). -_expression(ground,EXPR) :- _ge_assign(X,EXPR). - -%_ge_nonImploded(X) :- ge_value(X,set(S)). -%_ge_nonImploded(X) :- ge_value(X,multimap(M)). - -_se_value(variable(X),val(T,V)) :- ge_value(X,val(T,V)). -_se_value(variable(X),bad) :- ge_value(X,bad). +_se_value(variable(X),val(T,V)) :- _ge_value(X,val(T,V)). +_se_value(variable(X),bad) :- _ge_value(X,bad). _se_value(variable(X),bad) :- ge_result(variable(X),bad). -_se_value(variable(X),ref(set,variable(X))) :- ge_value(X,set(S)). -_set_assign(variable(X),VAL) :- ge_value(X,set(S)), VAL=@pythonListElements(S). +_se_value(variable(X),ref(set,variable(X))) :- _ge_value(X,set(S)). +_set_assign(variable(X),VAL) :- _ge_value(X,set(S)), VAL=@pythonListElements(S). _se_value(operation(OP,ARGS),V) :- ge_result(operation(OP,ARGS),V). _se_value(val(T,V),val(T,V)) :- _expression(ground,val(T,V)). -_se_value(variable(X),T) :- ge_value(X,T), true=@pythonIsTuple(T). % TODO: fragile and probably incorrect! +_se_value(variable(X),T) :- _ge_value(X,T), true=@pythonIsTuple(T). % TODO: fragile and probably incorrect! _variable(ground,X) :- _expression(ground,EXPR), X=@pythonExpressionVariable(EXPR). %_direct_implode(variable(X)) :- _expression(ground,EXPR), X=@pythonExpressionVariable(EXPR). -ge_value(X,val(T,V)) :- _variable(ground,X), _se_value(variable(X),val(T,V)). +_ge_value(X,val(T,V)) :- _variable(ground,X), _se_value(variable(X),val(T,V)). _ge_setAssignsAux(X,#inf,()) :- _ge_set_declare(X). @@ -44,13 +38,13 @@ _ge_setAssignsAux(X,F,(F,L)) :- _ge_setAssignsAux(X,E,L), _ge_set_assign(X,F), E _ge_setAssigns(X,L) :- _ge_setAssignsAux(X,E,L), 0 = #count { G : _ge_set_assign(X,G), E < G }. -_ge_assign(X,set(L)) :- _ge_set_declare(X), _ge_setAssigns(X,L). +_ge_value(X,set(L)) :- _ge_set_declare(X), _ge_setAssigns(X,L). _ge_enumeratedVariables(EXPR,R) :- _expression(ground,EXPR), R=@pythonEnumerateVariables(EXPR). _ge_mapAux(EXPR,N,()) :- _ge_enumeratedVariables(EXPR,length(N)). -_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), ge_value(X,V). -_ge_mapAux(EXPR,I,((X,bad),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), not ge_value(X,_). +_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _ge_value(X,V). +_ge_mapAux(EXPR,I,((X,bad),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), not _ge_value(X,_). %_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _direct_imploded(variable(X),V). _ge_mapped(EXPR,M) :- _ge_mapAux(EXPR,0,M). From 6b5869ff7dcb828778913cfc87fcc4a0cba0c50c Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Fri, 20 Nov 2026 11:21:12 +1100 Subject: [PATCH 07/13] Remove choices from expectations for propagator engines --- tests/test_encoding.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 76047369..fd25d948 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -11,6 +11,8 @@ def run_test(name: str, selected_engine: engine.Engine): name = "tests/correctness/" + name expectations, expected_stats = chut.build_expectations(name) + if selected_engine in (engine.propagator, engine.propagator_check): + expected_stats.pop("choices", None) assert expectations, f"Missing expectations: {name}" for test, extra_args in expectations: options = ctrl_options + extra_args From 1ac56b771fb3a83436ba91b27ab52ca430e22cbb Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Fri, 20 Nov 2026 11:32:19 +1100 Subject: [PATCH 08/13] Add test for python_extract / set of compound element interaction --- .../python_extract/set_compound_input.expected.all | 2 ++ .../expression/python_extract/set_compound_input.lp | 12 ++++++++++++ tests/flat_ch/test_correctness.py | 1 + tests/test_encoding.py | 4 ++++ 4 files changed, 19 insertions(+) create mode 100644 tests/correctness/expression/python_extract/set_compound_input.expected.all create mode 100644 tests/correctness/expression/python_extract/set_compound_input.lp diff --git a/tests/correctness/expression/python_extract/set_compound_input.expected.all b/tests/correctness/expression/python_extract/set_compound_input.expected.all new file mode 100644 index 00000000..e3109b4b --- /dev/null +++ b/tests/correctness/expression/python_extract/set_compound_input.expected.all @@ -0,0 +1,2 @@ +value(nested_sum,val(int,5)) +value(tuple_sum,val(int,5)) \ No newline at end of file diff --git a/tests/correctness/expression/python_extract/set_compound_input.lp b/tests/correctness/expression/python_extract/set_compound_input.lp new file mode 100644 index 00000000..3afd35fd --- /dev/null +++ b/tests/correctness/expression/python_extract/set_compound_input.lp @@ -0,0 +1,12 @@ +variable_declare(inner,set). +set_assign(inner,val(int,2)). +set_assign(inner,val(int,3)). + +variable_declare(nested,set). +set_assign(nested,variable(inner)). + +variable_declare(pairs,set). +set_assign(pairs,(val(int,2),val(int,3))). + +variable_define(nested_sum,operation(pythonExtract("","sum(sum(member) for member in pool)"),((val(string,"pool"),variable(nested)),()))). +variable_define(tuple_sum,operation(pythonExtract("","sum(sum(member) for member in pool)"),((val(string,"pool"),variable(pairs)),()))). \ No newline at end of file diff --git a/tests/flat_ch/test_correctness.py b/tests/flat_ch/test_correctness.py index 8e82d1d4..9f5e4fb0 100644 --- a/tests/flat_ch/test_correctness.py +++ b/tests/flat_ch/test_correctness.py @@ -252,6 +252,7 @@ def generate_flat_ch_files() -> None: "expression/python_extract/bad", "expression/python_extract/binding_leak", "expression/python_extract/dynamic", + "expression/python_extract/set_compound_input", "expression/python_extract/set_input", "expression/python_extract/set_output", "expression/python_extract/set_projection", diff --git a/tests/test_encoding.py b/tests/test_encoding.py index fd25d948..e0ca2111 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -280,6 +280,7 @@ def run_test(name: str, selected_engine: engine.Engine): "expression/python_extract/basic", "expression/python_extract/binding_leak", "expression/python_extract/dynamic", + "expression/python_extract/set_compound_input", "expression/python_extract/set_input", "expression/python_extract/set_output", "expression/python_extract/set_projection", @@ -537,6 +538,7 @@ def run_test(name: str, selected_engine: engine.Engine): "datatype/float/pow/mixed", "datatype/int/int_div/negative", "engine/request", + "expression/python_extract/set_compound_input", "expression/tuple_extra", "execution/python_syntax_error", "execution/warning_spurious", @@ -571,6 +573,7 @@ def run_test(name: str, selected_engine: engine.Engine): "engine/request_set_ref", # mixed engines? "expression/alternative_syntax/lambda", "expression/python_extract/basic", + "expression/python_extract/set_compound_input", "expression/python_extract/set_input", "expression/python_extract/static", "expression/python_extract/tuple_containing_bad", @@ -619,6 +622,7 @@ def run_test(name: str, selected_engine: engine.Engine): "expression/lambda/lambdas", "expression/lambda/recursive", "expression/lambda/zero_args", + "expression/python_extract/set_compound_input", "expression/tuple_extra", "execution/python_syntax_error", "execution/warning_spurious", From e53ee4b07e3b4afab1b53a15f7dfddd3ea8d8212 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Fri, 20 Nov 2026 11:38:05 +1100 Subject: [PATCH 09/13] Clean-up ground engine implementation --- src/constraint_handler/data/6_solve/README.md | 1 - .../data/6_solve/finiteDomain.lp | 3 +- .../data/6_solve/ground/README.md | 20 ++++-- .../data/6_solve/ground/gringoEval.lp | 72 +++++++++---------- tests/test_encoding.py | 1 - 5 files changed, 48 insertions(+), 49 deletions(-) diff --git a/src/constraint_handler/data/6_solve/README.md b/src/constraint_handler/data/6_solve/README.md index d043833c..4bb0d7e4 100644 --- a/src/constraint_handler/data/6_solve/README.md +++ b/src/constraint_handler/data/6_solve/README.md @@ -13,7 +13,6 @@ _optimize_component/7. ### Output predicates -_ge_domain_value/2. _se_value/2. _passed(compile,LBL,DECL). _passed(compile2,LBL,DECL). diff --git a/src/constraint_handler/data/6_solve/finiteDomain.lp b/src/constraint_handler/data/6_solve/finiteDomain.lp index a5e7824d..53692ae0 100644 --- a/src/constraint_handler/data/6_solve/finiteDomain.lp +++ b/src/constraint_handler/data/6_solve/finiteDomain.lp @@ -27,8 +27,7 @@ _passed(ground,LBL,variable_define(X,E,val(bool,true))) :- _finiteDomain_variabl _passed(ground,LBL,ensure(operation(neq,(variable(X),(E,()))))) :- _finiteDomain_variable(ground,LBL,X), not _variable_guess(X,IDX), _variable_indexedDomain(X,E,IDX). *% -1 { _se_value(variable(X),V) : _passed(compile,LBL1,variable_domain(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V); - _ge_domain_value(X,V) : _passed(ground,LBL1,variable_domain(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V); +1 { _se_value(variable(X),V) : _passed((compile;ground),LBL1,variable_domain(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V); _variable_emptyDomain(X) } 1 :- _passed((compile;ground),LBL,variable_declare(X,fromFacts,COND)), _se_value(COND,val(bool,true)). diff --git a/src/constraint_handler/data/6_solve/ground/README.md b/src/constraint_handler/data/6_solve/ground/README.md index 91611738..5a30c021 100644 --- a/src/constraint_handler/data/6_solve/ground/README.md +++ b/src/constraint_handler/data/6_solve/ground/README.md @@ -8,26 +8,32 @@ _passed(ground,LBL,variable_define/3). _passed(ground,LBL,variable_domain/3). _passed(ground,LBL,set_assign/3). _passed(ground,LBL,share_value/1). -_ge_domain_value/2. +_se_value/2. +_set_contains/2. +_set_index/3. +_set_lastIndex/2. _main_solverIdentifiers/1. ### Intermediate predicates _expression(ground,EXPR). -_ge_set_assign/2. -_ge_set_declare/1. _ge_value/2. _variable(ground,VAR). -_ge_setAssignsAux/3. -_ge_setAssigns/2. +_ge_eval_expression/1. +_ge_expand/1. +_ge_reduced/2. +_ge_tuple/3. +_ge_set_list/3. +_ge_tuple_list/3. _ge_enumeratedVariables/2. _ge_mapAux/3. _ge_mapped/2. _ge_eval_exec/3. -ge_result/2. ### Output predicates _se_value/2. -_set_assign/2. +_set_contains/2. +_set_makeIndex/1. +_shared_value/2. _warning/3. diff --git a/src/constraint_handler/data/6_solve/ground/gringoEval.lp b/src/constraint_handler/data/6_solve/ground/gringoEval.lp index c0f37cf0..f84e13af 100644 --- a/src/constraint_handler/data/6_solve/ground/gringoEval.lp +++ b/src/constraint_handler/data/6_solve/ground/gringoEval.lp @@ -5,50 +5,46 @@ _expression(ground,(E;C)) :- _passed(ground,LBL,variable_default(X,E,C,P)). _expression(ground,(E;C)) :- _passed(ground,LBL,variable_define(X,E,C)). _expression(ground,(E;C)) :- _passed(ground,LBL,variable_domain(X,E,C)). _expression(ground,E) :- _passed(ground,LBL,share_value(E)). - -%%%%%%%%%%%%%%%%% variable_define/3 -_ge_value(X,V) :- _passed(ground,LBL,variable_define(X,E,C)), ge_result(C,val(bool,true)), ge_result(E,V). - _expression(ground,(E;C)) :- _passed(ground,LBL,set_assign(X,E,C)). -_ge_set_assign(X,V) :- _passed(ground,LBL,set_assign(X,E,C)), _se_value(C,val(bool,true)), ge_result(E,V). -_ge_set_declare(X) :- _passed(ground,LBL,variable_declare(X,set,C)), ge_result(C,val(bool,true)). -%%% TODO: make sure set assign doesn't get broken down across different engines - -_ge_value(X,V) :- _ge_domain_value(X,V). - -_se_value(variable(X),val(T,V)) :- _ge_value(X,val(T,V)). -_se_value(variable(X),bad) :- _ge_value(X,bad). -_se_value(variable(X),bad) :- ge_result(variable(X),bad). -_se_value(variable(X),ref(set,variable(X))) :- _ge_value(X,set(S)). -_set_assign(variable(X),VAL) :- _ge_value(X,set(S)), VAL=@pythonListElements(S). -_se_value(operation(OP,ARGS),V) :- ge_result(operation(OP,ARGS),V). -_se_value(val(T,V),val(T,V)) :- _expression(ground,val(T,V)). - -_se_value(variable(X),T) :- _ge_value(X,T), true=@pythonIsTuple(T). % TODO: fragile and probably incorrect! _variable(ground,X) :- _expression(ground,EXPR), X=@pythonExpressionVariable(EXPR). -%_direct_implode(variable(X)) :- _expression(ground,EXPR), X=@pythonExpressionVariable(EXPR). - -_ge_value(X,val(T,V)) :- _variable(ground,X), _se_value(variable(X),val(T,V)). - - -_ge_setAssignsAux(X,#inf,()) :- _ge_set_declare(X). -_ge_setAssignsAux(X,F,(F,L)) :- _ge_setAssignsAux(X,E,L), _ge_set_assign(X,F), E < F, - 0 = #count { G : _ge_set_assign(X,G), E < G, G < F }. -_ge_setAssigns(X,L) :- _ge_setAssignsAux(X,E,L), - 0 = #count { G : _ge_set_assign(X,G), E < G }. - -_ge_value(X,set(L)) :- _ge_set_declare(X), _ge_setAssigns(X,L). +_se_value(variable(X),V) :- _passed(ground,LBL,variable_define(X,E,C)), _ge_value(C,val(bool,true)), _se_value(E,V). +_se_value(variable(X),ref(set,variable(X))) :- _passed(ground,LBL,variable_declare(X,set,C)), _ge_value(C,val(bool,true)). +_set_contains(variable(X),V) :- _passed(ground,LBL,set_assign(X,E,C)), _ge_value(C,val(bool,true)), _ge_value(E,V). + +_ge_value(variable(X),val(T,V)) :- _variable(ground,X), _se_value(variable(X),val(T,V)). +_ge_value(variable(X),bad) :- _variable(ground,X), _se_value(variable(X),bad). +_ge_value(variable(X),RV) :- _variable(ground,X), _se_value(variable(X),V), V!=bad, #false : V=val(T,W); _ge_reduced(V,RV). +_ge_value(variable(X),bad) :- _variable(ground,X), not _se_value(variable(X),_). + +_ge_eval_expression(E) :- _expression(ground,E), #false : E=variable(X). +_ge_expand(V) :- _variable(ground,X), _se_value(variable(X),V). +_ge_expand(V) :- _ge_expand(ref(set,R)), not _ge_eval_expression(R), _set_contains(R,V). +_ge_expand(V) :- _ge_tuple(T,_,ARGS), V=@pythonListElements(ARGS). +_ge_tuple(T,N,ARGS) :- _ge_expand(T), (function,(),N,ARGS)=@pythonReify(T). +_ge_reduced(V,V) :- _ge_expand(V), #false : V=ref(T,R); not _ge_tuple(V,_,_). + +_set_makeIndex(R) :- _ge_expand(ref(set,R)), not _ge_eval_expression(R). +_ge_set_list(R,0,()) :- _ge_expand(ref(set,R)), not _ge_eval_expression(R). +_ge_set_list(R,I+1,(RV,L)) :- _ge_set_list(R,I,L), _set_index(R,I,V), _ge_reduced(V,RV). +_ge_reduced(ref(set,R),set(L)) :- _ge_set_list(R,I,L), _set_lastIndex(R,I). +_ge_reduced(ref(set,E),set(L)) :- _ge_eval_exec(E,M,valid(set(L))). + +_ge_tuple_list(T,N,()) :- _ge_tuple(T,N,ARGS). +_ge_tuple_list(T,I,(RV,L)) :- _ge_tuple_list(T,I+1,L), _ge_tuple(T,_,ARGS), (I,V)=@pythonEnumerateElements(ARGS), _ge_reduced(V,RV). +_ge_reduced(T,RV) :- _ge_tuple_list(T,0,L), RV=@pythonReflect(function,(),L). _ge_enumeratedVariables(EXPR,R) :- _expression(ground,EXPR), R=@pythonEnumerateVariables(EXPR). - _ge_mapAux(EXPR,N,()) :- _ge_enumeratedVariables(EXPR,length(N)). -_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _ge_value(X,V). -_ge_mapAux(EXPR,I,((X,bad),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), not _ge_value(X,_). -%_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _direct_imploded(variable(X),V). +_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _ge_value(variable(X),V). _ge_mapped(EXPR,M) :- _ge_mapAux(EXPR,0,M). -_ge_eval_exec(EXPR,M,RES) :- _ge_mapped(EXPR,M), RES=@pythonEvalExpr(EXPR,M,ID), _main_solverIdentifiers(ID). -ge_result(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(V)). -ge_result(EXPR,bad) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). +_ge_eval_exec(EXPR,M,RES) :- _ge_eval_expression(EXPR), _ge_mapped(EXPR,M), RES=@pythonEvalExpr(EXPR,M,ID), _main_solverIdentifiers(ID). +_ge_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(V)). +_ge_value(EXPR,bad) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). +_se_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(V)), #false : V=set(L). +_se_value(EXPR,bad) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). +_se_value(EXPR,ref(set,EXPR)) :- _ge_eval_exec(EXPR,M,valid(set(L))). +_set_contains(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(set(L))), V=@pythonListElements(L). +_shared_value(EXPR,bad) :- _passed(ground,LBL,share_value(EXPR)), _ge_value(EXPR,bad). _warning(KIND,(),(EXPR,M,MSG)) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). diff --git a/tests/test_encoding.py b/tests/test_encoding.py index e0ca2111..2ab4d435 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -622,7 +622,6 @@ def run_test(name: str, selected_engine: engine.Engine): "expression/lambda/lambdas", "expression/lambda/recursive", "expression/lambda/zero_args", - "expression/python_extract/set_compound_input", "expression/tuple_extra", "execution/python_syntax_error", "execution/warning_spurious", From 5fc5b1b01d67975ce0622d2b314591af637cefea Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 13:09:19 +1100 Subject: [PATCH 10/13] Clean-up ground engine implementation --- .../data/6_solve/compile/README.md | 13 ++++-- .../data/6_solve/compile/direct.lp | 17 +++++--- .../data/6_solve/compile/set.lp | 27 ++++++------ .../data/6_solve/ground/README.md | 18 ++++---- .../data/6_solve/ground/gringoEval.lp | 42 ++++++------------- src/constraint_handler/data/7_output/value.lp | 1 + src/constraint_handler/main.py | 2 +- .../set_compound_output.expected.all | 2 + .../python_extract/set_compound_output.lp | 16 +++++++ tests/flat_ch/test_correctness.py | 1 + tests/test_encoding.py | 3 +- 11 files changed, 78 insertions(+), 64 deletions(-) create mode 100644 tests/correctness/expression/python_extract/set_compound_output.expected.all create mode 100644 tests/correctness/expression/python_extract/set_compound_output.lp diff --git a/src/constraint_handler/data/6_solve/compile/README.md b/src/constraint_handler/data/6_solve/compile/README.md index 26d9d1bf..92014800 100644 --- a/src/constraint_handler/data/6_solve/compile/README.md +++ b/src/constraint_handler/data/6_solve/compile/README.md @@ -2,8 +2,8 @@ _passed(compile,LBL,DECL). _passed(sugar,LBL,set_baseDomain/3). -_expression_tupleLength(compile,EXPR,N). -_expression_tupleIndex(compile,EXPR,IDX,ARG). +_expression_tupleLength((compile;implode),EXPR,N). +_expression_tupleIndex((compile;implode),EXPR,IDX,ARG). _expression_operationIndex(compile,EXPR,IDX,ARG). _expression_operationIndex(sugar,EXPR,IDX,ARG). _expression_operationOperator(sugar,EXPR,OP). @@ -15,6 +15,7 @@ _type_extensionalEquality/1. _type_extensionalOrder/1. _type_representation/2. type_expression/2. +_set_candidate/2. ### Intermediate predicates @@ -26,13 +27,15 @@ _computeIdx/2. _computeIdx/3. _computedIdx/2. _direct_args_list_aux/3. _direct_args_list/2. +_direct_explode/1. +_direct_explodeTupleAux/3. _direct_implode/1. _direct_imploded_args_aux/3. _direct_implodeTupleAux/3. _direct_lazy/1. _direct_tupleValuesAux/3. _expression_eval_exec/2. -_expression(compile,EXPR). +_expression((compile;implode),EXPR). _int_add/3. _int_mult/3. _isTuple/2. _isTuple/4. @@ -65,8 +68,10 @@ _tupleEqAux/3. _passed(correction(REASON,add),LBL,DECL). direct_query/1. _se_value/2. -_set_assign/3. +_set_assign/2. +_set_candidate/2. _set_contains/2. +_direct_exploded/2. _direct_imploded/2. _warning/3. multimap_value/3. diff --git a/src/constraint_handler/data/6_solve/compile/direct.lp b/src/constraint_handler/data/6_solve/compile/direct.lp index 33e8d6ab..30b5677a 100644 --- a/src/constraint_handler/data/6_solve/compile/direct.lp +++ b/src/constraint_handler/data/6_solve/compile/direct.lp @@ -99,13 +99,18 @@ _direct_imploded(bad,bad) :- _direct_implode(bad). %%%%%%%%%%%%%%%%% implode _direct_imploded(val(T,V),val(T,V)) :- _direct_implode(val(T,V)), _type_representation(T,extensional). -_direct_imploded(variable(X),V) :- _direct_implode(variable(X)), _se_value(variable(X),V). _direct_implode(V) :- _direct_implode(variable(X)), _se_value(variable(X),V). _direct_imploded(variable(X),W) :- _direct_implode(variable(X)), _se_value(variable(X),V), _direct_imploded(V,W). -_isTuple(compile,E) :- _direct_implode(E), true=@pythonIsTuple(E). -_isTuple(compile,E,N,ARGS) :- _direct_implode(E), (function,(),N,ARGS)=@pythonReify(E). -_direct_implode(X) :- _direct_implode(E), _expression_tupleIndex(compile,E,IDX,X). -_direct_implodeTupleAux(E,N,()) :- _direct_implode(E), _expression_tupleLength(compile,E,N). -_direct_implodeTupleAux(E,IDX,(V,L)) :- _direct_implodeTupleAux(E,IDX+1,L), _expression_tupleIndex(compile,E,IDX,X), _direct_imploded(X,V). +_expression(implode,E) :- _direct_implode(E). +_direct_implode(X) :- _direct_implode(E), _expression_tupleIndex(implode,E,IDX,X). +_direct_implodeTupleAux(E,N,()) :- _direct_implode(E), _expression_tupleLength(implode,E,N). +_direct_implodeTupleAux(E,IDX,(V,L)) :- _direct_implodeTupleAux(E,IDX+1,L), _expression_tupleIndex(implode,E,IDX,X), _direct_imploded(X,V). _direct_imploded(E,TUPLE) :- _direct_implodeTupleAux(E,0,L), TUPLE=@pythonReflect(function,(),L). + +_expression(implode,E) :- _direct_explode(E). +_direct_explode(X) :- _direct_explode(E), _expression_tupleIndex(implode,E,IDX,X). +_direct_exploded(V,V) :- _direct_explode(V), V=(bad;val(T,W)). +_direct_explodeTupleAux(E,N,()) :- _direct_explode(E), _expression_tupleLength(implode,E,N). +_direct_explodeTupleAux(E,IDX,(V,L)) :- _direct_explodeTupleAux(E,IDX+1,L), _expression_tupleIndex(implode,E,IDX,X), _direct_exploded(X,V). +_direct_exploded(E,TUPLE) :- _direct_explodeTupleAux(E,0,L), TUPLE=@pythonReflect(function,(),L). diff --git a/src/constraint_handler/data/6_solve/compile/set.lp b/src/constraint_handler/data/6_solve/compile/set.lp index eb0e08da..245fd31a 100644 --- a/src/constraint_handler/data/6_solve/compile/set.lp +++ b/src/constraint_handler/data/6_solve/compile/set.lp @@ -2,6 +2,7 @@ _set_assign(variable(X),E) :- _passed(compile,LBL,set_assign(X,E,C)), _se_value( _se_value(variable(X),ref(set,variable(X))) :- _passed(compile,LBL,variable_declare(X,set,C)), _se_value(C,val(bool,true)). direct_query(E) :- _set_assign(X,E). +_set_candidate(R,V) :- _set_assign(R,E), _se_value(E,V). %%%%%%%%%%%%%%%%% cardinality _computedIdx(E,val(int,N)) :- _computeIdx(E,cardinality), _computeIdx(E,0,ref(set,SET)), @@ -10,13 +11,10 @@ _computedIdx(E,val(int,N)) :- _computeIdx(E,cardinality), _computeIdx(E,0,ref(se %%%%%%%%%%%%%%%%% set_declare set_assign set_value direct_query(operation(eq,(V1,(V2,())))) :- - _set_assign(EX,E1), _se_value(E1,V1), - _set_assign(EX,E2), _se_value(E2,V2), V1 < V2. + _set_candidate(EX,V1), _set_candidate(EX,V2), V1 < V2. _set_contains(EX,V1) :- - _set_assign(EX,E1), _se_value(E1,V1), %_se_value(EX,ref(set,ER)), - #false : _set_assign(EX,E2), _se_value(E2,V2), _se_value(operation(eq,(V2,(V1,()))),val(bool,true)), V2 < V1. - -_set_assign(EX,S) :- _set_assign(EX,ref(set,S)). + _set_candidate(EX,V1), + #false : _set_candidate(EX,V2), _se_value(operation(eq,(V2,(V1,()))),val(bool,true)), V2 < V1. %%%%%%%%%%%%%%%%% set_isin set_notin direct_query(operation(eq,(V1,(V2,())))) :- _computeIdx(E,(set_isin;set_notin)), _computeIdx(E,0,V1), _computeIdx(E,1,ref(set,S)), @@ -51,7 +49,7 @@ _set_assign(set(L),SE) :- direct_query(set(L)), SE=@pythonListElements(L). %%%%%%%%%%%%%%%%% union inter diff _se_value(operation(OP,L),ref(set,operation(OP,L))) :- direct_query(operation(OP,L)), OP = (diff;inter;union). -_set_assign(operation(union,L),V) :- direct_query(operation(union,L)), SE=@pythonListElements(L), _se_value(SE,ref(set,ER)), _set_contains(ER,V). +_set_candidate(operation(union,L),V) :- direct_query(operation(union,L)), SE=@pythonListElements(L), _se_value(SE,ref(set,ER)), _set_contains(ER,V). direct_query(operation(eq,(VSMALL,(VBIG,())))) :- direct_query(operation((diff;inter),(S1,(S2,())))), _se_value(S1,ref(set,R1)), _se_value(S2,ref(set,R2)), @@ -59,13 +57,13 @@ direct_query(operation(eq,(VSMALL,(VBIG,())))) :- direct_query(operation((diff;i _set_contains(R2,V2), (VSMALL,VBIG)=((V1,V2);(V2,V1)), VSMALL <= VBIG. -_set_assign(operation(inter,(S1,(S2,()))),VSMALL) :- direct_query(operation(inter,(S1,(S2,())))), +_set_candidate(operation(inter,(S1,(S2,()))),VSMALL) :- direct_query(operation(inter,(S1,(S2,())))), _se_value(S1,ref(set,R1)), _se_value(S2,ref(set,R2)), _set_contains(R1,V1), _set_contains(R2,V2), _se_value(operation(eq,(VSMALL,(VBIG,()))),val(bool,true)), (VSMALL,VBIG)=((V1,V2);(V2,V1)), VSMALL <= VBIG. -_set_assign(operation(diff,(S1,(S2,()))),V1) :- direct_query(operation(diff,(S1,(S2,())))), +_set_candidate(operation(diff,(S1,(S2,()))),V1) :- direct_query(operation(diff,(S1,(S2,())))), _se_value(S1,ref(set,R1)), _se_value(S2,ref(set,R2)), _set_contains(R1,V1), #false : _set_contains(R2,V2), _se_value(operation(eq,(VSMALL,(VBIG,()))),val(bool,true)), @@ -164,10 +162,15 @@ _set_implode(REF) :- _direct_implode(E), _se_value(E,ref(set,REF)). _direct_imploded(ref(set,REF),V) :- _direct_implode(ref(set,REF)), _set_imploded(REF,V). _direct_imploded(E,V) :- _direct_implode(E), _se_value(E,ref(set,REF)), _set_imploded(REF,V). -_direct_implode(val(TV,RV)) :- _set_implode(EM), _set_contains(EM,val(TV,RV)). +_direct_implode(V) :- _set_implode(EM), _set_contains(EM,V). _set_makeIndex(EM) :- _set_implode(EM). _set_as_list_aux(EM,0,()) :- _set_implode(EM). -_set_as_list_aux(EM,IDX+1,(V,L)) :- _set_as_list_aux(EM,IDX,L), _set_index(EM,IDX,val(TV,RV)), _direct_imploded(val(TV,RV),V). +_set_as_list_aux(EM,IDX+1,(V,L)) :- _set_as_list_aux(EM,IDX,L), _set_index(EM,IDX,RV), _direct_imploded(RV,V). _set_imploded(EM,set(L)) :- _set_as_list_aux(EM,IDX,L), _set_lastIndex(EM,IDX). -%_direct_imploded(E,E) :- _direct_implode(E), E = set(_). +_direct_imploded(set(L),set(L)) :- _direct_implode(set(L)). + +_direct_explode(V) :- _direct_explode(set(L)), V=@pythonListElements(L). +_direct_exploded(set(L),ref(set,set(L))) :- _direct_explode(set(L)). +_set_contains(set(L),V) :- _direct_explode(set(L)), RV=@pythonListElements(L), _direct_exploded(RV,V). +_direct_imploded(ref(set,set(L)),set(L)) :- _direct_explode(set(L)). diff --git a/src/constraint_handler/data/6_solve/ground/README.md b/src/constraint_handler/data/6_solve/ground/README.md index 5a30c021..f5e3334d 100644 --- a/src/constraint_handler/data/6_solve/ground/README.md +++ b/src/constraint_handler/data/6_solve/ground/README.md @@ -9,22 +9,16 @@ _passed(ground,LBL,variable_domain/3). _passed(ground,LBL,set_assign/3). _passed(ground,LBL,share_value/1). _se_value/2. -_set_contains/2. -_set_index/3. -_set_lastIndex/2. +_direct_exploded/2. +_direct_imploded/2. +_expression_tupleLength(implode,EXPR,N). _main_solverIdentifiers/1. ### Intermediate predicates _expression(ground,EXPR). -_ge_value/2. _variable(ground,VAR). _ge_eval_expression/1. -_ge_expand/1. -_ge_reduced/2. -_ge_tuple/3. -_ge_set_list/3. -_ge_tuple_list/3. _ge_enumeratedVariables/2. _ge_mapAux/3. _ge_mapped/2. @@ -34,6 +28,8 @@ _ge_eval_exec/3. _se_value/2. _set_contains/2. -_set_makeIndex/1. -_shared_value/2. +_set_candidate/2. +_direct_explode/1. +_direct_implode/1. +_direct_imploded/2. _warning/3. diff --git a/src/constraint_handler/data/6_solve/ground/gringoEval.lp b/src/constraint_handler/data/6_solve/ground/gringoEval.lp index f84e13af..115fa7ae 100644 --- a/src/constraint_handler/data/6_solve/ground/gringoEval.lp +++ b/src/constraint_handler/data/6_solve/ground/gringoEval.lp @@ -8,43 +8,27 @@ _expression(ground,E) :- _passed(ground,LBL,share_value(E)). _expression(ground,(E;C)) :- _passed(ground,LBL,set_assign(X,E,C)). _variable(ground,X) :- _expression(ground,EXPR), X=@pythonExpressionVariable(EXPR). -_se_value(variable(X),V) :- _passed(ground,LBL,variable_define(X,E,C)), _ge_value(C,val(bool,true)), _se_value(E,V). -_se_value(variable(X),ref(set,variable(X))) :- _passed(ground,LBL,variable_declare(X,set,C)), _ge_value(C,val(bool,true)). -_set_contains(variable(X),V) :- _passed(ground,LBL,set_assign(X,E,C)), _ge_value(C,val(bool,true)), _ge_value(E,V). - -_ge_value(variable(X),val(T,V)) :- _variable(ground,X), _se_value(variable(X),val(T,V)). -_ge_value(variable(X),bad) :- _variable(ground,X), _se_value(variable(X),bad). -_ge_value(variable(X),RV) :- _variable(ground,X), _se_value(variable(X),V), V!=bad, #false : V=val(T,W); _ge_reduced(V,RV). -_ge_value(variable(X),bad) :- _variable(ground,X), not _se_value(variable(X),_). +_se_value(variable(X),V) :- _passed(ground,LBL,variable_define(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V). +_se_value(variable(X),ref(set,variable(X))) :- _passed(ground,LBL,variable_declare(X,set,C)), _se_value(C,val(bool,true)). +_set_candidate(variable(X),V) :- _passed(ground,LBL,set_assign(X,E,C)), _se_value(C,val(bool,true)), _se_value(E,V). +_set_candidate(variable(X),bad) :- _passed(ground,LBL,set_assign(X,variable(Y),C)), _se_value(C,val(bool,true)), not _se_value(variable(Y),_). _ge_eval_expression(E) :- _expression(ground,E), #false : E=variable(X). -_ge_expand(V) :- _variable(ground,X), _se_value(variable(X),V). -_ge_expand(V) :- _ge_expand(ref(set,R)), not _ge_eval_expression(R), _set_contains(R,V). -_ge_expand(V) :- _ge_tuple(T,_,ARGS), V=@pythonListElements(ARGS). -_ge_tuple(T,N,ARGS) :- _ge_expand(T), (function,(),N,ARGS)=@pythonReify(T). -_ge_reduced(V,V) :- _ge_expand(V), #false : V=ref(T,R); not _ge_tuple(V,_,_). - -_set_makeIndex(R) :- _ge_expand(ref(set,R)), not _ge_eval_expression(R). -_ge_set_list(R,0,()) :- _ge_expand(ref(set,R)), not _ge_eval_expression(R). -_ge_set_list(R,I+1,(RV,L)) :- _ge_set_list(R,I,L), _set_index(R,I,V), _ge_reduced(V,RV). -_ge_reduced(ref(set,R),set(L)) :- _ge_set_list(R,I,L), _set_lastIndex(R,I). -_ge_reduced(ref(set,E),set(L)) :- _ge_eval_exec(E,M,valid(set(L))). - -_ge_tuple_list(T,N,()) :- _ge_tuple(T,N,ARGS). -_ge_tuple_list(T,I,(RV,L)) :- _ge_tuple_list(T,I+1,L), _ge_tuple(T,_,ARGS), (I,V)=@pythonEnumerateElements(ARGS), _ge_reduced(V,RV). -_ge_reduced(T,RV) :- _ge_tuple_list(T,0,L), RV=@pythonReflect(function,(),L). +_direct_implode(V) :- _variable(ground,X), _se_value(variable(X),V), #false : V=ref(set,E), _ge_eval_expression(E). +_direct_imploded(ref(set,E),set(L)) :- _ge_eval_exec(E,M,valid(set(L))). _ge_enumeratedVariables(EXPR,R) :- _expression(ground,EXPR), R=@pythonEnumerateVariables(EXPR). _ge_mapAux(EXPR,N,()) :- _ge_enumeratedVariables(EXPR,length(N)). -_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _ge_value(variable(X),V). +_ge_mapAux(EXPR,I,((X,V),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _se_value(variable(X),V), V=(bad;val(T,W)). +_ge_mapAux(EXPR,I,((X,RV),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), _se_value(variable(X),V), V!=bad, #false : V=val(T,W); _direct_imploded(V,RV). +_ge_mapAux(EXPR,I,((X,bad),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), not _se_value(variable(X),_). _ge_mapped(EXPR,M) :- _ge_mapAux(EXPR,0,M). _ge_eval_exec(EXPR,M,RES) :- _ge_eval_expression(EXPR), _ge_mapped(EXPR,M), RES=@pythonEvalExpr(EXPR,M,ID), _main_solverIdentifiers(ID). -_ge_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(V)). -_ge_value(EXPR,bad) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). -_se_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(V)), #false : V=set(L). +_direct_explode(V) :- _ge_eval_exec(EXPR,M,valid(V)). +_se_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(V)), V=(bad;val(T,W)). +_se_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(RV)), _expression_tupleLength(implode,RV,N), _direct_exploded(RV,V). _se_value(EXPR,bad) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). _se_value(EXPR,ref(set,EXPR)) :- _ge_eval_exec(EXPR,M,valid(set(L))). -_set_contains(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(set(L))), V=@pythonListElements(L). -_shared_value(EXPR,bad) :- _passed(ground,LBL,share_value(EXPR)), _ge_value(EXPR,bad). +_set_contains(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(set(L))), RV=@pythonListElements(L), _direct_exploded(RV,V). _warning(KIND,(),(EXPR,M,MSG)) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). diff --git a/src/constraint_handler/data/7_output/value.lp b/src/constraint_handler/data/7_output/value.lp index 67bde62d..253634de 100644 --- a/src/constraint_handler/data/7_output/value.lp +++ b/src/constraint_handler/data/7_output/value.lp @@ -9,6 +9,7 @@ value(X,V) :- _se_value(variable(X),V), V != set, V != bad, ch_post(variable_int value(X,bad) :- _se_value(variable(X),bad), ch_post(variable_interface(X),LBL), _passed(ENG,_,variable_declare(X,D,C)), _bool_evaluated(C,val(bool,true)). _shared_value(E,V) :- _passed(ENG,LBL,share_value(E)), _se_value(E,V). +_shared_value(variable(X),bad) :- _passed(ground,LBL,share_value(variable(X))), not _se_value(variable(X),_). _se_value1(variable(X)) :- _se_value(variable(X),V), ch_post(variable_interface(X),LBL). value(X,bad) :- ch_post(variable_interface(X),LBL), _passed(compile,_,variable_declare(X,D,C)), _bool_evaluated(C,val(bool,true)), _expression(compile,variable(X)), not _se_value1(variable(X)). diff --git a/src/constraint_handler/main.py b/src/constraint_handler/main.py index 73b1484f..74c3202e 100644 --- a/src/constraint_handler/main.py +++ b/src/constraint_handler/main.py @@ -143,7 +143,7 @@ t_modules = { "expression": ("PHASE", ["sugar", "type_check", "compile", "compile2"]), - "expression_sequence": ("PHASE", ["defaultArgs", "sugar", "type_check", "compile", "compile2"]), + "expression_sequence": ("PHASE", ["defaultArgs", "sugar", "type_check", "compile", "compile2", "implode"]), "correction": ("PHASE", ["constantFolding", "float_normalize", "safe", "type_check", "wf_check"]), } modules = ( diff --git a/tests/correctness/expression/python_extract/set_compound_output.expected.all b/tests/correctness/expression/python_extract/set_compound_output.expected.all new file mode 100644 index 00000000..22a24157 --- /dev/null +++ b/tests/correctness/expression/python_extract/set_compound_output.expected.all @@ -0,0 +1,2 @@ +value(nested_equal,val(bool,true)) +value(pairs_equal,val(bool,true)) \ No newline at end of file diff --git a/tests/correctness/expression/python_extract/set_compound_output.lp b/tests/correctness/expression/python_extract/set_compound_output.lp new file mode 100644 index 00000000..4096ff3d --- /dev/null +++ b/tests/correctness/expression/python_extract/set_compound_output.lp @@ -0,0 +1,16 @@ +phase_request(constantFolding,false). + +variable_declare(inner,set). +set_assign(inner,val(int,2)). +set_assign(inner,val(int,3)). + +variable_declare(nested,set). +set_assign(nested,variable(inner)). + +variable_declare(pairs,set). +set_assign(pairs,(val(int,1),variable(inner))). + +variable_define(python_nested,operation(pythonExtract("","frozenset({frozenset({2, 3})})"),())). +variable_define(python_pairs,operation(pythonExtract("","frozenset({(1, frozenset({2, 3}))})"),())). +variable_define(nested_equal,operation(eq,(variable(python_nested),(variable(nested),())))). +variable_define(pairs_equal,operation(eq,(variable(python_pairs),(variable(pairs),())))). \ No newline at end of file diff --git a/tests/flat_ch/test_correctness.py b/tests/flat_ch/test_correctness.py index 9f5e4fb0..339d893b 100644 --- a/tests/flat_ch/test_correctness.py +++ b/tests/flat_ch/test_correctness.py @@ -253,6 +253,7 @@ def generate_flat_ch_files() -> None: "expression/python_extract/binding_leak", "expression/python_extract/dynamic", "expression/python_extract/set_compound_input", + "expression/python_extract/set_compound_output", "expression/python_extract/set_input", "expression/python_extract/set_output", "expression/python_extract/set_projection", diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 2ab4d435..efd18e81 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -281,6 +281,7 @@ def run_test(name: str, selected_engine: engine.Engine): "expression/python_extract/binding_leak", "expression/python_extract/dynamic", "expression/python_extract/set_compound_input", + "expression/python_extract/set_compound_output", "expression/python_extract/set_input", "expression/python_extract/set_output", "expression/python_extract/set_projection", @@ -538,7 +539,6 @@ def run_test(name: str, selected_engine: engine.Engine): "datatype/float/pow/mixed", "datatype/int/int_div/negative", "engine/request", - "expression/python_extract/set_compound_input", "expression/tuple_extra", "execution/python_syntax_error", "execution/warning_spurious", @@ -574,6 +574,7 @@ def run_test(name: str, selected_engine: engine.Engine): "expression/alternative_syntax/lambda", "expression/python_extract/basic", "expression/python_extract/set_compound_input", + "expression/python_extract/set_compound_output", "expression/python_extract/set_input", "expression/python_extract/static", "expression/python_extract/tuple_containing_bad", From 2789f287acc11ee5a23184a0e8ac4d40ebc0adb6 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 13:53:16 +1100 Subject: [PATCH 11/13] Move python_extract implementation to its own file --- .../data/6_solve/compile/README.md | 7 +++++-- .../data/6_solve/compile/direct.lp | 21 +++---------------- .../data/6_solve/compile/float.lp | 4 ++-- .../data/6_solve/compile/python.lp | 11 ++++++++++ .../data/6_solve/ground/README.md | 9 +------- .../data/6_solve/ground/gringoEval.lp | 10 +-------- src/constraint_handler/main.py | 1 + tests/test_encoding.py | 7 ------- 8 files changed, 24 insertions(+), 46 deletions(-) create mode 100644 src/constraint_handler/data/6_solve/compile/python.lp diff --git a/src/constraint_handler/data/6_solve/compile/README.md b/src/constraint_handler/data/6_solve/compile/README.md index 92014800..563c8da5 100644 --- a/src/constraint_handler/data/6_solve/compile/README.md +++ b/src/constraint_handler/data/6_solve/compile/README.md @@ -16,10 +16,10 @@ _type_extensionalOrder/1. _type_representation/2. type_expression/2. _set_candidate/2. +_python_evaluate/3. ### Intermediate predicates -_expression_pythonEval/2. _expression_dynamicTainted/1. _argument_value/2. _direct_queryOperation/1. @@ -34,7 +34,7 @@ _direct_imploded_args_aux/3. _direct_implodeTupleAux/3. _direct_lazy/1. _direct_tupleValuesAux/3. -_expression_eval_exec/2. +_python_evaluated/3. _expression((compile;implode),EXPR). _int_add/3. _int_mult/3. @@ -68,6 +68,9 @@ _tupleEqAux/3. _passed(correction(REASON,add),LBL,DECL). direct_query/1. _se_value/2. +_python_evaluate/3. +_python_evaluated/3. +_python_result/2. _set_assign/2. _set_candidate/2. _set_contains/2. diff --git a/src/constraint_handler/data/6_solve/compile/direct.lp b/src/constraint_handler/data/6_solve/compile/direct.lp index 30b5677a..33f33684 100644 --- a/src/constraint_handler/data/6_solve/compile/direct.lp +++ b/src/constraint_handler/data/6_solve/compile/direct.lp @@ -6,7 +6,7 @@ _expression(compile,E) :- direct_query(E). _se_value(val(T,V),val(T,V)) :- direct_query(val(T,V)). _se_value(ref(T,R),ref(T,R)) :- direct_query(ref(T,R)). -_expression_pythonEval(python(S),python(S)) :- direct_query(python(S)). +_python_evaluate(python(S),python(S),()) :- direct_query(python(S)). _se_value(Q,RES) :- direct_query(Q), _computedIdx(Q,RES). _se_value(lambda(VARS,ERES),val(function,lambda(VARS,ERES))) :- direct_query(lambda(VARS,ERES)). @@ -60,32 +60,17 @@ _lambda_aux(E,RED) :- _computeIdx(E,lambda(VARS,ERES)), direct_query(RED) :- _lambda_aux(E,RED). _computedIdx(E,VO) :- _lambda_aux(E,RED), _se_value(RED,VO). -%%%%%%%%%%%%%%%%% python operator _direct_implode(V) :- _computeIdx(E,python(STR)), _computeIdx(E,IDX,V). _direct_imploded_args_aux(E,IDX,()) :- _computeIdx(E,python(STR)), _expression_operationLength(compile,E,IDX). _direct_imploded_args_aux(E,IDX,(IMP,L)) :- _direct_imploded_args_aux(E,IDX+1,L), _computeIdx(E,IDX,V), _direct_imploded(V,IMP). -_expression_pythonEval(E,operation(python(S),L)) :- _computeIdx(E,python(S)), _direct_imploded_args_aux(E,0,L). +_python_evaluate(E,operation(python(S),L),()) :- _computeIdx(E,python(S)), _direct_imploded_args_aux(E,0,L). -_expression_eval_exec(Q,RES) :- _expression_pythonEval(Q,E), RES=@pythonEvalExpr(E,(),ID), _main_solverIdentifiers(ID). -_computedIdx(E,val(TYPE,V)) :- _expression_eval_exec(E,valid(val(TYPE,V))). -_computedIdx(E,bad) :- _expression_eval_exec(E,valid(bad)). -_computedIdx(E,bad) :- _expression_eval_exec(E,error(KIND,MSG)). -_warning(KIND,(),(python,E,MSG)) :- _expression_eval_exec(E,error(KIND,MSG)). - - -_se_value(E,ref(set,E)) :- _expression_eval_exec(E,valid(set(S))). -_set_assign(E,VAL) :- _expression_eval_exec(E,valid(set(S))), VAL=@pythonListElements(S). - - -%%%%%%%%%%%%%%%%% pythonExtract operator _direct_resortToPython(operation(pythonExtract(PSTMT,PEXPR),ARGS)) :- _expression(compile,operation(pythonExtract(PSTMT,PEXPR),ARGS)). _direct_implode(V) :- _direct_resortToPython(E), _computeIdx(E,IDX,V). _direct_imploded_args_aux(E,N,()) :- _direct_resortToPython(E), _expression_operationLength(compile,E,N). -_direct_imploded_args_aux(E,IDX,(IMP,L)) :- _direct_imploded_args_aux(E,IDX+1,L), _computeIdx(E,IDX,V), - _direct_imploded(V,IMP). -_expression_pythonEval(E,operation(O,L)) :- _direct_resortToPython(E), _direct_imploded_args_aux(E,0,L), E=operation(O,ARGS). +_python_evaluate(E,operation(O,L),()) :- _direct_resortToPython(E), _direct_imploded_args_aux(E,0,L), E=operation(O,ARGS). %%%%%%%%%%%%%%%%% bad %_direct_bad_operation(OP,ARGS) :- direct_query(operation(OP,ARGS)), _se_value(ARG,bad), ARG=@pythonListElements(ARGS), not _expression_safe(operation(OP,ARGS)), not _operator_recoverable(OP). diff --git a/src/constraint_handler/data/6_solve/compile/float.lp b/src/constraint_handler/data/6_solve/compile/float.lp index 32224463..9fe9eaf2 100644 --- a/src/constraint_handler/data/6_solve/compile/float.lp +++ b/src/constraint_handler/data/6_solve/compile/float.lp @@ -25,8 +25,8 @@ _operator_needsPython(OP,T1,T2) :- operator_declare(OP,(T1,(T2,())),T), (T1;T2)= _operator_needsPython(OP,T1,T2) :- (T1,T2)=((float,int);(int,float)), OP=(eq;neq). _operator_needsPython(float_div,int,int). -_expression_pythonEval(E,operation(OP,(val(T,V),()))) :- _computeIdx(E,OP), _operator_needsPython(OP,T), _computeIdx(E,0,val(T,V)). -_expression_pythonEval(E,operation(OP,(val(T1,V1),(val(T2,V2),())))) :- _computeIdx(E,OP), _operator_needsPython(OP,T1,T2), _computeIdx(E,0,val(T1,V1)), _computeIdx(E,1,val(T2,V2)). +_python_evaluate(E,operation(OP,(val(T,V),())),()) :- _computeIdx(E,OP), _operator_needsPython(OP,T), _computeIdx(E,0,val(T,V)). +_python_evaluate(E,operation(OP,(val(T1,V1),(val(T2,V2),()))),()) :- _computeIdx(E,OP), _operator_needsPython(OP,T1,T2), _computeIdx(E,0,val(T1,V1)), _computeIdx(E,1,val(T2,V2)). _computedIdx(E,val(bool,true)) :- _computeIdx(E,eq), _computeIdx(E,0,val(float,V)), _computeIdx(E,1,val(float,V)). _computedIdx(E,val(bool,false)) :- _computeIdx(E,eq), _computeIdx(E,0,val(float,_)), _computeIdx(E,1,val(float,V)), not _computeIdx(E,0,val(float,V)). diff --git a/src/constraint_handler/data/6_solve/compile/python.lp b/src/constraint_handler/data/6_solve/compile/python.lp new file mode 100644 index 00000000..a49770a4 --- /dev/null +++ b/src/constraint_handler/data/6_solve/compile/python.lp @@ -0,0 +1,11 @@ +_python_evaluated(Q,M,RES) :- _python_evaluate(Q,E,M), RES=@pythonEvalExpr(E,M,ID), _main_solverIdentifiers(ID). +_python_result(E,V) :- _python_evaluated(E,M,valid(V)). +_python_result(E,bad) :- _python_evaluated(E,M,error(KIND,MSG)). +_warning(KIND,(),(python,E,MSG)) :- _python_evaluated(E,M,error(KIND,MSG)). + +_direct_explode(V) :- _python_result(E,V). +_se_value(E,V) :- _python_result(E,V), V=(bad;val(T,W)). +_se_value(E,V) :- _python_result(E,RV), _expression_tupleLength(implode,RV,N), _direct_exploded(RV,V). +_se_value(E,ref(set,E)) :- _python_result(E,set(L)). +_set_candidate(E,V) :- _python_result(E,set(L)), RV=@pythonListElements(L), _direct_exploded(RV,V). +_direct_imploded(ref(set,E),set(L)) :- _python_result(E,set(L)). \ No newline at end of file diff --git a/src/constraint_handler/data/6_solve/ground/README.md b/src/constraint_handler/data/6_solve/ground/README.md index f5e3334d..8691253c 100644 --- a/src/constraint_handler/data/6_solve/ground/README.md +++ b/src/constraint_handler/data/6_solve/ground/README.md @@ -9,10 +9,7 @@ _passed(ground,LBL,variable_domain/3). _passed(ground,LBL,set_assign/3). _passed(ground,LBL,share_value/1). _se_value/2. -_direct_exploded/2. _direct_imploded/2. -_expression_tupleLength(implode,EXPR,N). -_main_solverIdentifiers/1. ### Intermediate predicates @@ -22,14 +19,10 @@ _ge_eval_expression/1. _ge_enumeratedVariables/2. _ge_mapAux/3. _ge_mapped/2. -_ge_eval_exec/3. ### Output predicates _se_value/2. -_set_contains/2. +_python_evaluate/3. _set_candidate/2. -_direct_explode/1. _direct_implode/1. -_direct_imploded/2. -_warning/3. diff --git a/src/constraint_handler/data/6_solve/ground/gringoEval.lp b/src/constraint_handler/data/6_solve/ground/gringoEval.lp index 115fa7ae..5dbbd240 100644 --- a/src/constraint_handler/data/6_solve/ground/gringoEval.lp +++ b/src/constraint_handler/data/6_solve/ground/gringoEval.lp @@ -15,7 +15,6 @@ _set_candidate(variable(X),bad) :- _passed(ground,LBL,set_assign(X,variable(Y),C _ge_eval_expression(E) :- _expression(ground,E), #false : E=variable(X). _direct_implode(V) :- _variable(ground,X), _se_value(variable(X),V), #false : V=ref(set,E), _ge_eval_expression(E). -_direct_imploded(ref(set,E),set(L)) :- _ge_eval_exec(E,M,valid(set(L))). _ge_enumeratedVariables(EXPR,R) :- _expression(ground,EXPR), R=@pythonEnumerateVariables(EXPR). _ge_mapAux(EXPR,N,()) :- _ge_enumeratedVariables(EXPR,length(N)). @@ -24,11 +23,4 @@ _ge_mapAux(EXPR,I,((X,RV),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables _ge_mapAux(EXPR,I,((X,bad),M)) :- _ge_mapAux(EXPR,I+1,M), _ge_enumeratedVariables(EXPR,(I,X)), not _se_value(variable(X),_). _ge_mapped(EXPR,M) :- _ge_mapAux(EXPR,0,M). -_ge_eval_exec(EXPR,M,RES) :- _ge_eval_expression(EXPR), _ge_mapped(EXPR,M), RES=@pythonEvalExpr(EXPR,M,ID), _main_solverIdentifiers(ID). -_direct_explode(V) :- _ge_eval_exec(EXPR,M,valid(V)). -_se_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(V)), V=(bad;val(T,W)). -_se_value(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(RV)), _expression_tupleLength(implode,RV,N), _direct_exploded(RV,V). -_se_value(EXPR,bad) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). -_se_value(EXPR,ref(set,EXPR)) :- _ge_eval_exec(EXPR,M,valid(set(L))). -_set_contains(EXPR,V) :- _ge_eval_exec(EXPR,M,valid(set(L))), RV=@pythonListElements(L), _direct_exploded(RV,V). -_warning(KIND,(),(EXPR,M,MSG)) :- _ge_eval_exec(EXPR,M,error(KIND,MSG)). +_python_evaluate(EXPR,EXPR,M) :- _ge_eval_expression(EXPR), _ge_mapped(EXPR,M). diff --git a/src/constraint_handler/main.py b/src/constraint_handler/main.py index 74c3202e..bec6f6a5 100644 --- a/src/constraint_handler/main.py +++ b/src/constraint_handler/main.py @@ -93,6 +93,7 @@ m6_compile = [ "6_solve/compile/direct", + "6_solve/compile/python", ] m6_compile2 = [ diff --git a/tests/test_encoding.py b/tests/test_encoding.py index efd18e81..126c4d71 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -539,7 +539,6 @@ def run_test(name: str, selected_engine: engine.Engine): "datatype/float/pow/mixed", "datatype/int/int_div/negative", "engine/request", - "expression/tuple_extra", "execution/python_syntax_error", "execution/warning_spurious", "execution/warning_spurious2", @@ -614,16 +613,13 @@ def run_test(name: str, selected_engine: engine.Engine): { "core/reasoning_modes", "core/reasoning_modes_with_show", - "core/set_execution_input_alias", "datatype/bool/conj_disj_mixed", "datatype/float/mult/recovery", "engine/request", - "engine/request_set_ref", "expression/alternative_syntax/lambda", "expression/lambda/lambdas", "expression/lambda/recursive", "expression/lambda/zero_args", - "expression/tuple_extra", "execution/python_syntax_error", "execution/warning_spurious", "execution/warning_spurious2", @@ -632,9 +628,6 @@ def run_test(name: str, selected_engine: engine.Engine): "set/iterations", "type/bool/with_none_binary", "type/bool/with_none_unary", - "unit/tuple_eq", - "unit/tuple_neq", - "unit/unary/set_length", "warning/forbid_labeled", "warning/forbid_labeled_match", "warning/ignore_labeled", From bd8c7d1f529b0cc1a9bb0a7082b34f96f7f110d7 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 18:36:40 +1100 Subject: [PATCH 12/13] Add tightness checks for declared and defined. --- tests/correctness/core/variable/declared.expected.stats | 2 ++ tests/correctness/core/variable/defined.expected.stats | 2 ++ 2 files changed, 4 insertions(+) create mode 100644 tests/correctness/core/variable/declared.expected.stats create mode 100644 tests/correctness/core/variable/defined.expected.stats diff --git a/tests/correctness/core/variable/declared.expected.stats b/tests/correctness/core/variable/declared.expected.stats new file mode 100644 index 00000000..6ef94c90 --- /dev/null +++ b/tests/correctness/core/variable/declared.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=false diff --git a/tests/correctness/core/variable/defined.expected.stats b/tests/correctness/core/variable/defined.expected.stats new file mode 100644 index 00000000..c5f160d7 --- /dev/null +++ b/tests/correctness/core/variable/defined.expected.stats @@ -0,0 +1,2 @@ +tight=true +choices=true From ade3cd9ebb76d57b2dbb49f5908d7d5f09f1c639 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 18:37:50 +1100 Subject: [PATCH 13/13] Formatting --- src/constraint_handler/data/6_solve/compile/python.lp | 2 +- .../expression/python_extract/set_compound_input.expected.all | 2 +- .../correctness/expression/python_extract/set_compound_input.lp | 2 +- .../expression/python_extract/set_compound_output.expected.all | 2 +- .../expression/python_extract/set_compound_output.lp | 2 +- tests/investigate/tuple_domain_grounding.lp | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/constraint_handler/data/6_solve/compile/python.lp b/src/constraint_handler/data/6_solve/compile/python.lp index a49770a4..5ccca2d4 100644 --- a/src/constraint_handler/data/6_solve/compile/python.lp +++ b/src/constraint_handler/data/6_solve/compile/python.lp @@ -8,4 +8,4 @@ _se_value(E,V) :- _python_result(E,V), V=(bad;val(T,W)). _se_value(E,V) :- _python_result(E,RV), _expression_tupleLength(implode,RV,N), _direct_exploded(RV,V). _se_value(E,ref(set,E)) :- _python_result(E,set(L)). _set_candidate(E,V) :- _python_result(E,set(L)), RV=@pythonListElements(L), _direct_exploded(RV,V). -_direct_imploded(ref(set,E),set(L)) :- _python_result(E,set(L)). \ No newline at end of file +_direct_imploded(ref(set,E),set(L)) :- _python_result(E,set(L)). diff --git a/tests/correctness/expression/python_extract/set_compound_input.expected.all b/tests/correctness/expression/python_extract/set_compound_input.expected.all index e3109b4b..1f9e8c9b 100644 --- a/tests/correctness/expression/python_extract/set_compound_input.expected.all +++ b/tests/correctness/expression/python_extract/set_compound_input.expected.all @@ -1,2 +1,2 @@ value(nested_sum,val(int,5)) -value(tuple_sum,val(int,5)) \ No newline at end of file +value(tuple_sum,val(int,5)) diff --git a/tests/correctness/expression/python_extract/set_compound_input.lp b/tests/correctness/expression/python_extract/set_compound_input.lp index 3afd35fd..eae1cd97 100644 --- a/tests/correctness/expression/python_extract/set_compound_input.lp +++ b/tests/correctness/expression/python_extract/set_compound_input.lp @@ -9,4 +9,4 @@ variable_declare(pairs,set). set_assign(pairs,(val(int,2),val(int,3))). variable_define(nested_sum,operation(pythonExtract("","sum(sum(member) for member in pool)"),((val(string,"pool"),variable(nested)),()))). -variable_define(tuple_sum,operation(pythonExtract("","sum(sum(member) for member in pool)"),((val(string,"pool"),variable(pairs)),()))). \ No newline at end of file +variable_define(tuple_sum,operation(pythonExtract("","sum(sum(member) for member in pool)"),((val(string,"pool"),variable(pairs)),()))). diff --git a/tests/correctness/expression/python_extract/set_compound_output.expected.all b/tests/correctness/expression/python_extract/set_compound_output.expected.all index 22a24157..1a181981 100644 --- a/tests/correctness/expression/python_extract/set_compound_output.expected.all +++ b/tests/correctness/expression/python_extract/set_compound_output.expected.all @@ -1,2 +1,2 @@ value(nested_equal,val(bool,true)) -value(pairs_equal,val(bool,true)) \ No newline at end of file +value(pairs_equal,val(bool,true)) diff --git a/tests/correctness/expression/python_extract/set_compound_output.lp b/tests/correctness/expression/python_extract/set_compound_output.lp index 4096ff3d..2cb6efd8 100644 --- a/tests/correctness/expression/python_extract/set_compound_output.lp +++ b/tests/correctness/expression/python_extract/set_compound_output.lp @@ -13,4 +13,4 @@ set_assign(pairs,(val(int,1),variable(inner))). variable_define(python_nested,operation(pythonExtract("","frozenset({frozenset({2, 3})})"),())). variable_define(python_pairs,operation(pythonExtract("","frozenset({(1, frozenset({2, 3}))})"),())). variable_define(nested_equal,operation(eq,(variable(python_nested),(variable(nested),())))). -variable_define(pairs_equal,operation(eq,(variable(python_pairs),(variable(pairs),())))). \ No newline at end of file +variable_define(pairs_equal,operation(eq,(variable(python_pairs),(variable(pairs),())))). diff --git a/tests/investigate/tuple_domain_grounding.lp b/tests/investigate/tuple_domain_grounding.lp index e8b3eb37..d99a4e69 100644 --- a/tests/investigate/tuple_domain_grounding.lp +++ b/tests/investigate/tuple_domain_grounding.lp @@ -3,4 +3,4 @@ set_baseDomain(pool,val(int,1..3)). ensure(operation(set_isin,(val(int,1),(variable(pool),())))). ensure(operation(set_notin,(val(int,N),(variable(pool),())))) :- N=2..3. variable_define(out,(val(string,"pool"),variable(pool))). -#show value/2. \ No newline at end of file +#show value/2.