From 834c6abc296793d34bc5c6ee4dca4146579f52c6 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Thu, 19 Nov 2026 16:16:46 +1100 Subject: [PATCH 1/6] Introduce variable_declared/1 --- CHANGES.md | 2 ++ docs/developer/fact-format.md | 1 + docs/fact-format/fact-format.tex | 1 + docs/reference/core_syntax.md | 6 ++++++ src/constraint_handler/data/7_output/README.md | 4 ++++ src/constraint_handler/data/7_output/value.lp | 3 +++ src/constraint_handler/data/README.md | 1 + src/constraint_handler/schemas/internal.py | 4 ++++ src/constraint_handler/schemas/result.py | 6 +++++- tests/correctness/core/variable/declared.expected.all | 6 ++++++ tests/correctness/core/variable/declared.expected.none | 3 +++ tests/correctness/core/variable/declared.lp | 8 ++++++++ tests/test_encoding.py | 1 + 13 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 tests/correctness/core/variable/declared.expected.all create mode 100644 tests/correctness/core/variable/declared.expected.none create mode 100644 tests/correctness/core/variable/declared.lp diff --git a/CHANGES.md b/CHANGES.md index a5ccfe71..1464d6a1 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -2,6 +2,8 @@ ## Ongoing +- add `variable_declared(X)` output for user-facing variables with an active + declaration. - - rename `find`, `find2`, `maxEntries`, and `minEntries` to `multima_find`, `multimap_find2`, `multimap_maxEntries`, and `multimap_minEntries`. - - update `preference_holds` and `preference_variableValue` to take an diff --git a/docs/developer/fact-format.md b/docs/developer/fact-format.md index 1d501ea1..67efc656 100644 --- a/docs/developer/fact-format.md +++ b/docs/developer/fact-format.md @@ -239,6 +239,7 @@ This page describes the EBNF grammar for the fact format used by the constraint ::= | "value" "(" "," ")" + | "variable_declared" "(" ")" | "evaluated" "(" "," "," ")" | "set_value" "(" "," ")" | "multimap_value" "(" "," "," ")" diff --git a/docs/fact-format/fact-format.tex b/docs/fact-format/fact-format.tex index d044f5f8..e7f8a128 100644 --- a/docs/fact-format/fact-format.tex +++ b/docs/fact-format/fact-format.tex @@ -243,6 +243,7 @@ \subsection{Result fact format} ::= ~\alt `value' `(' `,' `)' +\alt `variable_declared' `(' `)' \alt `evaluated' `(' `,' `,' `)' \alt `set_value' `(' `,' `)' \alt `multimap_value' `(' `,' `,' `)' diff --git a/docs/reference/core_syntax.md b/docs/reference/core_syntax.md index 6a205e11..17495278 100644 --- a/docs/reference/core_syntax.md +++ b/docs/reference/core_syntax.md @@ -114,6 +114,12 @@ Variables represent references to values that can be reused throughout the progr **[Result]**{.badge .result } +`variable_declared(Name)` is added to the model when at least one declaration +of the user-facing variable `Name` has a condition that evaluates to true. +This includes declarations introduced by `variable_define` and collection +declarations. The marker is present even when the variable evaluates to `bad` +or is an empty collection. + When a variable is assigned a value, an atom of the `value/2` predicate is added to the model. The same predicate is also used by some higher-level features, such as labeled optimization declarations, to expose aggregated results in the final model. diff --git a/src/constraint_handler/data/7_output/README.md b/src/constraint_handler/data/7_output/README.md index e7582cf5..8a447973 100644 --- a/src/constraint_handler/data/7_output/README.md +++ b/src/constraint_handler/data/7_output/README.md @@ -1,5 +1,6 @@ ### Input predicates +_bool_evaluated/2. _expression(compile,variable/1). _passed(ENG,LBL,share_value/1). _se_value/2. @@ -7,6 +8,7 @@ _set_contains/2. ch_post(variable_interface/1,LBL). ch_post(evaluate/2,LBL). _warning/3. +ch_core(variable_declare/3,LBL). ch_core(warning_forbid/1,LBL). ch_core(warning_ignore/1,LBL). @@ -15,6 +17,7 @@ ch_core(warning_ignore/1,LBL). _se_value1/1. _shared_value/2. _type_variableD/2. +_variable_declared/1. _warning_forbid/2. _warning_ignore/2. _warning_raised/2. @@ -25,5 +28,6 @@ warning_raised/0. set_value/2. type_variableD/2. value/2. +variable_declared/1. warning/3. evaluated/2. diff --git a/src/constraint_handler/data/7_output/value.lp b/src/constraint_handler/data/7_output/value.lp index 13bf5f21..68b64446 100644 --- a/src/constraint_handler/data/7_output/value.lp +++ b/src/constraint_handler/data/7_output/value.lp @@ -1,3 +1,6 @@ +_variable_declared(X) :- ch_core(variable_declare(X,D,C),LBL), _bool_evaluated(C,val(bool,true)). +variable_declared(X) :- _variable_declared(X), ch_post(variable_interface(X),LBL). + set_value(X,V) :- _se_value(variable(X),set), _set_contains(variable(X),V), ch_post(variable_interface(X),LBL). %%% for compile2 set_value(X,V) :- _se_value(variable(X),ref(set,E)), _set_contains(E,V), ch_post(variable_interface(X),LBL). value(X,V) :- _se_value(variable(X),V), V != set, V != bad, ch_post(variable_interface(X),LBL). diff --git a/src/constraint_handler/data/README.md b/src/constraint_handler/data/README.md index d09de72b..b51dee39 100644 --- a/src/constraint_handler/data/README.md +++ b/src/constraint_handler/data/README.md @@ -34,6 +34,7 @@ None. warning/3. set_value/2. value/2. +variable_declared/1. multimap_value/3. bool_evaluated/2. evaluated/2. diff --git a/src/constraint_handler/schemas/internal.py b/src/constraint_handler/schemas/internal.py index e87882ca..5703143a 100644 --- a/src/constraint_handler/schemas/internal.py +++ b/src/constraint_handler/schemas/internal.py @@ -42,6 +42,10 @@ class _shared_value(NamedTuple): val: expression.ReducedExpr +class _variable_declared(NamedTuple): + name: expression.constant + + class _optimize_component(NamedTuple): expr: expression.Expr original: expression.Expr diff --git a/src/constraint_handler/schemas/result.py b/src/constraint_handler/schemas/result.py index fc0115d8..0316eca6 100644 --- a/src/constraint_handler/schemas/result.py +++ b/src/constraint_handler/schemas/result.py @@ -57,9 +57,13 @@ def __repr__(self): return f"Value({str(self.name)},{str(self.val)})" +class Variable_declared(NamedTuple): + name: expression.constant + + class Evaluated(NamedTuple): expr: expression.Expr value: expression.ReducedExpr -type ResultAtom = Bool_evaluated | Evaluated | Set_value | Multimap_value | OptimizeResult | Preference_score | Value | warning.Warning | warning.Warning_raised +type ResultAtom = Bool_evaluated | Evaluated | Set_value | Multimap_value | OptimizeResult | Preference_score | Value | Variable_declared | warning.Warning | warning.Warning_raised diff --git a/tests/correctness/core/variable/declared.expected.all b/tests/correctness/core/variable/declared.expected.all new file mode 100644 index 00000000..e93eea5f --- /dev/null +++ b/tests/correctness/core/variable/declared.expected.all @@ -0,0 +1,6 @@ +variable_declared(active) +variable_declared(conditional) +variable_declared(empty_set) +variable_declared(enabled) +variable_declared(multiple) +value(active,bad) diff --git a/tests/correctness/core/variable/declared.expected.none b/tests/correctness/core/variable/declared.expected.none new file mode 100644 index 00000000..f0ac1c97 --- /dev/null +++ b/tests/correctness/core/variable/declared.expected.none @@ -0,0 +1,3 @@ +variable_declared(bad_condition) +variable_declared(inactive) +variable_declared(undeclared) diff --git a/tests/correctness/core/variable/declared.lp b/tests/correctness/core/variable/declared.lp new file mode 100644 index 00000000..5e2f02cf --- /dev/null +++ b/tests/correctness/core/variable/declared.lp @@ -0,0 +1,8 @@ +variable_define(enabled,val(bool,true)). +variable_declare(active,definition,val(bool,true)). +variable_declare(inactive,definition,val(bool,false)). +variable_declare(bad_condition,definition,bad). +variable_declare(conditional,definition,variable(enabled)). +variable_declare(multiple,definition,val(bool,false)). +variable_declare(multiple,definition,val(bool,true)). +variable_declare(empty_set,set). diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 25eccbb2..930f649a 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -73,6 +73,7 @@ def run_test(name: str, selected_engine: engine.Engine): # "core/unbound_variable_expressions", "core/unprojected_optional_equality", "core/set_to_variable", + "core/variable/declared", ] datatype_tests = [ From 72907b983cb71ac374158e32e8a5717b7a1dfca9 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Thu, 19 Nov 2026 16:20:16 +1100 Subject: [PATCH 2/6] Add variable_declared to FCH --- src/flat_ch/api/ch/api.lp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/flat_ch/api/ch/api.lp b/src/flat_ch/api/ch/api.lp index 95da0820..71d03880 100644 --- a/src/flat_ch/api/ch/api.lp +++ b/src/flat_ch/api/ch/api.lp @@ -183,6 +183,8 @@ _fch_selected_var_def(NAME, DEFAULT_ID) :- _fch_default_apply(NAME, DEFAULT_ID, % CH-facing output compatibility. % +variable_declared(NAME) :- _fch_var_active(NAME). + set_size(NAME, SIZE) :- _fch_set_handle(NAME), _fch_set_size(NAME, SIZE). set_size(VAR_NAME, SIZE) :- _fch_var_def(VAR_NAME, TARGET_ID), _fch_set_handle(TARGET_ID), _fch_set_size(TARGET_ID, SIZE). @@ -289,6 +291,11 @@ value(NAME, bad) :- value(NAME, bad) :- _fch_empty_var_domain(NAME). +value(NAME, bad) :- + variable_declared(NAME), + _fch_var_active(NAME, definition), + not _fch_dynamic_var_def(NAME, _). + _fch_execution_input_declared(EXEC, VAR) :- _fch_flat(var_decl((EXEC, VAR, in))). _fch_execution_input_defined(EXEC, VAR) :- _fch_flat(var_def((EXEC, VAR, in), _)). _fch_execution_input_has_domain(EXEC, VAR) :- From 97507b103f089d3512475ad7fadb186a97bb2f79 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 16:52:41 +1100 Subject: [PATCH 3/6] Introduce variable_defined/1 --- CHANGES.md | 2 ++ docs/developer/fact-format.md | 1 + docs/fact-format/fact-format.tex | 1 + docs/reference/core_syntax.md | 3 +++ src/constraint_handler/data/7_output/README.md | 1 + src/constraint_handler/data/7_output/value.lp | 1 + src/constraint_handler/schemas/result.py | 6 +++++- .../core/variable/defined.expected.all | 5 +++++ .../core/variable/defined.expected.any | 2 ++ .../core/variable/defined.expected.none | 2 ++ tests/correctness/core/variable/defined.lp | 18 ++++++++++++++++++ tests/test_encoding.py | 4 ++++ 12 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 tests/correctness/core/variable/defined.expected.all create mode 100644 tests/correctness/core/variable/defined.expected.any create mode 100644 tests/correctness/core/variable/defined.expected.none create mode 100644 tests/correctness/core/variable/defined.lp diff --git a/CHANGES.md b/CHANGES.md index 1464d6a1..c7e268c4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ - 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` + value, including empty collections. - - rename `find`, `find2`, `maxEntries`, and `minEntries` to `multima_find`, `multimap_find2`, `multimap_maxEntries`, and `multimap_minEntries`. - - update `preference_holds` and `preference_variableValue` to take an diff --git a/docs/developer/fact-format.md b/docs/developer/fact-format.md index 67efc656..4d011839 100644 --- a/docs/developer/fact-format.md +++ b/docs/developer/fact-format.md @@ -240,6 +240,7 @@ This page describes the EBNF grammar for the fact format used by the constraint ::= | "value" "(" "," ")" | "variable_declared" "(" ")" + | "variable_defined" "(" ")" | "evaluated" "(" "," "," ")" | "set_value" "(" "," ")" | "multimap_value" "(" "," "," ")" diff --git a/docs/fact-format/fact-format.tex b/docs/fact-format/fact-format.tex index e7f8a128..83a280bc 100644 --- a/docs/fact-format/fact-format.tex +++ b/docs/fact-format/fact-format.tex @@ -244,6 +244,7 @@ \subsection{Result fact format} ::= ~\alt `value' `(' `,' `)' \alt `variable_declared' `(' `)' +\alt `variable_defined' `(' `)' \alt `evaluated' `(' `,' `,' `)' \alt `set_value' `(' `,' `)' \alt `multimap_value' `(' `,' `,' `)' diff --git a/docs/reference/core_syntax.md b/docs/reference/core_syntax.md index 17495278..4278b894 100644 --- a/docs/reference/core_syntax.md +++ b/docs/reference/core_syntax.md @@ -120,6 +120,9 @@ This includes declarations introduced by `variable_define` and collection declarations. The marker is present even when the variable evaluates to `bad` or is an empty collection. +`variable_defined(Name)` is added to the model when the user-facing variable +`Name` has a value other than `bad`. This includes empty collections. + When a variable is assigned a value, an atom of the `value/2` predicate is added to the model. The same predicate is also used by some higher-level features, such as labeled optimization declarations, to expose aggregated results in the final model. diff --git a/src/constraint_handler/data/7_output/README.md b/src/constraint_handler/data/7_output/README.md index 8a447973..d63685e9 100644 --- a/src/constraint_handler/data/7_output/README.md +++ b/src/constraint_handler/data/7_output/README.md @@ -29,5 +29,6 @@ set_value/2. type_variableD/2. value/2. variable_declared/1. +variable_defined/1. warning/3. evaluated/2. diff --git a/src/constraint_handler/data/7_output/value.lp b/src/constraint_handler/data/7_output/value.lp index 68b64446..35589693 100644 --- a/src/constraint_handler/data/7_output/value.lp +++ b/src/constraint_handler/data/7_output/value.lp @@ -1,5 +1,6 @@ _variable_declared(X) :- ch_core(variable_declare(X,D,C),LBL), _bool_evaluated(C,val(bool,true)). variable_declared(X) :- _variable_declared(X), ch_post(variable_interface(X),LBL). +variable_defined(X) :- _se_value(variable(X),V), V != bad, ch_post(variable_interface(X),LBL). set_value(X,V) :- _se_value(variable(X),set), _set_contains(variable(X),V), ch_post(variable_interface(X),LBL). %%% for compile2 set_value(X,V) :- _se_value(variable(X),ref(set,E)), _set_contains(E,V), ch_post(variable_interface(X),LBL). diff --git a/src/constraint_handler/schemas/result.py b/src/constraint_handler/schemas/result.py index 0316eca6..9bfa38d4 100644 --- a/src/constraint_handler/schemas/result.py +++ b/src/constraint_handler/schemas/result.py @@ -61,9 +61,13 @@ class Variable_declared(NamedTuple): name: expression.constant +class Variable_defined(NamedTuple): + name: expression.constant + + class Evaluated(NamedTuple): expr: expression.Expr value: expression.ReducedExpr -type ResultAtom = Bool_evaluated | Evaluated | Set_value | Multimap_value | OptimizeResult | Preference_score | Value | Variable_declared | warning.Warning | warning.Warning_raised +type ResultAtom = Bool_evaluated | Evaluated | Set_value | Multimap_value | OptimizeResult | Preference_score | Value | Variable_declared | Variable_defined | warning.Warning | warning.Warning_raised diff --git a/tests/correctness/core/variable/defined.expected.all b/tests/correctness/core/variable/defined.expected.all new file mode 100644 index 00000000..b90be1de --- /dev/null +++ b/tests/correctness/core/variable/defined.expected.all @@ -0,0 +1,5 @@ +variable_defined(boolean) +variable_defined(defined) +variable_defined(defined_set) +variable_defined(empty_set) +variable_defined(integer) \ No newline at end of file diff --git a/tests/correctness/core/variable/defined.expected.any b/tests/correctness/core/variable/defined.expected.any new file mode 100644 index 00000000..026a2eed --- /dev/null +++ b/tests/correctness/core/variable/defined.expected.any @@ -0,0 +1,2 @@ +variable_defined(conditional) +not_defined(conditional) \ No newline at end of file diff --git a/tests/correctness/core/variable/defined.expected.none b/tests/correctness/core/variable/defined.expected.none new file mode 100644 index 00000000..695473fa --- /dev/null +++ b/tests/correctness/core/variable/defined.expected.none @@ -0,0 +1,2 @@ +variable_defined(failed) +variable_defined(inactive) \ No newline at end of file diff --git a/tests/correctness/core/variable/defined.lp b/tests/correctness/core/variable/defined.lp new file mode 100644 index 00000000..218beed4 --- /dev/null +++ b/tests/correctness/core/variable/defined.lp @@ -0,0 +1,18 @@ +variable_declare(integer,fromFacts). +variable_domain(integer,val(int,42)). +variable_domain(integer,val(int,43)). +variable_declare(boolean,boolDomain). +variable_declare(forced_condition,boolDomain). +ensure(variable(forced_condition)). +variable_declare(defined,definition,variable(forced_condition)). +variable_define(defined,val(int,7)). +variable_declare(conditional,definition,variable(boolean)). +variable_define(conditional,val(int,8)). +not_defined(conditional) :- not variable_defined(conditional). +variable_declare(failed,definition). +variable_define(failed,bad). +variable_declare(empty_set,set). +variable_declare(defined_set,set). +set_assign(defined_set,val(int,1)). +variable_declare(inactive,definition,val(bool,false)). +variable_define(inactive,val(int,7)). \ No newline at end of file diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 930f649a..1de9b9ba 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -74,6 +74,7 @@ def run_test(name: str, selected_engine: engine.Engine): "core/unprojected_optional_equality", "core/set_to_variable", "core/variable/declared", + "core/variable/defined", ] datatype_tests = [ @@ -660,6 +661,7 @@ def run_test(name: str, selected_engine: engine.Engine): "core/conditional_declare_definition", "core/conditional_declare_set_multiple", "core/reasoning_modes_with_show", + "core/variable/defined", "datatype/bool/conj_disj_mixed", "datatype/float/mult/recovery", "default/basic_true", @@ -704,6 +706,7 @@ def run_test(name: str, selected_engine: engine.Engine): "core/reasoning_modes_with_show", "core/conditional_domain", "core/unbound_variable_expressions", + "core/variable/defined", "execution/conditional_input_domain", "execution/conditional_input_domain_dynamic", "execution/python_integrity_should_be_ignored", @@ -794,6 +797,7 @@ def test_engine(name: str, selected_engine: engine.Engine): "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", From e5fd068204de8fcdf8547c8356012439396bea12 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 16:54:49 +1100 Subject: [PATCH 4/6] Add variable_defined/1 to fch --- src/flat_ch/api/ch/api.lp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/flat_ch/api/ch/api.lp b/src/flat_ch/api/ch/api.lp index 71d03880..22f78921 100644 --- a/src/flat_ch/api/ch/api.lp +++ b/src/flat_ch/api/ch/api.lp @@ -185,6 +185,12 @@ _fch_selected_var_def(NAME, DEFAULT_ID) :- _fch_default_apply(NAME, DEFAULT_ID, variable_declared(NAME) :- _fch_var_active(NAME). +variable_defined(NAME) :- + _fch_dynamic_var_def(NAME, EXPR_ID), + _fch_dynamic_expr_val(EXPR_ID, TYPE, _), + TYPE != _fch_type_fail_id. +variable_defined(NAME) :- _fch_var_active(NAME, set). + set_size(NAME, SIZE) :- _fch_set_handle(NAME), _fch_set_size(NAME, SIZE). set_size(VAR_NAME, SIZE) :- _fch_var_def(VAR_NAME, TARGET_ID), _fch_set_handle(TARGET_ID), _fch_set_size(TARGET_ID, SIZE). From 94d60de1e6931e89a56342f77730f79b7c5c6ac4 Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 17:18:02 +1100 Subject: [PATCH 5/6] Prepare propagator support for variable_defined --- .../data/6_solve/propagator/propagator.lp | 3 +++ src/constraint_handler/data/7_output/value.lp | 3 ++- tests/correctness/core/variable/defined.expected.all | 3 ++- tests/correctness/core/variable/defined.expected.any | 2 +- tests/correctness/core/variable/defined.expected.none | 7 ++++++- tests/correctness/core/variable/defined.lp | 5 +++-- 6 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/constraint_handler/data/6_solve/propagator/propagator.lp b/src/constraint_handler/data/6_solve/propagator/propagator.lp index 15b14d14..403d678d 100644 --- a/src/constraint_handler/data/6_solve/propagator/propagator.lp +++ b/src/constraint_handler/data/6_solve/propagator/propagator.lp @@ -53,5 +53,8 @@ propagator_multimap_declare(X,LBL) :- _passed(propagator,LBL,variable_declare(X, propagator_share_value(E,LBL) :- _passed(propagator,LBL,share_value(E)). +{ _propagator_variable_defined(X) } :- _passed(propagator,LBL,variable_declare(X,D,C)), ch_post(variable_interface(X),LBL2), _bool_evaluated(C,val(bool,true)). +_variable_defined(X) :- _propagator_variable_defined(X). + propagator_warning_forbid(KIND,LBL) :- _warning_forbid(KIND,LBL). propagator_warning_ignore(KIND,LBL) :- _warning_ignore(KIND,LBL). diff --git a/src/constraint_handler/data/7_output/value.lp b/src/constraint_handler/data/7_output/value.lp index 35589693..67bde62d 100644 --- a/src/constraint_handler/data/7_output/value.lp +++ b/src/constraint_handler/data/7_output/value.lp @@ -1,6 +1,7 @@ _variable_declared(X) :- ch_core(variable_declare(X,D,C),LBL), _bool_evaluated(C,val(bool,true)). variable_declared(X) :- _variable_declared(X), ch_post(variable_interface(X),LBL). -variable_defined(X) :- _se_value(variable(X),V), V != bad, ch_post(variable_interface(X),LBL). +_variable_defined(X) :- _se_value(variable(X),V), V != bad. +variable_defined(X) :- _variable_defined(X), ch_post(variable_interface(X),LBL). set_value(X,V) :- _se_value(variable(X),set), _set_contains(variable(X),V), ch_post(variable_interface(X),LBL). %%% for compile2 set_value(X,V) :- _se_value(variable(X),ref(set,E)), _set_contains(E,V), ch_post(variable_interface(X),LBL). diff --git a/tests/correctness/core/variable/defined.expected.all b/tests/correctness/core/variable/defined.expected.all index b90be1de..ed9e6b38 100644 --- a/tests/correctness/core/variable/defined.expected.all +++ b/tests/correctness/core/variable/defined.expected.all @@ -2,4 +2,5 @@ variable_defined(boolean) variable_defined(defined) variable_defined(defined_set) variable_defined(empty_set) -variable_defined(integer) \ No newline at end of file +variable_defined(integer) +not_defined(inactive) diff --git a/tests/correctness/core/variable/defined.expected.any b/tests/correctness/core/variable/defined.expected.any index 026a2eed..8770acc6 100644 --- a/tests/correctness/core/variable/defined.expected.any +++ b/tests/correctness/core/variable/defined.expected.any @@ -1,2 +1,2 @@ variable_defined(conditional) -not_defined(conditional) \ No newline at end of file +not_defined(conditional) diff --git a/tests/correctness/core/variable/defined.expected.none b/tests/correctness/core/variable/defined.expected.none index 695473fa..6fb631a5 100644 --- a/tests/correctness/core/variable/defined.expected.none +++ b/tests/correctness/core/variable/defined.expected.none @@ -1,2 +1,7 @@ variable_defined(failed) -variable_defined(inactive) \ No newline at end of file +variable_defined(inactive) +not_defined(boolean) +not_defined(defined) +not_defined(defined_set) +not_defined(empty_set) +not_defined(integer) diff --git a/tests/correctness/core/variable/defined.lp b/tests/correctness/core/variable/defined.lp index 218beed4..2d6be59b 100644 --- a/tests/correctness/core/variable/defined.lp +++ b/tests/correctness/core/variable/defined.lp @@ -8,11 +8,12 @@ variable_declare(defined,definition,variable(forced_condition)). variable_define(defined,val(int,7)). variable_declare(conditional,definition,variable(boolean)). variable_define(conditional,val(int,8)). -not_defined(conditional) :- not variable_defined(conditional). variable_declare(failed,definition). variable_define(failed,bad). variable_declare(empty_set,set). variable_declare(defined_set,set). set_assign(defined_set,val(int,1)). variable_declare(inactive,definition,val(bool,false)). -variable_define(inactive,val(int,7)). \ No newline at end of file +variable_define(inactive,val(int,7)). +not_defined(X) :- variable_declare(X,D), not variable_defined(X). +not_defined(X) :- variable_declare(X,D,C), not variable_defined(X). From 05744ab6a86104a6db498e0a5c6aa4a49ecde6de Mon Sep 17 00:00:00 2001 From: Abdallah Saffidine Date: Sun, 22 Nov 2026 17:32:59 +1100 Subject: [PATCH 6/6] Temporarily disable propagator_variable_defined rule. --- src/constraint_handler/data/6_solve/propagator/propagator.lp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/constraint_handler/data/6_solve/propagator/propagator.lp b/src/constraint_handler/data/6_solve/propagator/propagator.lp index 403d678d..48e6b054 100644 --- a/src/constraint_handler/data/6_solve/propagator/propagator.lp +++ b/src/constraint_handler/data/6_solve/propagator/propagator.lp @@ -53,7 +53,7 @@ propagator_multimap_declare(X,LBL) :- _passed(propagator,LBL,variable_declare(X, propagator_share_value(E,LBL) :- _passed(propagator,LBL,share_value(E)). -{ _propagator_variable_defined(X) } :- _passed(propagator,LBL,variable_declare(X,D,C)), ch_post(variable_interface(X),LBL2), _bool_evaluated(C,val(bool,true)). +%{ _propagator_variable_defined(X) } :- _passed(propagator,LBL,variable_declare(X,D,C)), ch_post(variable_interface(X),LBL2), _bool_evaluated(C,val(bool,true)). _variable_defined(X) :- _propagator_variable_defined(X). propagator_warning_forbid(KIND,LBL) :- _warning_forbid(KIND,LBL).