diff --git a/src/constraint_handler/data/0_context/operator.lp b/src/constraint_handler/data/0_context/operator.lp index 80dd14a6..1f44bb3f 100644 --- a/src/constraint_handler/data/0_context/operator.lp +++ b/src/constraint_handler/data/0_context/operator.lp @@ -55,6 +55,7 @@ operator_declare((eq;neq),(float,(float,())),bool). operator_declare_variadic((add;mult),bool,int,1). operator_declare_variadic((add;mult),int,int,1). operator_declare_variadic((add;mult),bool,int,1). +_operator_recoverable(mult). operator_declare((sub;pow),(int,(int,())),int). _operator_recoverable(pow). operator_declare(int_div,((int;float),((int;float),())),int). diff --git a/src/constraint_handler/data/0_context/types.lp b/src/constraint_handler/data/0_context/types.lp index dc4b7cb6..f7fd1c6b 100644 --- a/src/constraint_handler/data/0_context/types.lp +++ b/src/constraint_handler/data/0_context/types.lp @@ -16,3 +16,4 @@ _type_extensionalEquality(symbol). %%%%%%%%%%%%%%%%% leq lt geq gt _type_extensionalOrder(int). _type_extensionalOrder(symbol). +_type_extensionalOrder(string). diff --git a/src/constraint_handler/data/6_solve/compile/equality.lp b/src/constraint_handler/data/6_solve/compile/equality.lp index 3c389839..d89d6220 100644 --- a/src/constraint_handler/data/6_solve/compile/equality.lp +++ b/src/constraint_handler/data/6_solve/compile/equality.lp @@ -1,5 +1,5 @@ %%%%%%%%%%%%%%%%% generic eq neq -_computeIdxType(E,IDX,T) :- _computeIdx(E,IDX,val(T,_)). +_computeIdxType(E,IDX,T) :- _computeIdx(E,IDX,val(T,V)). _computedIdx(E,val(bool,true)) :- _computeIdx(E,eq), _computeIdx(E,0,val(T,V)), _computeIdx(E,1,val(T,V)), _type_extensionalEquality(T). diff --git a/tests/correctness/datatype/bool/conj_disj/bad.expected.all b/tests/correctness/datatype/bool/conj_disj/bad.expected.all new file mode 100644 index 00000000..991611a2 --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/bad.expected.all @@ -0,0 +1,7 @@ +value(lt_bad,bad) +value(conj_bt,bad) +value(conj_tb,bad) +value(disj_bf,bad) +value(disj_fb,bad) +evaluated(conj,(val(bool,true),(bad,())),bad) +evaluated(disj,(val(bool,false),(bad,())),bad) diff --git a/tests/correctness/datatype/bool/conj_disj_bad.lp b/tests/correctness/datatype/bool/conj_disj/bad.lp similarity index 63% rename from tests/correctness/datatype/bool/conj_disj_bad.lp rename to tests/correctness/datatype/bool/conj_disj/bad.lp index 9055655c..728de2f0 100644 --- a/tests/correctness/datatype/bool/conj_disj_bad.lp +++ b/tests/correctness/datatype/bool/conj_disj/bad.lp @@ -5,10 +5,8 @@ variable_define(lt_bad,operation(lt,(variable(div_bad),(val(int,2),())))). variable_define(conj_bt,operation(conj,(variable(lt_bad),(val(bool,true),())))). variable_define(conj_tb,operation(conj,(val(bool,true),(variable(lt_bad),())))). -variable_define(conj_fb,operation(conj,(val(bool,false),(variable(lt_bad),())))). -variable_define(conj_bf,operation(conj,(variable(lt_bad),(val(bool,false),())))). - variable_define(disj_bf,operation(disj,(variable(lt_bad),(val(bool,false),())))). variable_define(disj_fb,operation(disj,(val(bool,false),(variable(lt_bad),())))). -variable_define(disj_tb,operation(disj,(val(bool,true),(variable(lt_bad),())))). -variable_define(disj_bt,operation(disj,(variable(lt_bad),(val(bool,true),())))). + +evaluate(conj,(val(bool,true),(bad,()))). +evaluate(disj,(val(bool,false),(bad,()))). diff --git a/tests/correctness/datatype/bool/conj_disj.expected.all b/tests/correctness/datatype/bool/conj_disj/basic.expected.all similarity index 100% rename from tests/correctness/datatype/bool/conj_disj.expected.all rename to tests/correctness/datatype/bool/conj_disj/basic.expected.all diff --git a/tests/correctness/datatype/bool/conj_disj.lp b/tests/correctness/datatype/bool/conj_disj/basic.lp similarity index 92% rename from tests/correctness/datatype/bool/conj_disj.lp rename to tests/correctness/datatype/bool/conj_disj/basic.lp index ef20132c..8e82cf04 100644 --- a/tests/correctness/datatype/bool/conj_disj.lp +++ b/tests/correctness/datatype/bool/conj_disj/basic.lp @@ -1,4 +1,4 @@ -%%% binary conjunction/disjunction without bad or none +%%% binary conjunction/disjunction without bad variable_define(conj_tt,operation(conj,(val(bool,true),(val(bool,true),())))). variable_define(conj_tf,operation(conj,(val(bool,true),(val(bool,false),())))). diff --git a/tests/correctness/datatype/bool/conj_disj_mixed.expected.all b/tests/correctness/datatype/bool/conj_disj/mixed.expected.all similarity index 92% rename from tests/correctness/datatype/bool/conj_disj_mixed.expected.all rename to tests/correctness/datatype/bool/conj_disj/mixed.expected.all index 86990e6a..56b947eb 100644 --- a/tests/correctness/datatype/bool/conj_disj_mixed.expected.all +++ b/tests/correctness/datatype/bool/conj_disj/mixed.expected.all @@ -4,4 +4,4 @@ evaluated(conj,(val(bool,true),(variable(lt_bad),(val(bool,false),(val(none,none evaluated(conj,(val(bool,true),(val(none,none),(val(bool,true),()))),val(none,none)) evaluated(disj,(val(bool,false),(variable(lt_bad),(val(none,none),()))),bad) evaluated(disj,(val(bool,false),(variable(lt_bad),(val(bool,true),(val(none,none),())))),val(bool,true)) -evaluated(disj,(val(bool,false),(val(none,none),(val(bool,false),(val(none,none),())))),val(bool,false)) +evaluated(disj,(val(bool,false),(val(none,none),(val(bool,false),(val(none,none),())))),val(none,none)) diff --git a/tests/correctness/datatype/bool/conj_disj_mixed.expected.none b/tests/correctness/datatype/bool/conj_disj/mixed.expected.none similarity index 100% rename from tests/correctness/datatype/bool/conj_disj_mixed.expected.none rename to tests/correctness/datatype/bool/conj_disj/mixed.expected.none diff --git a/tests/correctness/datatype/bool/conj_disj_mixed.lp b/tests/correctness/datatype/bool/conj_disj/mixed.lp similarity index 100% rename from tests/correctness/datatype/bool/conj_disj_mixed.lp rename to tests/correctness/datatype/bool/conj_disj/mixed.lp diff --git a/tests/correctness/datatype/bool/conj_disj_none.expected.all b/tests/correctness/datatype/bool/conj_disj/none.expected.all similarity index 100% rename from tests/correctness/datatype/bool/conj_disj_none.expected.all rename to tests/correctness/datatype/bool/conj_disj/none.expected.all diff --git a/tests/correctness/datatype/bool/conj_disj/none.expected.any b/tests/correctness/datatype/bool/conj_disj/none.expected.any new file mode 100644 index 00000000..8a5aafdf --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/none.expected.any @@ -0,0 +1,10 @@ +evaluated(conj,(variable(x),(val(bool,true),())),val(bool,true)) +evaluated(conj,(variable(x),(val(bool,true),())),val(bool,false)) +evaluated(conj,(variable(x),(val(bool,true),())),val(none,none)) +evaluated(conj,(variable(x),(val(none,none),())),val(bool,false)) +evaluated(conj,(variable(x),(val(none,none),())),val(none,none)) +evaluated(disj,(variable(x),(val(none,none),())),val(bool,true)) +evaluated(disj,(variable(x),(val(none,none),())),val(none,none)) +evaluated(disj,(variable(x),(val(bool,false),())),val(bool,true)) +evaluated(disj,(variable(x),(val(bool,false),())),val(none,none)) +evaluated(disj,(variable(x),(val(bool,false),())),val(bool,false)) diff --git a/tests/correctness/datatype/bool/conj_disj_none.expected.none b/tests/correctness/datatype/bool/conj_disj/none.expected.none similarity index 100% rename from tests/correctness/datatype/bool/conj_disj_none.expected.none rename to tests/correctness/datatype/bool/conj_disj/none.expected.none diff --git a/tests/correctness/unit/bad_add.expected.stats b/tests/correctness/datatype/bool/conj_disj/none.expected.stats similarity index 100% rename from tests/correctness/unit/bad_add.expected.stats rename to tests/correctness/datatype/bool/conj_disj/none.expected.stats diff --git a/tests/correctness/datatype/bool/conj_disj_none.lp b/tests/correctness/datatype/bool/conj_disj/none.lp similarity index 60% rename from tests/correctness/datatype/bool/conj_disj_none.lp rename to tests/correctness/datatype/bool/conj_disj/none.lp index 7e28d5dd..b0e3a884 100644 --- a/tests/correctness/datatype/bool/conj_disj_none.lp +++ b/tests/correctness/datatype/bool/conj_disj/none.lp @@ -1,5 +1,7 @@ %%% binary conjunction/disjunction with none involved +phase_request(constantFolding,false). + evaluate(conj,(val(bool,false),(val(none,none),()))). evaluate(conj,(val(none,none),(val(bool,false),()))). evaluate(conj,(val(bool,true),(val(none,none),()))). @@ -11,3 +13,12 @@ evaluate(disj,(val(none,none),(val(bool,false),()))). evaluate(disj,(val(bool,true),(val(none,none),()))). evaluate(disj,(val(none,none),(val(bool,true),()))). evaluate(disj,(val(none,none),(val(none,none),()))). + +variable_declare(x,fromFacts). +variable_domain(x,val(bool,true)). +variable_domain(x,val(bool,false)). +variable_domain(x,val(none,none)). +evaluate(conj,(variable(x),(val(bool,true),()))). +evaluate(conj,(variable(x),(val(none,none),()))). +evaluate(disj,(variable(x),(val(bool,false),()))). +evaluate(disj,(variable(x),(val(none,none),()))). diff --git a/tests/correctness/datatype/bool/conj_disj/variable.expected.all b/tests/correctness/datatype/bool/conj_disj/variable.expected.all new file mode 100644 index 00000000..4dd44924 --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/variable.expected.all @@ -0,0 +1,2 @@ +evaluated(conj,(variable(x),(val(bool,false),())),val(bool,false)) +evaluated(disj,(variable(x),(val(bool,true),())),val(bool,true)) diff --git a/tests/correctness/datatype/bool/conj_disj/variable.expected.any b/tests/correctness/datatype/bool/conj_disj/variable.expected.any new file mode 100644 index 00000000..6ff261d6 --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/variable.expected.any @@ -0,0 +1,10 @@ +evaluated(conj,(variable(x),(val(bool,true),())),val(bool,false)) +evaluated(conj,(variable(x),(val(bool,true),())),val(bool,true)) +evaluated(conj,(variable(x),(val(bool,true),())),bad) +evaluated(conj,(variable(x),(bad,())),val(bool,false)) +evaluated(conj,(variable(x),(bad,())),bad) +evaluated(disj,(variable(x),(val(bool,false),())),val(bool,false)) +evaluated(disj,(variable(x),(val(bool,false),())),val(bool,true)) +evaluated(disj,(variable(x),(val(bool,false),())),bad) +evaluated(disj,(variable(x),(bad,())),val(bool,true)) +evaluated(disj,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_concat.expected.stats b/tests/correctness/datatype/bool/conj_disj/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_concat.expected.stats rename to tests/correctness/datatype/bool/conj_disj/variable.expected.stats diff --git a/tests/correctness/datatype/bool/conj_disj/variable.lp b/tests/correctness/datatype/bool/conj_disj/variable.lp new file mode 100644 index 00000000..2ffcd1ce --- /dev/null +++ b/tests/correctness/datatype/bool/conj_disj/variable.lp @@ -0,0 +1,12 @@ +phase_request(constantFolding,false). + +variable_declare(x,fromFacts). +variable_domain(x,val(bool,false)). +variable_domain(x,val(bool,true)). +variable_domain(x,bad). +evaluate(conj,(variable(x),(val(bool,false),()))). +evaluate(conj,(variable(x),(val(bool,true),()))). +evaluate(conj,(variable(x),(bad,()))). +evaluate(disj,(variable(x),(val(bool,false),()))). +evaluate(disj,(variable(x),(val(bool,true),()))). +evaluate(disj,(variable(x),(bad,()))). diff --git a/tests/correctness/datatype/bool/conj_disj_variadic.expected.all b/tests/correctness/datatype/bool/conj_disj/variadic.expected.all similarity index 100% rename from tests/correctness/datatype/bool/conj_disj_variadic.expected.all rename to tests/correctness/datatype/bool/conj_disj/variadic.expected.all diff --git a/tests/correctness/datatype/bool/conj_disj_variadic.lp b/tests/correctness/datatype/bool/conj_disj/variadic.lp similarity index 100% rename from tests/correctness/datatype/bool/conj_disj_variadic.lp rename to tests/correctness/datatype/bool/conj_disj/variadic.lp diff --git a/tests/correctness/datatype/bool/conj_disj_bad.expected.all b/tests/correctness/datatype/bool/conj_disj_bad.expected.all deleted file mode 100644 index 63e686c3..00000000 --- a/tests/correctness/datatype/bool/conj_disj_bad.expected.all +++ /dev/null @@ -1,9 +0,0 @@ -value(lt_bad,bad) -value(conj_bt,bad) -value(conj_tb,bad) -value(conj_fb,val(bool,false)) -value(conj_bf,val(bool,false)) -value(disj_bf,bad) -value(disj_fb,bad) -value(disj_tb,val(bool,true)) -value(disj_bt,val(bool,true)) diff --git a/tests/correctness/datatype/bool/leqv_lxor/bad.expected.all b/tests/correctness/datatype/bool/leqv_lxor/bad.expected.all new file mode 100644 index 00000000..1669a3a9 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/bad.expected.all @@ -0,0 +1,8 @@ +evaluated(leqv,(val(bool,true),(bad,())),bad) +evaluated(leqv,(val(bool,false),(bad,())),bad) +evaluated(leqv,(bad,(bad,())),bad) +evaluated(leqv,(bad,()),bad) +evaluated(lxor,(val(bool,true),(bad,())),bad) +evaluated(lxor,(val(bool,false),(bad,())),bad) +evaluated(lxor,(bad,(bad,())),bad) +evaluated(lxor,(bad,()),bad) diff --git a/tests/correctness/datatype/bool/leqv_lxor/bad.lp b/tests/correctness/datatype/bool/leqv_lxor/bad.lp new file mode 100644 index 00000000..720afe12 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/bad.lp @@ -0,0 +1,10 @@ +phase_request(constantFolding,false). + +evaluate(leqv,(val(bool,true),(bad,()))). +evaluate(leqv,(val(bool,false),(bad,()))). +evaluate(leqv,(bad,(bad,()))). +evaluate(leqv,(bad,())). +evaluate(lxor,(val(bool,true),(bad,()))). +evaluate(lxor,(val(bool,false),(bad,()))). +evaluate(lxor,(bad,(bad,()))). +evaluate(lxor,(bad,())). diff --git a/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.all b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.all new file mode 100644 index 00000000..728f9482 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.all @@ -0,0 +1,4 @@ +evaluated(leqv,(val(bool,true),(val(bool,true),())),val(bool,true)) +evaluated(leqv,(val(bool,true),(val(bool,false),())),val(bool,false)) +evaluated(leqv,(val(bool,false),(val(bool,true),())),val(bool,false)) +evaluated(leqv,(val(bool,false),(val(bool,false),())),val(bool,true)) diff --git a/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.none b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.none new file mode 100644 index 00000000..7b806013 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.none @@ -0,0 +1,8 @@ +evaluated(leqv,(val(bool,true),(val(bool,true),())),val(bool,false)) +evaluated(leqv,(val(bool,true),(val(bool,true),())),bad) +evaluated(leqv,(val(bool,false),(val(bool,true),())),val(bool,true)) +evaluated(leqv,(val(bool,false),(val(bool,true),())),bad) +evaluated(leqv,(val(bool,true),(val(bool,false),())),val(bool,true)) +evaluated(leqv,(val(bool,true),(val(bool,false),())),bad) +evaluated(leqv,(val(bool,false),(val(bool,false),())),val(bool,false)) +evaluated(leqv,(val(bool,false),(val(bool,false),())),bad) diff --git a/tests/correctness/unit/nullary/boolean_conj.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/boolean_conj.expected.stats rename to tests/correctness/datatype/bool/leqv_lxor/leqv_basic.expected.stats diff --git a/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.lp b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.lp new file mode 100644 index 00000000..8a13c8cf --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/leqv_basic.lp @@ -0,0 +1,4 @@ +evaluate(leqv,(val(bool,true),(val(bool,true),()))). +evaluate(leqv,(val(bool,true),(val(bool,false),()))). +evaluate(leqv,(val(bool,false),(val(bool,true),()))). +evaluate(leqv,(val(bool,false),(val(bool,false),()))). diff --git a/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.all b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.all new file mode 100644 index 00000000..3c5d0a07 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.all @@ -0,0 +1,4 @@ +evaluated(lxor,(val(bool,false),(val(bool,false),())),val(bool,false)) +evaluated(lxor,(val(bool,false),(val(bool,true),())),val(bool,true)) +evaluated(lxor,(val(bool,true),(val(bool,false),())),val(bool,true)) +evaluated(lxor,(val(bool,true),(val(bool,true),())),val(bool,false)) diff --git a/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.none b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.none new file mode 100644 index 00000000..5ddedf96 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.none @@ -0,0 +1,9 @@ +evaluated(lxor,(val(bool,false),(val(bool,false),())),val(bool,true)) +evaluated(lxor,(val(bool,false),(val(bool,true),())),val(bool,false)) +evaluated(lxor,(val(bool,true),(val(bool,false),())),val(bool,false)) +evaluated(lxor,(val(bool,true),(val(bool,true),())),val(bool,true)) + +evaluated(lxor,(val(bool,false),(val(bool,false),())),bad) +evaluated(lxor,(val(bool,false),(val(bool,true),())),bad) +evaluated(lxor,(val(bool,true),(val(bool,false),())),bad) +evaluated(lxor,(val(bool,true),(val(bool,true),())),bad) diff --git a/tests/correctness/unit/nullary/boolean_disj.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/boolean_disj.expected.stats rename to tests/correctness/datatype/bool/leqv_lxor/lxor_basic.expected.stats diff --git a/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.lp b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.lp new file mode 100644 index 00000000..1a4f5d5f --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/lxor_basic.lp @@ -0,0 +1,4 @@ +evaluate(lxor,(val(bool,false),(val(bool,false),()))). +evaluate(lxor,(val(bool,false),(val(bool,true),()))). +evaluate(lxor,(val(bool,true),(val(bool,false),()))). +evaluate(lxor,(val(bool,true),(val(bool,true),()))). diff --git a/tests/correctness/datatype/bool/leqv_lxor/none.expected.all b/tests/correctness/datatype/bool/leqv_lxor/none.expected.all new file mode 100644 index 00000000..f7cdabef --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/none.expected.all @@ -0,0 +1,14 @@ +evaluated(leqv,(val(bool,true),(val(none,none),())),bad) +evaluated(leqv,(val(bool,false),(val(none,none),())),bad) +evaluated(leqv,(val(none,none),(val(bool,true),())),bad) +evaluated(leqv,(val(none,none),(val(bool,false),())),bad) +evaluated(leqv,(val(none,none),(val(none,none),())),bad) +evaluated(lxor,(val(bool,true),(val(none,none),())),bad) +evaluated(lxor,(val(bool,false),(val(none,none),())),bad) +evaluated(lxor,(val(none,none),(val(bool,true),())),bad) +evaluated(lxor,(val(none,none),(val(bool,false),())),bad) +evaluated(lxor,(val(none,none),(val(none,none),())),bad) +evaluated(leqv,(val(none,none),()),bad) +evaluated(lxor,(val(none,none),()),bad) +evaluated(leqv,(val(none,none),(variable(x),())),bad) +evaluated(lxor,(val(none,none),(variable(x),())),bad) diff --git a/tests/correctness/unit/bad_float_div.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/none.expected.stats similarity index 100% rename from tests/correctness/unit/bad_float_div.expected.stats rename to tests/correctness/datatype/bool/leqv_lxor/none.expected.stats diff --git a/tests/correctness/datatype/bool/leqv_lxor/none.lp b/tests/correctness/datatype/bool/leqv_lxor/none.lp new file mode 100644 index 00000000..2003996f --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/none.lp @@ -0,0 +1,22 @@ +phase_request(constantFolding,false). + +evaluate(leqv,(val(bool,true),(val(none,none),()))). +evaluate(leqv,(val(bool,false),(val(none,none),()))). +evaluate(leqv,(val(none,none),(val(bool,true),()))). +evaluate(leqv,(val(none,none),(val(bool,false),()))). +evaluate(leqv,(val(none,none),(val(none,none),()))). +evaluate(lxor,(val(bool,true),(val(none,none),()))). +evaluate(lxor,(val(bool,false),(val(none,none),()))). +evaluate(lxor,(val(none,none),(val(bool,true),()))). +evaluate(lxor,(val(none,none),(val(bool,false),()))). +evaluate(lxor,(val(none,none),(val(none,none),()))). + +evaluate(leqv,(val(none,none),())). +evaluate(lxor,(val(none,none),())). + +variable_declare(x,fromFacts). +variable_domain(x,val(bool,true)). +variable_domain(x,val(bool,false)). +variable_domain(x,val(none,none)). +evaluate(leqv,(val(none,none),(variable(x),()))). +evaluate(lxor,(val(none,none),(variable(x),()))). diff --git a/tests/correctness/datatype/bool/leqv_lxor/variable.expected.any b/tests/correctness/datatype/bool/leqv_lxor/variable.expected.any new file mode 100644 index 00000000..317f9aa8 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/variable.expected.any @@ -0,0 +1,14 @@ +evaluated(leqv,(variable(x),(val(bool,false),())),val(bool,false)) +evaluated(leqv,(variable(x),(val(bool,false),())),val(bool,true)) +evaluated(leqv,(variable(x),(val(bool,false),())),bad) +evaluated(leqv,(variable(x),(val(bool,true),())),val(bool,false)) +evaluated(leqv,(variable(x),(val(bool,true),())),val(bool,true)) +evaluated(leqv,(variable(x),(val(bool,true),())),bad) +evaluated(leqv,(variable(x),(bad,())),bad) +evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,false)) +evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,true)) +evaluated(lxor,(variable(x),(val(bool,false),())),bad) +evaluated(lxor,(variable(x),(val(bool,true),())),val(bool,false)) +evaluated(lxor,(variable(x),(val(bool,true),())),val(bool,true)) +evaluated(lxor,(variable(x),(val(bool,true),())),bad) +evaluated(lxor,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_int_div.expected.stats b/tests/correctness/datatype/bool/leqv_lxor/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_int_div.expected.stats rename to tests/correctness/datatype/bool/leqv_lxor/variable.expected.stats diff --git a/tests/correctness/unit/bad_lxor.lp b/tests/correctness/datatype/bool/leqv_lxor/variable.lp similarity index 52% rename from tests/correctness/unit/bad_lxor.lp rename to tests/correctness/datatype/bool/leqv_lxor/variable.lp index f965171a..3a88c00f 100644 --- a/tests/correctness/unit/bad_lxor.lp +++ b/tests/correctness/datatype/bool/leqv_lxor/variable.lp @@ -1,14 +1,13 @@ phase_request(constantFolding,false). -evaluate(lxor,(val(bool,false),(val(none,none),()))). -evaluate(lxor,(val(bool,true),(val(bool,false),()))). -evaluate(lxor,(val(bool,true),(bad,()))). - variable_declare(x,fromFacts). variable_domain(x,val(bool,false)). variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). variable_domain(x,bad). + +evaluate(leqv,(variable(x),(val(bool,false),()))). +evaluate(leqv,(variable(x),(val(bool,true),()))). +evaluate(leqv,(variable(x),(bad,()))). evaluate(lxor,(variable(x),(val(bool,false),()))). -evaluate(lxor,(variable(x),(val(none,none),()))). +evaluate(lxor,(variable(x),(val(bool,true),()))). evaluate(lxor,(variable(x),(bad,()))). diff --git a/tests/correctness/datatype/bool/leqv_lxor/variadic.expected.all b/tests/correctness/datatype/bool/leqv_lxor/variadic.expected.all new file mode 100644 index 00000000..89c48b76 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/variadic.expected.all @@ -0,0 +1,12 @@ +evaluated(leqv,(),val(bool,true)) +evaluated(leqv,(val(bool,true),()),val(bool,true)) +evaluated(leqv,(val(bool,false),()),val(bool,false)) +evaluated(leqv,(val(bool,true),(val(bool,true),(val(bool,true),()))),val(bool,true)) +evaluated(leqv,(val(bool,true),(val(bool,false),(val(bool,true),()))),val(bool,false)) +evaluated(leqv,(val(bool,false),(val(bool,false),(val(bool,false),()))),val(bool,false)) +evaluated(lxor,(),val(bool,false)) +evaluated(lxor,(val(bool,true),()),val(bool,true)) +evaluated(lxor,(val(bool,false),()),val(bool,false)) +evaluated(lxor,(val(bool,true),(val(bool,true),(val(bool,true),()))),val(bool,true)) +evaluated(lxor,(val(bool,true),(val(bool,false),(val(bool,true),()))),val(bool,false)) +evaluated(lxor,(val(bool,false),(val(bool,false),(val(bool,false),()))),val(bool,false)) diff --git a/tests/correctness/datatype/bool/leqv_lxor/variadic.lp b/tests/correctness/datatype/bool/leqv_lxor/variadic.lp new file mode 100644 index 00000000..e0e4a655 --- /dev/null +++ b/tests/correctness/datatype/bool/leqv_lxor/variadic.lp @@ -0,0 +1,13 @@ +evaluate(leqv,()). +evaluate(leqv,(val(bool,true),())). +evaluate(leqv,(val(bool,false),())). +evaluate(leqv,(val(bool,true),(val(bool,true),(val(bool,true),())))). +evaluate(leqv,(val(bool,true),(val(bool,false),(val(bool,true),())))). +evaluate(leqv,(val(bool,false),(val(bool,false),(val(bool,false),())))). + +evaluate(lxor,()). +evaluate(lxor,(val(bool,true),())). +evaluate(lxor,(val(bool,false),())). +evaluate(lxor,(val(bool,true),(val(bool,true),(val(bool,true),())))). +evaluate(lxor,(val(bool,true),(val(bool,false),(val(bool,true),())))). +evaluate(lxor,(val(bool,false),(val(bool,false),(val(bool,false),())))). diff --git a/tests/correctness/datatype/bool/negation_logical_bad.expected.all b/tests/correctness/datatype/bool/negation/logical_bad.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_logical_bad.expected.all rename to tests/correctness/datatype/bool/negation/logical_bad.expected.all diff --git a/tests/correctness/datatype/bool/negation_logical_bad.lp b/tests/correctness/datatype/bool/negation/logical_bad.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_logical_bad.lp rename to tests/correctness/datatype/bool/negation/logical_bad.lp diff --git a/tests/correctness/datatype/bool/negation_logical_basic.expected.all b/tests/correctness/datatype/bool/negation/logical_basic.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_logical_basic.expected.all rename to tests/correctness/datatype/bool/negation/logical_basic.expected.all diff --git a/tests/correctness/datatype/bool/negation_logical_basic.lp b/tests/correctness/datatype/bool/negation/logical_basic.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_logical_basic.lp rename to tests/correctness/datatype/bool/negation/logical_basic.lp diff --git a/tests/correctness/datatype/bool/negation_logical_none.expected.all b/tests/correctness/datatype/bool/negation/logical_none.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_logical_none.expected.all rename to tests/correctness/datatype/bool/negation/logical_none.expected.all diff --git a/tests/correctness/datatype/bool/negation_logical_none.lp b/tests/correctness/datatype/bool/negation/logical_none.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_logical_none.lp rename to tests/correctness/datatype/bool/negation/logical_none.lp diff --git a/tests/correctness/datatype/bool/negation_strong_bad.expected.all b/tests/correctness/datatype/bool/negation/strong_bad.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_strong_bad.expected.all rename to tests/correctness/datatype/bool/negation/strong_bad.expected.all diff --git a/tests/correctness/datatype/bool/negation_strong_bad.lp b/tests/correctness/datatype/bool/negation/strong_bad.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_strong_bad.lp rename to tests/correctness/datatype/bool/negation/strong_bad.lp diff --git a/tests/correctness/datatype/bool/negation_strong_basic.expected.all b/tests/correctness/datatype/bool/negation/strong_basic.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_strong_basic.expected.all rename to tests/correctness/datatype/bool/negation/strong_basic.expected.all diff --git a/tests/correctness/datatype/bool/negation_strong_basic.lp b/tests/correctness/datatype/bool/negation/strong_basic.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_strong_basic.lp rename to tests/correctness/datatype/bool/negation/strong_basic.lp diff --git a/tests/correctness/datatype/bool/negation_strong_none.expected.all b/tests/correctness/datatype/bool/negation/strong_none.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_strong_none.expected.all rename to tests/correctness/datatype/bool/negation/strong_none.expected.all diff --git a/tests/correctness/datatype/bool/negation_strong_none.lp b/tests/correctness/datatype/bool/negation/strong_none.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_strong_none.lp rename to tests/correctness/datatype/bool/negation/strong_none.lp diff --git a/tests/correctness/datatype/bool/negation/variable.expected.all b/tests/correctness/datatype/bool/negation/variable.expected.all new file mode 100644 index 00000000..d7d18e13 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/variable.expected.all @@ -0,0 +1,2 @@ +evaluated(wnot,(variable(y),()),val(bool,true)) +evaluated(snot,(variable(z),()),val(bool,false)) diff --git a/tests/correctness/datatype/bool/negation/variable.expected.any b/tests/correctness/datatype/bool/negation/variable.expected.any new file mode 100644 index 00000000..1ebcb3e4 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/variable.expected.any @@ -0,0 +1,23 @@ +evaluated(lnot,(variable(x),()),val(bool,true)) +evaluated(lnot,(variable(x),()),val(bool,false)) +evaluated(lnot,(variable(y),()),val(bool,true)) +evaluated(lnot,(variable(y),()),val(none,none)) +evaluated(lnot,(variable(z),()),val(bool,false)) +evaluated(lnot,(variable(z),()),val(none,none)) +evaluated(lnot,(variable(t),()),val(bool,true)) +evaluated(lnot,(variable(t),()),val(bool,false)) +evaluated(lnot,(variable(t),()),val(none,none)) + +evaluated(snot,(variable(x),()),val(bool,true)) +evaluated(snot,(variable(x),()),val(bool,false)) +evaluated(snot,(variable(y),()),val(bool,false)) +evaluated(snot,(variable(y),()),val(bool,true)) +evaluated(snot,(variable(t),()),val(bool,true)) +evaluated(snot,(variable(t),()),val(bool,false)) + +evaluated(wnot,(variable(x),()),val(bool,true)) +evaluated(wnot,(variable(x),()),val(bool,false)) +evaluated(wnot,(variable(z),()),val(bool,true)) +evaluated(wnot,(variable(z),()),val(bool,false)) +evaluated(wnot,(variable(t),()),val(bool,true)) +evaluated(wnot,(variable(t),()),val(bool,false)) diff --git a/tests/correctness/datatype/bool/negation/variable.expected.none b/tests/correctness/datatype/bool/negation/variable.expected.none new file mode 100644 index 00000000..d5f623eb --- /dev/null +++ b/tests/correctness/datatype/bool/negation/variable.expected.none @@ -0,0 +1,25 @@ +evaluated(lnot,(variable(x),()),val(none,none)) +evaluated(lnot,(variable(x),()),bad) +evaluated(lnot,(variable(y),()),val(bool,false)) +evaluated(lnot,(variable(y),()),bad) +evaluated(lnot,(variable(z),()),val(bool,true)) +evaluated(lnot,(variable(z),()),bad) +evaluated(lnot,(variable(t),()),bad) + +evaluated(snot,(variable(x),()),bad) +evaluated(snot,(variable(y),()),bad) +evaluated(snot,(variable(z),()),bad) +evaluated(snot,(variable(t),()),bad) +evaluated(wnot,(variable(x),()),bad) +evaluated(wnot,(variable(y),()),bad) +evaluated(wnot,(variable(z),()),bad) +evaluated(wnot,(variable(t),()),bad) + +evaluated(snot,(variable(x),()),val(none,none)) +evaluated(snot,(variable(y),()),val(none,none)) +evaluated(snot,(variable(z),()),val(none,none)) +evaluated(snot,(variable(t),()),val(none,none)) +evaluated(wnot,(variable(x),()),val(none,none)) +evaluated(wnot,(variable(y),()),val(none,none)) +evaluated(wnot,(variable(z),()),val(none,none)) +evaluated(wnot,(variable(t),()),val(none,none)) diff --git a/tests/correctness/datatype/bool/negation/variable.expected.stats b/tests/correctness/datatype/bool/negation/variable.expected.stats new file mode 100644 index 00000000..393a4fd1 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/variable.expected.stats @@ -0,0 +1 @@ +models=24 diff --git a/tests/correctness/datatype/bool/negation/variable.lp b/tests/correctness/datatype/bool/negation/variable.lp new file mode 100644 index 00000000..b73a8455 --- /dev/null +++ b/tests/correctness/datatype/bool/negation/variable.lp @@ -0,0 +1,25 @@ +variable_declare(x,fromFacts). +variable_domain(x,val(bool,false)). +variable_domain(x,val(bool,true)). +variable_declare(y,fromFacts). +variable_domain(y,val(bool,false)). +variable_domain(y,val(none,none)). +variable_declare(z,fromFacts). +variable_domain(z,val(bool,true)). +variable_domain(z,val(none,none)). +variable_declare(t,fromFacts). +variable_domain(t,val(bool,false)). +variable_domain(t,val(bool,true)). +variable_domain(t,val(none,none)). +evaluate(lnot,(variable(x),())). +evaluate(lnot,(variable(y),())). +evaluate(lnot,(variable(z),())). +evaluate(lnot,(variable(t),())). +evaluate(snot,(variable(x),())). +evaluate(snot,(variable(y),())). +evaluate(snot,(variable(z),())). +evaluate(snot,(variable(t),())). +evaluate(wnot,(variable(x),())). +evaluate(wnot,(variable(y),())). +evaluate(wnot,(variable(z),())). +evaluate(wnot,(variable(t),())). diff --git a/tests/correctness/datatype/bool/negation_weak_bad.expected.all b/tests/correctness/datatype/bool/negation/weak_bad.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_weak_bad.expected.all rename to tests/correctness/datatype/bool/negation/weak_bad.expected.all diff --git a/tests/correctness/datatype/bool/negation_weak_bad.lp b/tests/correctness/datatype/bool/negation/weak_bad.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_weak_bad.lp rename to tests/correctness/datatype/bool/negation/weak_bad.lp diff --git a/tests/correctness/datatype/bool/negation_weak_basic.expected.all b/tests/correctness/datatype/bool/negation/weak_basic.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_weak_basic.expected.all rename to tests/correctness/datatype/bool/negation/weak_basic.expected.all diff --git a/tests/correctness/datatype/bool/negation_weak_basic.lp b/tests/correctness/datatype/bool/negation/weak_basic.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_weak_basic.lp rename to tests/correctness/datatype/bool/negation/weak_basic.lp diff --git a/tests/correctness/datatype/bool/negation_weak_none.expected.all b/tests/correctness/datatype/bool/negation/weak_none.expected.all similarity index 100% rename from tests/correctness/datatype/bool/negation_weak_none.expected.all rename to tests/correctness/datatype/bool/negation/weak_none.expected.all diff --git a/tests/correctness/datatype/bool/negation_weak_none.lp b/tests/correctness/datatype/bool/negation/weak_none.lp similarity index 100% rename from tests/correctness/datatype/bool/negation_weak_none.lp rename to tests/correctness/datatype/bool/negation/weak_none.lp diff --git a/tests/correctness/datatype/conditional/if/bad.expected.all b/tests/correctness/datatype/conditional/if/bad.expected.all new file mode 100644 index 00000000..41165a70 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/bad.expected.all @@ -0,0 +1,3 @@ +evaluated(if,(val(bool,true),(bad,())),bad) +evaluated(if,(bad,(val(int,1),())),bad) +evaluated(if,(bad,(bad,())),bad) diff --git a/tests/correctness/datatype/conditional/if/bad.expected.none b/tests/correctness/datatype/conditional/if/bad.expected.none new file mode 100644 index 00000000..2559d1c4 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/bad.expected.none @@ -0,0 +1,4 @@ +evaluated(if,(val(bool,true),(bad,())),val(int,1)) +evaluated(if,(val(bool,true),(bad,())),val(none,none)) +evaluated(if,(bad,(val(int,1),())),val(int,1)) +evaluated(if,(bad,(val(int,1),())),val(none,none)) diff --git a/tests/correctness/unit/nullary/boolean_leqv.expected.stats b/tests/correctness/datatype/conditional/if/bad.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/boolean_leqv.expected.stats rename to tests/correctness/datatype/conditional/if/bad.expected.stats diff --git a/tests/correctness/datatype/conditional/if/bad.lp b/tests/correctness/datatype/conditional/if/bad.lp new file mode 100644 index 00000000..bfd8fc72 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/bad.lp @@ -0,0 +1,3 @@ +evaluate(if,(val(bool,true),(bad,()))). +evaluate(if,(bad,(val(int,1),()))). +evaluate(if,(bad,(bad,()))). diff --git a/tests/correctness/unit/boolean_if.expected.all b/tests/correctness/datatype/conditional/if/basic.expected.all similarity index 56% rename from tests/correctness/unit/boolean_if.expected.all rename to tests/correctness/datatype/conditional/if/basic.expected.all index 8a328ef6..b8176b6b 100644 --- a/tests/correctness/unit/boolean_if.expected.all +++ b/tests/correctness/datatype/conditional/if/basic.expected.all @@ -1,6 +1,3 @@ evaluated(if,(val(bool,true),(val(int,1),())),val(int,1)) -evaluated(if,(val(bool,true),(bad,())),bad) evaluated(if,(val(bool,false),(val(int,1),())),val(none,none)) -evaluated(if,(val(bool,false),(bad,())),val(none,none)) evaluated(if,(val(none,none),(val(int,1),())),val(none,none)) -evaluated(if,(bad,(val(int,1),())),bad) diff --git a/tests/correctness/datatype/conditional/if/basic.expected.none b/tests/correctness/datatype/conditional/if/basic.expected.none new file mode 100644 index 00000000..bbf74b04 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/basic.expected.none @@ -0,0 +1,12 @@ +evaluated(if,(val(bool,true),(val(int,1),())),val(none,none)) +evaluated(if,(val(bool,true),(val(int,1),())),bad) +evaluated(if,(val(bool,true),(val(int,1),())),val(bool,true)) +evaluated(if,(val(bool,true),(val(int,1),())),val(bool,false)) +evaluated(if,(val(bool,false),(val(int,1),())),val(int,1)) +evaluated(if,(val(bool,false),(val(int,1),())),bad) +evaluated(if,(val(bool,false),(val(int,1),())),val(bool,true)) +evaluated(if,(val(bool,false),(val(int,1),())),val(bool,false)) +evaluated(if,(val(none,none),(val(int,1),())),val(int,1)) +evaluated(if,(val(none,none),(val(int,1),())),bad) +evaluated(if,(val(none,none),(val(int,1),())),val(bool,true)) +evaluated(if,(val(none,none),(val(int,1),())),val(bool,false)) diff --git a/tests/correctness/unit/nullary/boolean_lxor.expected.stats b/tests/correctness/datatype/conditional/if/basic.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/boolean_lxor.expected.stats rename to tests/correctness/datatype/conditional/if/basic.expected.stats diff --git a/tests/correctness/datatype/conditional/if/basic.lp b/tests/correctness/datatype/conditional/if/basic.lp new file mode 100644 index 00000000..f42c8a15 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/basic.lp @@ -0,0 +1,3 @@ +evaluate(if,(val(bool,true),(val(int,1),()))). +evaluate(if,(val(bool,false),(val(int,1),()))). +evaluate(if,(val(none,none),(val(int,1),()))). diff --git a/tests/correctness/datatype/conditional/if/recovery.expected.all b/tests/correctness/datatype/conditional/if/recovery.expected.all new file mode 100644 index 00000000..ca074522 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/recovery.expected.all @@ -0,0 +1,2 @@ +evaluated(if,(val(bool,false),(bad,())),val(none,none)) +evaluated(if,(val(none,none),(bad,())),val(none,none)) diff --git a/tests/correctness/datatype/conditional/if/recovery.expected.none b/tests/correctness/datatype/conditional/if/recovery.expected.none new file mode 100644 index 00000000..d0a0deb9 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/recovery.expected.none @@ -0,0 +1,2 @@ +evaluated(if,(val(bool,false),(bad,())),bad) +evaluated(if,(val(none,none),(bad,())),bad) diff --git a/tests/correctness/unit/nullary/float_add.expected.stats b/tests/correctness/datatype/conditional/if/recovery.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/float_add.expected.stats rename to tests/correctness/datatype/conditional/if/recovery.expected.stats diff --git a/tests/correctness/datatype/conditional/if/recovery.lp b/tests/correctness/datatype/conditional/if/recovery.lp new file mode 100644 index 00000000..97c98c01 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/recovery.lp @@ -0,0 +1,2 @@ +evaluate(if,(val(bool,false),(bad,()))). +evaluate(if,(val(none,none),(bad,()))). diff --git a/tests/correctness/datatype/conditional/if/variable.expected.all b/tests/correctness/datatype/conditional/if/variable.expected.all new file mode 100644 index 00000000..a2544226 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/variable.expected.all @@ -0,0 +1,2 @@ +evaluated(if,(val(bool,false),(variable(x),())),val(none,none)) +evaluated(if,(val(none,none),(variable(x),())),val(none,none)) diff --git a/tests/correctness/datatype/conditional/if/variable.expected.any b/tests/correctness/datatype/conditional/if/variable.expected.any new file mode 100644 index 00000000..7d72bd4f --- /dev/null +++ b/tests/correctness/datatype/conditional/if/variable.expected.any @@ -0,0 +1,7 @@ +evaluated(if,(variable(x),(val(int,1),())),val(int,1)) +evaluated(if,(variable(x),(val(int,1),())),bad) +evaluated(if,(variable(x),(val(int,1),())),val(none,none)) +evaluated(if,(val(bool,true),(variable(x),())),val(bool,false)) +evaluated(if,(val(bool,true),(variable(x),())),val(bool,true)) +evaluated(if,(val(bool,true),(variable(x),())),val(none,none)) +evaluated(if,(val(bool,true),(variable(x),())),bad) diff --git a/tests/correctness/unit/bad_eq.expected.stats b/tests/correctness/datatype/conditional/if/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_eq.expected.stats rename to tests/correctness/datatype/conditional/if/variable.expected.stats diff --git a/tests/correctness/datatype/conditional/if/variable.lp b/tests/correctness/datatype/conditional/if/variable.lp new file mode 100644 index 00000000..bb104255 --- /dev/null +++ b/tests/correctness/datatype/conditional/if/variable.lp @@ -0,0 +1,9 @@ +variable_declare(x,fromFacts). +variable_domain(x,val(bool,true)). +variable_domain(x,val(bool,false)). +variable_domain(x,val(none,none)). +variable_domain(x,bad). +evaluate(if,(variable(x),(val(int,1),()))). +evaluate(if,(val(bool,true),(variable(x),()))). +evaluate(if,(val(bool,false),(variable(x),()))). +evaluate(if,(val(none,none),(variable(x),()))). diff --git a/tests/correctness/datatype/conditional/orElse/bad.expected.all b/tests/correctness/datatype/conditional/orElse/bad.expected.all new file mode 100644 index 00000000..1ec9cd8c --- /dev/null +++ b/tests/correctness/datatype/conditional/orElse/bad.expected.all @@ -0,0 +1,2 @@ +evaluated(default,(bad,(val(int,2),())),bad) +evaluated(default,(val(none,none),(bad,())),bad) diff --git a/tests/correctness/datatype/conditional/orElse/bad.lp b/tests/correctness/datatype/conditional/orElse/bad.lp new file mode 100644 index 00000000..02626705 --- /dev/null +++ b/tests/correctness/datatype/conditional/orElse/bad.lp @@ -0,0 +1,2 @@ +evaluate(default,(bad,(val(int,2),()))). +evaluate(default,(val(none,none),(bad,()))). diff --git a/tests/correctness/datatype/conditional/orElse/basic.expected.all b/tests/correctness/datatype/conditional/orElse/basic.expected.all new file mode 100644 index 00000000..9e254df3 --- /dev/null +++ b/tests/correctness/datatype/conditional/orElse/basic.expected.all @@ -0,0 +1,6 @@ +evaluated(default,(val(none,none),(val(int,2),())),val(int,2)) +evaluated(default,(val(none,none),(val(none,none),())),val(none,none)) +evaluated(default,(val(int,1),(val(int,2),())),val(int,1)) +evaluated(default,(val(int,1),(val(none,none),())),val(int,1)) +evaluated(default,(val(bool,true),(val(int,2),())),val(bool,true)) +evaluated(default,(val(bool,false),(val(int,2),())),val(bool,false)) diff --git a/tests/correctness/unit/boolean_default.expected.none b/tests/correctness/datatype/conditional/orElse/basic.expected.none similarity index 100% rename from tests/correctness/unit/boolean_default.expected.none rename to tests/correctness/datatype/conditional/orElse/basic.expected.none diff --git a/tests/correctness/unit/nullary/float_mult.expected.stats b/tests/correctness/datatype/conditional/orElse/basic.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/float_mult.expected.stats rename to tests/correctness/datatype/conditional/orElse/basic.expected.stats diff --git a/tests/correctness/datatype/conditional/orElse/basic.lp b/tests/correctness/datatype/conditional/orElse/basic.lp new file mode 100644 index 00000000..3583d551 --- /dev/null +++ b/tests/correctness/datatype/conditional/orElse/basic.lp @@ -0,0 +1,6 @@ +evaluate(default,(val(int,1),(val(int,2),()))). +evaluate(default,(val(none,none),(val(int,2),()))). +evaluate(default,(val(none,none),(val(none,none),()))). +evaluate(default,(val(int,1),(val(none,none),()))). +evaluate(default,(val(bool,true),(val(int,2),()))). +evaluate(default,(val(bool,false),(val(int,2),()))). diff --git a/tests/correctness/datatype/conditional/orElse/recovery.expected.all b/tests/correctness/datatype/conditional/orElse/recovery.expected.all new file mode 100644 index 00000000..8c85302b --- /dev/null +++ b/tests/correctness/datatype/conditional/orElse/recovery.expected.all @@ -0,0 +1 @@ +evaluated(default,(val(int,2),(bad,())),val(int,2)) diff --git a/tests/correctness/unit/nullary/int_add.expected.stats b/tests/correctness/datatype/conditional/orElse/recovery.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/int_add.expected.stats rename to tests/correctness/datatype/conditional/orElse/recovery.expected.stats diff --git a/tests/correctness/datatype/conditional/orElse/recovery.lp b/tests/correctness/datatype/conditional/orElse/recovery.lp new file mode 100644 index 00000000..085cbb22 --- /dev/null +++ b/tests/correctness/datatype/conditional/orElse/recovery.lp @@ -0,0 +1 @@ +evaluate(default,(val(int,2),(bad,()))). diff --git a/tests/correctness/unit/boolean_default.expected.any b/tests/correctness/datatype/conditional/orElse/variable.expected.any similarity index 100% rename from tests/correctness/unit/boolean_default.expected.any rename to tests/correctness/datatype/conditional/orElse/variable.expected.any diff --git a/tests/correctness/unit/bad_max.expected.stats b/tests/correctness/datatype/conditional/orElse/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_max.expected.stats rename to tests/correctness/datatype/conditional/orElse/variable.expected.stats diff --git a/tests/correctness/unit/boolean_default.lp b/tests/correctness/datatype/conditional/orElse/variable.lp similarity index 51% rename from tests/correctness/unit/boolean_default.lp rename to tests/correctness/datatype/conditional/orElse/variable.lp index 30b60093..a74da3ea 100644 --- a/tests/correctness/unit/boolean_default.lp +++ b/tests/correctness/datatype/conditional/orElse/variable.lp @@ -1,4 +1,3 @@ - variable_declare(x,fromFacts). variable_domain(x,val(int,1)). variable_domain(x,val(none,none)). @@ -6,10 +5,3 @@ variable_domain(x,bad). evaluate(default,(variable(x),(val(int,2),()))). evaluate(default,(variable(x),(val(none,none),()))). evaluate(default,(variable(x),(bad,()))). - - -evaluate(default,(val(int,1),(val(int,2),()))). -evaluate(default,(bad,(val(int,2),()))). -evaluate(default,(val(none,none),(val(int,2),()))). -evaluate(default,(val(none,none),(bad,()))). -evaluate(default,(val(none,none),(val(none,none),()))). diff --git a/tests/correctness/datatype/float/abs/basic.expected.all b/tests/correctness/datatype/float/abs/basic.expected.all new file mode 100644 index 00000000..d92ebcdb --- /dev/null +++ b/tests/correctness/datatype/float/abs/basic.expected.all @@ -0,0 +1,4 @@ +evaluated(abs,(val(float,float("-1.5")),()),val(float,float("1.5"))) +evaluated(abs,(val(float,float("2.5")),()),val(float,float("2.5"))) +evaluated(abs,(val(float,float("3.0")),()),val(float,float("3.0"))) +evaluated(abs,(val(float,float("-5.0")),()),val(float,float("5.0"))) diff --git a/tests/correctness/datatype/float/abs/basic.expected.none b/tests/correctness/datatype/float/abs/basic.expected.none new file mode 100644 index 00000000..1acad06d --- /dev/null +++ b/tests/correctness/datatype/float/abs/basic.expected.none @@ -0,0 +1,8 @@ +evaluated(abs,(val(float,float("-1.5")),()),bad) +evaluated(abs,(val(float,float("-1.5")),()),val(float,float("0.0"))) +evaluated(abs,(val(float,float("-1.5")),()),val(float,float("-1.5"))) +evaluated(abs,(val(float,float("2.5")),()),bad) +evaluated(abs,(val(float,float("3.0")),()),bad) +evaluated(abs,(val(float,float("3.0")),()),val(int,3)) +evaluated(abs,(val(float,float("-5.0")),()),val(float,float("-5.0"))) +evaluated(abs,(val(float,float("-5.0")),()),val(int,5)) diff --git a/tests/correctness/unit/nullary/int_mult.expected.stats b/tests/correctness/datatype/float/abs/basic.expected.stats similarity index 100% rename from tests/correctness/unit/nullary/int_mult.expected.stats rename to tests/correctness/datatype/float/abs/basic.expected.stats diff --git a/tests/correctness/datatype/float/abs/basic.lp b/tests/correctness/datatype/float/abs/basic.lp new file mode 100644 index 00000000..8f9a2a99 --- /dev/null +++ b/tests/correctness/datatype/float/abs/basic.lp @@ -0,0 +1,6 @@ +phase_request(constantFolding,false). + +evaluate(abs,(val(float,float("-1.5")),())). +evaluate(abs,(val(float,float("2.5")),())). +evaluate(abs,(val(float,float("3.0")),())). +evaluate(abs,(val(float,float("-5.0")),())). diff --git a/tests/correctness/datatype/float/abs/variable.expected.any b/tests/correctness/datatype/float/abs/variable.expected.any new file mode 100644 index 00000000..ab013ff7 --- /dev/null +++ b/tests/correctness/datatype/float/abs/variable.expected.any @@ -0,0 +1,4 @@ +evaluated(abs,(variable(x),()),val(float,float("1.5"))) +evaluated(abs,(variable(x),()),val(float,float("3.7"))) +evaluated(abs,(variable(x),()),val(float,float("4.0"))) +evaluated(abs,(variable(x),()),bad) diff --git a/tests/correctness/datatype/float/abs/variable.expected.stats b/tests/correctness/datatype/float/abs/variable.expected.stats new file mode 100644 index 00000000..dfb99976 --- /dev/null +++ b/tests/correctness/datatype/float/abs/variable.expected.stats @@ -0,0 +1 @@ +models=5 diff --git a/tests/correctness/unit/unary/float_abs.lp b/tests/correctness/datatype/float/abs/variable.lp similarity index 66% rename from tests/correctness/unit/unary/float_abs.lp rename to tests/correctness/datatype/float/abs/variable.lp index e14c9513..c46a1302 100644 --- a/tests/correctness/unit/unary/float_abs.lp +++ b/tests/correctness/datatype/float/abs/variable.lp @@ -1,12 +1,9 @@ phase_request(constantFolding,false). -evaluate(abs,(val(float,float("-1.5")),())). -evaluate(abs,(val(none,none),())). -evaluate(abs,(bad,())). - - variable_declare(x,fromFacts). variable_domain(x,val(float,float("-1.5"))). +variable_domain(x,val(float,float("3.7"))). +variable_domain(x,val(float,float("4.0"))). variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(abs,(variable(x),())). diff --git a/tests/correctness/datatype/float/add/bad.expected.all b/tests/correctness/datatype/float/add/bad.expected.all new file mode 100644 index 00000000..97e3b0be --- /dev/null +++ b/tests/correctness/datatype/float/add/bad.expected.all @@ -0,0 +1 @@ +evaluated(add,(val(float,float("1.5")),(bad,())),bad) diff --git a/tests/correctness/datatype/float/add/bad.expected.none b/tests/correctness/datatype/float/add/bad.expected.none new file mode 100644 index 00000000..daff34b5 --- /dev/null +++ b/tests/correctness/datatype/float/add/bad.expected.none @@ -0,0 +1,2 @@ +evaluated(add,(val(float,float("1.5")),(bad,())),val(float,float("1.5"))) +evaluated(add,(val(float,float("1.5")),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/unary/boolean_leqv.expected.stats b/tests/correctness/datatype/float/add/bad.expected.stats similarity index 100% rename from tests/correctness/unit/unary/boolean_leqv.expected.stats rename to tests/correctness/datatype/float/add/bad.expected.stats diff --git a/tests/correctness/datatype/float/add/bad.lp b/tests/correctness/datatype/float/add/bad.lp new file mode 100644 index 00000000..3a97893e --- /dev/null +++ b/tests/correctness/datatype/float/add/bad.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(add,(val(float,float("1.5")),(bad,()))). diff --git a/tests/correctness/datatype/float/add/basic.expected.all b/tests/correctness/datatype/float/add/basic.expected.all new file mode 100644 index 00000000..ef40c775 --- /dev/null +++ b/tests/correctness/datatype/float/add/basic.expected.all @@ -0,0 +1 @@ +evaluated(add,(val(float,float("1.5")),(val(float,float("2.0")),())),val(float,float("3.5"))) diff --git a/tests/correctness/datatype/float/add/basic.expected.none b/tests/correctness/datatype/float/add/basic.expected.none new file mode 100644 index 00000000..f6b58c03 --- /dev/null +++ b/tests/correctness/datatype/float/add/basic.expected.none @@ -0,0 +1,2 @@ +evaluated(add,(val(float,float("1.5")),(val(float,float("2.0")),())),bad) +evaluated(add,(val(float,float("1.5")),(val(float,float("2.0")),())),val(int,3)) diff --git a/tests/correctness/unit/unary/boolean_lxor.expected.stats b/tests/correctness/datatype/float/add/basic.expected.stats similarity index 100% rename from tests/correctness/unit/unary/boolean_lxor.expected.stats rename to tests/correctness/datatype/float/add/basic.expected.stats diff --git a/tests/correctness/datatype/float/add/basic.lp b/tests/correctness/datatype/float/add/basic.lp new file mode 100644 index 00000000..60d7aa5c --- /dev/null +++ b/tests/correctness/datatype/float/add/basic.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(add,(val(float,float("1.5")),(val(float,float("2.0")),()))). diff --git a/tests/correctness/datatype/float/add/mixed.expected.all b/tests/correctness/datatype/float/add/mixed.expected.all new file mode 100644 index 00000000..9723a3c4 --- /dev/null +++ b/tests/correctness/datatype/float/add/mixed.expected.all @@ -0,0 +1,2 @@ +evaluated(add,(val(float,float("1.5")),(val(int,2),())),val(float,float("3.5"))) +evaluated(add,(val(int,2),(val(float,float("1.5")),())),val(float,float("3.5"))) diff --git a/tests/correctness/datatype/float/add/mixed.expected.none b/tests/correctness/datatype/float/add/mixed.expected.none new file mode 100644 index 00000000..8ca1a66e --- /dev/null +++ b/tests/correctness/datatype/float/add/mixed.expected.none @@ -0,0 +1,8 @@ +evaluated(add,(val(float,float("1.5")),(val(int,2),())),bad) +evaluated(add,(val(float,float("1.5")),(val(int,2),())),val(int,0)) +evaluated(add,(val(float,float("1.5")),(val(int,2),())),val(int,3)) +evaluated(add,(val(float,float("1.5")),(val(int,2),())),val(int,4)) +evaluated(add,(val(int,2),(val(float,float("1.5")),())),bad) +evaluated(add,(val(int,2),(val(float,float("1.5")),())),val(int,0)) +evaluated(add,(val(int,2),(val(float,float("1.5")),())),val(int,3)) +evaluated(add,(val(int,2),(val(float,float("1.5")),())),val(int,4)) diff --git a/tests/correctness/unit/unary/float_add.expected.stats b/tests/correctness/datatype/float/add/mixed.expected.stats similarity index 100% rename from tests/correctness/unit/unary/float_add.expected.stats rename to tests/correctness/datatype/float/add/mixed.expected.stats diff --git a/tests/correctness/datatype/float/add/mixed.lp b/tests/correctness/datatype/float/add/mixed.lp new file mode 100644 index 00000000..b7552b90 --- /dev/null +++ b/tests/correctness/datatype/float/add/mixed.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(add,(val(float,float("1.5")),(val(int,2),()))). +evaluate(add,(val(int,2),(val(float,float("1.5")),()))). diff --git a/tests/correctness/datatype/float/add/none.expected.all b/tests/correctness/datatype/float/add/none.expected.all new file mode 100644 index 00000000..cf424003 --- /dev/null +++ b/tests/correctness/datatype/float/add/none.expected.all @@ -0,0 +1,2 @@ +evaluated(add,(val(float,float("1.5")),(val(none,none),())),bad) +evaluated(add,(val(none,none),(val(float,float("1.5")),())),bad) diff --git a/tests/correctness/datatype/float/add/none.expected.none b/tests/correctness/datatype/float/add/none.expected.none new file mode 100644 index 00000000..923e6169 --- /dev/null +++ b/tests/correctness/datatype/float/add/none.expected.none @@ -0,0 +1,4 @@ +evaluated(add,(val(float,float("1.5")),(val(none,none),())),val(float,float("1.5"))) +evaluated(add,(val(float,float("1.5")),(val(none,none),())),val(none,none)) +evaluated(add,(val(none,none),(val(float,float("1.5")),())),val(float,float("1.5"))) +evaluated(add,(val(none,none),(val(float,float("1.5")),())),val(none,none)) diff --git a/tests/correctness/unit/unary/float_mult.expected.stats b/tests/correctness/datatype/float/add/none.expected.stats similarity index 100% rename from tests/correctness/unit/unary/float_mult.expected.stats rename to tests/correctness/datatype/float/add/none.expected.stats diff --git a/tests/correctness/datatype/float/add/none.lp b/tests/correctness/datatype/float/add/none.lp new file mode 100644 index 00000000..4551bc6d --- /dev/null +++ b/tests/correctness/datatype/float/add/none.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(add,(val(float,float("1.5")),(val(none,none),()))). +evaluate(add,(val(none,none),(val(float,float("1.5")),()))). diff --git a/tests/correctness/unit/float_add.expected.any b/tests/correctness/datatype/float/add/variable.expected.any similarity index 100% rename from tests/correctness/unit/float_add.expected.any rename to tests/correctness/datatype/float/add/variable.expected.any diff --git a/tests/correctness/unit/bad_min.expected.stats b/tests/correctness/datatype/float/add/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_min.expected.stats rename to tests/correctness/datatype/float/add/variable.expected.stats diff --git a/tests/correctness/unit/bad_add.lp b/tests/correctness/datatype/float/add/variable.lp similarity index 77% rename from tests/correctness/unit/bad_add.lp rename to tests/correctness/datatype/float/add/variable.lp index 1cf63331..fdbe3576 100644 --- a/tests/correctness/unit/bad_add.lp +++ b/tests/correctness/datatype/float/add/variable.lp @@ -1,9 +1,7 @@ phase_request(constantFolding,false). -evaluate(add,(val(int,1),(val(int,2),()))). - variable_declare(x,fromFacts). -variable_domain(x,val(int,1)). +variable_domain(x,val(float,float("2.5"))). variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(add,(variable(x),(val(int,2),()))). diff --git a/tests/correctness/datatype/float/add/variadic.expected.all b/tests/correctness/datatype/float/add/variadic.expected.all new file mode 100644 index 00000000..6567ddc8 --- /dev/null +++ b/tests/correctness/datatype/float/add/variadic.expected.all @@ -0,0 +1,4 @@ +evaluated(add,(),val(int,0)) +evaluated(add,(val(float,float("1.5")),()),val(float,float("1.5"))) +evaluated(add,(val(float,float("3.0")),(val(float,float("1.25")),(val(float,float("2.5")),()))),val(float,float("6.75"))) +evaluated(add,(val(int,2),(val(float,float("1.25")),(val(float,float("2.5")),()))),val(float,float("5.75"))) diff --git a/tests/correctness/unit/unary/float_add.expected.none b/tests/correctness/datatype/float/add/variadic.expected.none similarity index 61% rename from tests/correctness/unit/unary/float_add.expected.none rename to tests/correctness/datatype/float/add/variadic.expected.none index c179313d..fb71cecc 100644 --- a/tests/correctness/unit/unary/float_add.expected.none +++ b/tests/correctness/datatype/float/add/variadic.expected.none @@ -1,2 +1,4 @@ +evaluated(add,(),bad) +evaluated(add,(),val(float,float("0.0"))) evaluated(add,(val(float,float("1.5")),()),bad) evaluated(add,(val(float,float("1.5")),()),val(int,1)) diff --git a/tests/correctness/unit/unary/int_add.expected.stats b/tests/correctness/datatype/float/add/variadic.expected.stats similarity index 100% rename from tests/correctness/unit/unary/int_add.expected.stats rename to tests/correctness/datatype/float/add/variadic.expected.stats diff --git a/tests/correctness/datatype/float/add/variadic.lp b/tests/correctness/datatype/float/add/variadic.lp new file mode 100644 index 00000000..f73efff7 --- /dev/null +++ b/tests/correctness/datatype/float/add/variadic.lp @@ -0,0 +1,6 @@ +phase_request(constantFolding,false). + +evaluate(add,()). +evaluate(add,(val(float,float("1.5")),())). +evaluate(add,(val(float,float("3.0")),(val(float,float("1.25")),(val(float,float("2.5")),())))). +evaluate(add,(val(int,2),(val(float,float("1.25")),(val(float,float("2.5")),())))). diff --git a/tests/correctness/datatype/float/ceil_floor/bad.expected.all b/tests/correctness/datatype/float/ceil_floor/bad.expected.all new file mode 100644 index 00000000..00215c8e --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/bad.expected.all @@ -0,0 +1,2 @@ +evaluated(ceil,(bad,()),bad) +evaluated(floor,(bad,()),bad) diff --git a/tests/correctness/datatype/float/ceil_floor/bad.expected.none b/tests/correctness/datatype/float/ceil_floor/bad.expected.none new file mode 100644 index 00000000..6ad6aa74 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/bad.expected.none @@ -0,0 +1,6 @@ +evaluated(ceil,(bad,()),val(int,0)) +evaluated(floor,(bad,()),val(int,0)) +evaluated(ceil,(bad,()),val(float,float("0.0"))) +evaluated(floor,(bad,()),val(float,float("0.0"))) +evaluated(ceil,(bad,()),val(none,none)) +evaluated(floor,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/int_mult.expected.stats b/tests/correctness/datatype/float/ceil_floor/bad.expected.stats similarity index 100% rename from tests/correctness/unit/unary/int_mult.expected.stats rename to tests/correctness/datatype/float/ceil_floor/bad.expected.stats diff --git a/tests/correctness/datatype/float/ceil_floor/bad.lp b/tests/correctness/datatype/float/ceil_floor/bad.lp new file mode 100644 index 00000000..c2af162b --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/bad.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(ceil,(bad,())). +evaluate(floor,(bad,())). diff --git a/tests/correctness/datatype/float/ceil_floor/basic.expected.all b/tests/correctness/datatype/float/ceil_floor/basic.expected.all new file mode 100644 index 00000000..e63c71e6 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/basic.expected.all @@ -0,0 +1,14 @@ +evaluated(ceil,(val(float,float("0.0")),()),val(int,0)) +evaluated(floor,(val(float,float("0.0")),()),val(int,0)) +evaluated(ceil,(val(float,float("1.5")),()),val(int,2)) +evaluated(floor,(val(float,float("1.5")),()),val(int,1)) +evaluated(ceil,(val(float,float("2.2")),()),val(int,3)) +evaluated(floor,(val(float,float("2.2")),()),val(int,2)) +evaluated(ceil,(val(float,float("-1.5")),()),val(int,-1)) +evaluated(floor,(val(float,float("-1.5")),()),val(int,-2)) +evaluated(ceil,(val(float,float("-3.9")),()),val(int,-3)) +evaluated(floor,(val(float,float("-3.9")),()),val(int,-4)) +evaluated(ceil,(val(float,float("-4.0")),()),val(int,-4)) +evaluated(floor,(val(float,float("-4.0")),()),val(int,-4)) +evaluated(ceil,(val(float,float("4.0")),()),val(int,4)) +evaluated(floor,(val(float,float("4.0")),()),val(int,4)) diff --git a/tests/correctness/datatype/float/ceil_floor/basic.expected.none b/tests/correctness/datatype/float/ceil_floor/basic.expected.none new file mode 100644 index 00000000..6ab81806 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/basic.expected.none @@ -0,0 +1,16 @@ +evaluated(ceil,(val(float,float("0.0")),()),bad) +evaluated(floor,(val(float,float("0.0")),()),bad) +evaluated(ceil,(val(float,float("0.0")),()),val(float,float("0.0"))) +evaluated(floor,(val(float,float("0.0")),()),val(float,float("0.0"))) +evaluated(ceil,(val(float,float("1.5")),()),bad) +evaluated(floor,(val(float,float("1.5")),()),bad) +evaluated(ceil,(val(float,float("2.2")),()),bad) +evaluated(floor,(val(float,float("2.2")),()),bad) +evaluated(ceil,(val(float,float("-1.5")),()),bad) +evaluated(floor,(val(float,float("-1.5")),()),bad) +evaluated(ceil,(val(float,float("-3.9")),()),bad) +evaluated(floor,(val(float,float("-3.9")),()),bad) +evaluate(ceil,(val(float,float("-4.0")),()),bad) +evaluate(floor,(val(float,float("-4.0")),()),bad) +evaluate(ceil,(val(float,float("4.0")),()),bad) +evaluate(floor,(val(float,float("4.0")),()),bad) diff --git a/tests/correctness/datatype/float/ceil_floor/basic.expected.stats b/tests/correctness/datatype/float/ceil_floor/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/ceil_floor/basic.lp b/tests/correctness/datatype/float/ceil_floor/basic.lp new file mode 100644 index 00000000..c606fdb2 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/basic.lp @@ -0,0 +1,16 @@ +phase_request(constantFolding,false). + +evaluate(ceil,(val(float,float("0.0")),())). +evaluate(floor,(val(float,float("0.0")),())). +evaluate(ceil,(val(float,float("1.5")),())). +evaluate(floor,(val(float,float("1.5")),())). +evaluate(ceil,(val(float,float("2.2")),())). +evaluate(floor,(val(float,float("2.2")),())). +evaluate(ceil,(val(float,float("-1.5")),())). +evaluate(floor,(val(float,float("-1.5")),())). +evaluate(ceil,(val(float,float("-3.9")),())). +evaluate(floor,(val(float,float("-3.9")),())). +evaluate(ceil,(val(float,float("-4.0")),())). +evaluate(floor,(val(float,float("-4.0")),())). +evaluate(ceil,(val(float,float("4.0")),())). +evaluate(floor,(val(float,float("4.0")),())). diff --git a/tests/correctness/datatype/float/ceil_floor/mixed.expected.all b/tests/correctness/datatype/float/ceil_floor/mixed.expected.all new file mode 100644 index 00000000..f1c3a7c7 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/mixed.expected.all @@ -0,0 +1,6 @@ +evaluated(ceil,(val(int,0),()),val(int,0)) +evaluated(floor,(val(int,0),()),val(int,0)) +evaluated(ceil,(val(int,2),()),val(int,2)) +evaluated(floor,(val(int,2),()),val(int,2)) +evaluated(ceil,(val(int,-3),()),val(int,-3)) +evaluated(floor,(val(int,-3),()),val(int,-3)) diff --git a/tests/correctness/datatype/float/ceil_floor/mixed.expected.none b/tests/correctness/datatype/float/ceil_floor/mixed.expected.none new file mode 100644 index 00000000..7bc5e270 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/mixed.expected.none @@ -0,0 +1,2 @@ +evaluated(ceil,(val(int,2),()),bad) +evaluated(floor,(val(int,2),()),bad) diff --git a/tests/correctness/datatype/float/ceil_floor/mixed.expected.stats b/tests/correctness/datatype/float/ceil_floor/mixed.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/mixed.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/ceil_floor/mixed.lp b/tests/correctness/datatype/float/ceil_floor/mixed.lp new file mode 100644 index 00000000..3a598620 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/mixed.lp @@ -0,0 +1,8 @@ +phase_request(constantFolding,false). + +evaluate(ceil,(val(int,0),())). +evaluate(floor,(val(int,0),())). +evaluate(ceil,(val(int,2),())). +evaluate(floor,(val(int,2),())). +evaluate(ceil,(val(int,-3),())). +evaluate(floor,(val(int,-3),())). diff --git a/tests/correctness/datatype/float/ceil_floor/none.expected.all b/tests/correctness/datatype/float/ceil_floor/none.expected.all new file mode 100644 index 00000000..47dfadb5 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/none.expected.all @@ -0,0 +1,2 @@ +evaluated(ceil,(val(none,none),()),bad) +evaluated(floor,(val(none,none),()),bad) diff --git a/tests/correctness/datatype/float/ceil_floor/none.expected.none b/tests/correctness/datatype/float/ceil_floor/none.expected.none new file mode 100644 index 00000000..e3fde602 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/none.expected.none @@ -0,0 +1,6 @@ +evaluated(ceil,(val(none,none),()),val(int,0)) +evaluated(floor,(val(none,none),()),val(int,0)) +evaluated(ceil,(val(none,none),()),val(float,float("0.0"))) +evaluated(floor,(val(none,none),()),val(float,float("0.0"))) +evaluated(ceil,(val(none,none),()),val(none,none)) +evaluated(floor,(val(none,none),()),val(none,none)) diff --git a/tests/correctness/datatype/float/ceil_floor/none.expected.stats b/tests/correctness/datatype/float/ceil_floor/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/ceil_floor/none.lp b/tests/correctness/datatype/float/ceil_floor/none.lp new file mode 100644 index 00000000..051b8b75 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/none.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(ceil,(val(none,none),())). +evaluate(floor,(val(none,none),())). diff --git a/tests/correctness/datatype/float/ceil_floor/variable.expected.any b/tests/correctness/datatype/float/ceil_floor/variable.expected.any new file mode 100644 index 00000000..e1cb3e1e --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/variable.expected.any @@ -0,0 +1,8 @@ +evaluated(ceil,(variable(x),()),val(int,2)) +evaluated(ceil,(variable(x),()),val(int,3)) +evaluated(ceil,(variable(x),()),val(int,7)) +evaluated(ceil,(variable(x),()),bad) +evaluated(floor,(variable(x),()),val(int,1)) +evaluated(floor,(variable(x),()),val(int,2)) +evaluated(floor,(variable(x),()),val(int,7)) +evaluated(floor,(variable(x),()),bad) diff --git a/tests/correctness/datatype/float/ceil_floor/variable.expected.stats b/tests/correctness/datatype/float/ceil_floor/variable.expected.stats new file mode 100644 index 00000000..dfb99976 --- /dev/null +++ b/tests/correctness/datatype/float/ceil_floor/variable.expected.stats @@ -0,0 +1 @@ +models=5 diff --git a/tests/correctness/unit/unary/float_ceil.lp b/tests/correctness/datatype/float/ceil_floor/variable.lp similarity index 65% rename from tests/correctness/unit/unary/float_ceil.lp rename to tests/correctness/datatype/float/ceil_floor/variable.lp index 05120f76..a00efdcf 100644 --- a/tests/correctness/unit/unary/float_ceil.lp +++ b/tests/correctness/datatype/float/ceil_floor/variable.lp @@ -1,12 +1,10 @@ phase_request(constantFolding,false). -evaluate(ceil,(val(float,float("1.5")),())). -evaluate(ceil,(val(none,none),())). -evaluate(ceil,(bad,())). - - variable_declare(x,fromFacts). variable_domain(x,val(float,float("1.5"))). +variable_domain(x,val(float,float("2.5"))). +variable_domain(x,val(int,7)). variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(ceil,(variable(x),())). +evaluate(floor,(variable(x),())). diff --git a/tests/correctness/datatype/float/mult/bad.expected.all b/tests/correctness/datatype/float/mult/bad.expected.all new file mode 100644 index 00000000..c4c97267 --- /dev/null +++ b/tests/correctness/datatype/float/mult/bad.expected.all @@ -0,0 +1,3 @@ +evaluated(mult,(val(float,float("0.0")),(bad,())),bad) +evaluated(mult,(val(float,float("2.5")),(bad,())),bad) +evaluated(mult,(bad,(val(float,float("3.125")),())),bad) diff --git a/tests/correctness/datatype/float/mult/bad.expected.none b/tests/correctness/datatype/float/mult/bad.expected.none new file mode 100644 index 00000000..f76dfee8 --- /dev/null +++ b/tests/correctness/datatype/float/mult/bad.expected.none @@ -0,0 +1,6 @@ +evaluated(mult,(val(float,float("0.0")),(bad,())),val(none,none)) +evaluated(mult,(val(float,float("0.0")),(bad,())),val(int,0)) +evaluated(mult,(val(float,float("0.0")),(bad,())),val(float,float("0.0"))) +evaluated(mult,(val(float,float("2.5")),(bad,())),val(none,none)) +evaluated(mult,(bad,(val(float,float("3.125")),())),val(int,0)) +evaluated(mult,(bad,(val(float,float("3.125")),())),val(float,float("0.0"))) diff --git a/tests/correctness/datatype/float/mult/bad.expected.stats b/tests/correctness/datatype/float/mult/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/mult/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/mult/bad.lp b/tests/correctness/datatype/float/mult/bad.lp new file mode 100644 index 00000000..718e804f --- /dev/null +++ b/tests/correctness/datatype/float/mult/bad.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(float,float("0.0")),(bad,()))). +evaluate(mult,(val(float,float("2.5")),(bad,()))). +evaluate(mult,(bad,(val(float,float("3.125")),()))). diff --git a/tests/correctness/datatype/float/mult/basic.expected.all b/tests/correctness/datatype/float/mult/basic.expected.all new file mode 100644 index 00000000..3b3ea227 --- /dev/null +++ b/tests/correctness/datatype/float/mult/basic.expected.all @@ -0,0 +1 @@ +evaluated(mult,(val(float,float("2.5")),(val(float,float("2.0")),())),val(float,float("5.0"))) diff --git a/tests/correctness/datatype/float/mult/basic.expected.none b/tests/correctness/datatype/float/mult/basic.expected.none new file mode 100644 index 00000000..1ceb841a --- /dev/null +++ b/tests/correctness/datatype/float/mult/basic.expected.none @@ -0,0 +1,5 @@ +evaluated(mult,(val(float,float("2.5")),(val(float,float("2.0")),())),bad) +evaluated(mult,(val(float,float("2.5")),(val(float,float("2.0")),())),val(float,float("0.0"))) +evaluated(mult,(val(float,float("2.5")),(val(float,float("2.0")),())),val(int,0)) +evaluated(mult,(val(float,float("2.5")),(val(float,float("2.0")),())),val(int,5)) +evaluated(mult,(val(float,float("2.5")),(val(float,float("2.0")),())),val(none,none)) diff --git a/tests/correctness/datatype/float/mult/basic.expected.stats b/tests/correctness/datatype/float/mult/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/mult/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/mult/basic.lp b/tests/correctness/datatype/float/mult/basic.lp new file mode 100644 index 00000000..41287c26 --- /dev/null +++ b/tests/correctness/datatype/float/mult/basic.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(float,float("2.5")),(val(float,float("2.0")),()))). diff --git a/tests/correctness/datatype/float/mult/mixed.expected.all b/tests/correctness/datatype/float/mult/mixed.expected.all new file mode 100644 index 00000000..7615be0e --- /dev/null +++ b/tests/correctness/datatype/float/mult/mixed.expected.all @@ -0,0 +1,4 @@ +evaluated(mult,(val(float,float("1.5")),(val(int,2),())),val(float,float("3.0"))) +evaluated(mult,(val(int,2),(val(float,float("1.5")),())),val(float,float("3.0"))) +evaluated(mult,(val(float,float("1.5")),(val(int,3),())),val(float,float("4.5"))) +evaluated(mult,(val(int,3),(val(float,float("1.5")),())),val(float,float("4.5"))) diff --git a/tests/correctness/datatype/float/mult/mixed.expected.none b/tests/correctness/datatype/float/mult/mixed.expected.none new file mode 100644 index 00000000..0f27d16c --- /dev/null +++ b/tests/correctness/datatype/float/mult/mixed.expected.none @@ -0,0 +1,4 @@ +evaluated(mult,(val(float,float("1.5")),(val(int,2),())),bad) +evaluated(mult,(val(int,2),(val(float,float("1.5")),())),bad) +evaluated(mult,(val(float,float("1.5")),(val(int,2),())),val(int,3)) +evaluated(mult,(val(int,2),(val(float,float("1.5")),())),val(int,3)) diff --git a/tests/correctness/datatype/float/mult/mixed.expected.stats b/tests/correctness/datatype/float/mult/mixed.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/mult/mixed.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/mult/mixed.lp b/tests/correctness/datatype/float/mult/mixed.lp new file mode 100644 index 00000000..57237394 --- /dev/null +++ b/tests/correctness/datatype/float/mult/mixed.lp @@ -0,0 +1,6 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(float,float("1.5")),(val(int,2),()))). +evaluate(mult,(val(int,2),(val(float,float("1.5")),()))). +evaluate(mult,(val(float,float("1.5")),(val(int,3),()))). +evaluate(mult,(val(int,3),(val(float,float("1.5")),()))). diff --git a/tests/correctness/datatype/float/nary_add.expected.all b/tests/correctness/datatype/float/mult/nary.expected.all similarity index 50% rename from tests/correctness/datatype/float/nary_add.expected.all rename to tests/correctness/datatype/float/mult/nary.expected.all index 93e5e26f..ee1f5a35 100644 --- a/tests/correctness/datatype/float/nary_add.expected.all +++ b/tests/correctness/datatype/float/mult/nary.expected.all @@ -1,4 +1,2 @@ -value(x,val(float,float("6.75"))) -value(y,val(float,float("5.75"))) value(z,val(float,float("9.375"))) value(t,val(float,float("6.25"))) diff --git a/tests/correctness/datatype/float/nary_add.lp b/tests/correctness/datatype/float/mult/nary.lp similarity index 50% rename from tests/correctness/datatype/float/nary_add.lp rename to tests/correctness/datatype/float/mult/nary.lp index 17e438cc..bc56ccda 100644 --- a/tests/correctness/datatype/float/nary_add.lp +++ b/tests/correctness/datatype/float/mult/nary.lp @@ -1,5 +1,2 @@ -variable_define(x,operation(add,(val(float,float("3.0")),(val(float,float("1.25")),(val(float,float("2.5")),()))))). -variable_define(y,operation(add,(val(int,2),(val(float,float("1.25")),(val(float,float("2.5")),()))))). - variable_define(z,operation(mult,(val(float,float("3.0")),(val(float,float("1.25")),(val(float,float("2.5")),()))))). variable_define(t,operation(mult,(val(int,2),(val(float,float("1.25")),(val(float,float("2.5")),()))))). diff --git a/tests/correctness/datatype/float/mult/none.expected.all b/tests/correctness/datatype/float/mult/none.expected.all new file mode 100644 index 00000000..3859390e --- /dev/null +++ b/tests/correctness/datatype/float/mult/none.expected.all @@ -0,0 +1,2 @@ +evaluated(mult,(val(float,float("2.5")),(val(none,none),())),bad) +evaluated(mult,(val(none,none),(val(float,float("1.5")),())),bad) diff --git a/tests/correctness/datatype/float/mult/none.expected.none b/tests/correctness/datatype/float/mult/none.expected.none new file mode 100644 index 00000000..242a81d1 --- /dev/null +++ b/tests/correctness/datatype/float/mult/none.expected.none @@ -0,0 +1,2 @@ +evaluated(mult,(val(float,float("2.5")),(val(none,none),())),val(none,none)) +evaluated(mult,(val(none,none),(val(float,float("1.5")),())),val(none,none)) diff --git a/tests/correctness/datatype/float/mult/none.expected.stats b/tests/correctness/datatype/float/mult/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/mult/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/mult/none.lp b/tests/correctness/datatype/float/mult/none.lp new file mode 100644 index 00000000..2452553e --- /dev/null +++ b/tests/correctness/datatype/float/mult/none.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(float,float("2.5")),(val(none,none),()))). +evaluate(mult,(val(none,none),(val(float,float("1.5")),()))). diff --git a/tests/correctness/datatype/float/mult/recovery.expected.all b/tests/correctness/datatype/float/mult/recovery.expected.all new file mode 100644 index 00000000..eb0d9188 --- /dev/null +++ b/tests/correctness/datatype/float/mult/recovery.expected.all @@ -0,0 +1,2 @@ +evaluated(mult,(val(float,float("0.0")),(bad,())),val(float,float("0.0"))) +evaluated(mult,(bad,(val(float,float("0.0")),())),val(float,float("0.0"))) diff --git a/tests/correctness/datatype/float/mult/recovery.expected.none b/tests/correctness/datatype/float/mult/recovery.expected.none new file mode 100644 index 00000000..0551299b --- /dev/null +++ b/tests/correctness/datatype/float/mult/recovery.expected.none @@ -0,0 +1,2 @@ +evaluated(mult,(val(float,float("0.0")),(bad,())),bad) +evaluated(mult,(bad,(val(float,float("0.0")),())),bad) diff --git a/tests/correctness/datatype/float/mult/recovery.lp b/tests/correctness/datatype/float/mult/recovery.lp new file mode 100644 index 00000000..afd9df93 --- /dev/null +++ b/tests/correctness/datatype/float/mult/recovery.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(float,float("0.0")),(bad,()))). +evaluate(mult,(bad,(val(float,float("0.0")),()))). diff --git a/tests/correctness/unit/float_mult.expected.any b/tests/correctness/datatype/float/mult/variable.expected.any similarity index 55% rename from tests/correctness/unit/float_mult.expected.any rename to tests/correctness/datatype/float/mult/variable.expected.any index f322d563..870e5b46 100644 --- a/tests/correctness/unit/float_mult.expected.any +++ b/tests/correctness/datatype/float/mult/variable.expected.any @@ -1,4 +1,6 @@ evaluated(mult,(variable(x),(val(int,2),())),val(float,float("5.0"))) +evaluated(mult,(variable(x),(val(float,float("5.75")),())),val(float,float("14.375"))) +evaluated(mult,(val(float,float("3.875")),(variable(x),())),val(float,float("9.6875"))) evaluated(mult,(variable(x),(val(int,2),())),bad) evaluated(mult,(variable(x),(val(none,none),())),bad) evaluated(mult,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_mult.expected.stats b/tests/correctness/datatype/float/mult/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_mult.expected.stats rename to tests/correctness/datatype/float/mult/variable.expected.stats diff --git a/tests/correctness/unit/float_mult.lp b/tests/correctness/datatype/float/mult/variable.lp similarity index 57% rename from tests/correctness/unit/float_mult.lp rename to tests/correctness/datatype/float/mult/variable.lp index 4caf9b90..ef48044d 100644 --- a/tests/correctness/unit/float_mult.lp +++ b/tests/correctness/datatype/float/mult/variable.lp @@ -1,15 +1,11 @@ phase_request(constantFolding,false). -evaluate(mult,(val(float,float("2.5")),(val(int,2),()))). -evaluate(mult,(val(float,float("0.0")),(bad,()))). -evaluate(mult,(val(float,float("2.5")),(val(none,none),()))). -evaluate(mult,(val(float,float("2.5")),(bad,()))). - - variable_declare(x,fromFacts). variable_domain(x,val(float,float("2.5"))). variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(mult,(variable(x),(val(int,2),()))). +evaluate(mult,(variable(x),(val(float,float("5.75")),()))). +evaluate(mult,(val(float,float("3.875")),(variable(x),()))). evaluate(mult,(variable(x),(val(none,none),()))). evaluate(mult,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/unary/float_mult.expected.all b/tests/correctness/datatype/float/mult/variadic.expected.all similarity index 69% rename from tests/correctness/unit/unary/float_mult.expected.all rename to tests/correctness/datatype/float/mult/variadic.expected.all index 6d793830..9076cf13 100644 --- a/tests/correctness/unit/unary/float_mult.expected.all +++ b/tests/correctness/datatype/float/mult/variadic.expected.all @@ -1 +1,2 @@ +evaluated(mult,(),val(int,1)) evaluated(mult,(val(float,float("2.5")),()),val(float,float("2.5"))) diff --git a/tests/correctness/datatype/float/mult/variadic.expected.none b/tests/correctness/datatype/float/mult/variadic.expected.none new file mode 100644 index 00000000..677eb2c4 --- /dev/null +++ b/tests/correctness/datatype/float/mult/variadic.expected.none @@ -0,0 +1,8 @@ +evaluated(mult,(),bad) +evaluated(mult,(),val(int,0)) +evaluated(mult,(),val(float,float("0.0"))) +evaluated(mult,(),val(none,none)) +evaluated(mult,(val(float,float("2.5")),()),bad) +evaluated(mult,(val(float,float("2.5")),()),val(float,float("1.0"))) +evaluated(mult,(val(float,float("2.5")),()),val(float,float("0.0"))) +evaluated(mult,(val(float,float("2.5")),()),val(none,none)) diff --git a/tests/correctness/datatype/float/mult/variadic.expected.stats b/tests/correctness/datatype/float/mult/variadic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/mult/variadic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/mult/variadic.lp b/tests/correctness/datatype/float/mult/variadic.lp new file mode 100644 index 00000000..64d7db7b --- /dev/null +++ b/tests/correctness/datatype/float/mult/variadic.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(mult,()). +evaluate(mult,(val(float,float("2.5")),())). diff --git a/tests/correctness/datatype/float/pow/bad.expected.all b/tests/correctness/datatype/float/pow/bad.expected.all new file mode 100644 index 00000000..233fede0 --- /dev/null +++ b/tests/correctness/datatype/float/pow/bad.expected.all @@ -0,0 +1,2 @@ +evaluated(pow,(val(float,float("2.5")),(bad,())),bad) +evaluated(pow,(bad,(val(float,float("3.1")),())),bad) diff --git a/tests/correctness/datatype/float/pow/bad.expected.none b/tests/correctness/datatype/float/pow/bad.expected.none new file mode 100644 index 00000000..206667db --- /dev/null +++ b/tests/correctness/datatype/float/pow/bad.expected.none @@ -0,0 +1,4 @@ +evaluated(pow,(val(float,float("2.5")),(bad,())),val(int,1)) +evaluated(pow,(bad,(val(float,float("3.1")),())),val(int,1)) +evaluated(pow,(val(float,float("2.5")),(bad,())),val(float,float("1.0"))) +evaluated(pow,(bad,(val(float,float("3.1")),())),val(float,float("1.0"))) diff --git a/tests/correctness/datatype/float/pow/bad.expected.stats b/tests/correctness/datatype/float/pow/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/pow/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/pow/bad.lp b/tests/correctness/datatype/float/pow/bad.lp new file mode 100644 index 00000000..14422fd9 --- /dev/null +++ b/tests/correctness/datatype/float/pow/bad.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(pow,(val(float,float("2.5")),(bad,()))). +evaluate(pow,(bad,(val(float,float("3.1")),()))). diff --git a/tests/correctness/datatype/float/pow/basic.expected.all b/tests/correctness/datatype/float/pow/basic.expected.all new file mode 100644 index 00000000..a10be1c1 --- /dev/null +++ b/tests/correctness/datatype/float/pow/basic.expected.all @@ -0,0 +1 @@ +evaluated(pow,(val(float,float("0.25")),(val(float,float("4.0")),())),val(float,float("0.00390625"))) diff --git a/tests/correctness/datatype/float/pow/basic.expected.none b/tests/correctness/datatype/float/pow/basic.expected.none new file mode 100644 index 00000000..1fb7432d --- /dev/null +++ b/tests/correctness/datatype/float/pow/basic.expected.none @@ -0,0 +1 @@ +evaluated(pow,(val(float,float("0.25")),(val(float,float("4.0")),())),bad) diff --git a/tests/correctness/datatype/float/pow/basic.expected.stats b/tests/correctness/datatype/float/pow/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/pow/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/pow/basic.lp b/tests/correctness/datatype/float/pow/basic.lp new file mode 100644 index 00000000..4a9eb6cc --- /dev/null +++ b/tests/correctness/datatype/float/pow/basic.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(pow,(val(float,float("0.25")),(val(float,float("4.0")),()))). diff --git a/tests/correctness/datatype/float/pow/mixed.expected.all b/tests/correctness/datatype/float/pow/mixed.expected.all new file mode 100644 index 00000000..be4c6490 --- /dev/null +++ b/tests/correctness/datatype/float/pow/mixed.expected.all @@ -0,0 +1,5 @@ +evaluated(pow,(val(float,float("2.5")),(val(int,2),())),val(float,float("6.25"))) +evaluated(leq,(operation(pow,(val(int,6),(val(float,float("1.5")),()))),(val(float,float("14.7")),())),val(bool,true)) +evaluated(leq,(operation(pow,(val(int,6),(val(float,float("1.5")),()))),(val(float,float("14.6")),())),val(bool,false)) +evaluated(pow,(val(float,float("10.0")),(val(int,-3),())),val(float,float("0.001"))) +evaluated(pow,(val(int,4),(val(int,-3),())),val(float,float("0.015625"))) diff --git a/tests/correctness/datatype/float/pow/mixed.expected.none b/tests/correctness/datatype/float/pow/mixed.expected.none new file mode 100644 index 00000000..c2a5b1f6 --- /dev/null +++ b/tests/correctness/datatype/float/pow/mixed.expected.none @@ -0,0 +1,5 @@ +evaluated(pow,(val(float,float("2.5")),(val(int,2),())),bad) +evaluated(pow,(val(float,float("10.0")),(val(int,-3),())),bad) +evaluated(pow,(val(int,4),(val(int,-3),())),bad) +evaluated(leq,(operation(pow,(val(int,6),(val(float,float("1.5")),()))),(val(float,float("14.7")),())),bad) +evaluated(leq,(operation(pow,(val(int,6),(val(float,float("1.5")),()))),(val(float,float("14.6")),())),bad) diff --git a/tests/correctness/datatype/float/pow/mixed.expected.stats b/tests/correctness/datatype/float/pow/mixed.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/pow/mixed.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/pow/mixed.lp b/tests/correctness/datatype/float/pow/mixed.lp new file mode 100644 index 00000000..2398f757 --- /dev/null +++ b/tests/correctness/datatype/float/pow/mixed.lp @@ -0,0 +1,5 @@ +evaluate(pow,(val(float,float("2.5")),(val(int,2),()))). +evaluate(leq,(operation(pow,(val(int,6),(val(float,float("1.5")),()))),(val(float,float("14.7")),()))). +evaluate(leq,(operation(pow,(val(int,6),(val(float,float("1.5")),()))),(val(float,float("14.6")),()))). +evaluate(pow,(val(float,float("10.0")),(val(int,-3),()))). +evaluate(pow,(val(int,4),(val(int,-3),()))). diff --git a/tests/correctness/datatype/float/pow/none.expected.all b/tests/correctness/datatype/float/pow/none.expected.all new file mode 100644 index 00000000..9307f0fe --- /dev/null +++ b/tests/correctness/datatype/float/pow/none.expected.all @@ -0,0 +1 @@ +evaluated(pow,(val(float,float("2.5")),(val(none,none),())),bad) diff --git a/tests/correctness/datatype/float/pow/none.expected.none b/tests/correctness/datatype/float/pow/none.expected.none new file mode 100644 index 00000000..d43ef867 --- /dev/null +++ b/tests/correctness/datatype/float/pow/none.expected.none @@ -0,0 +1 @@ +evaluated(pow,(val(float,float("2.5")),(val(none,none),())),val(none,none)) diff --git a/tests/correctness/datatype/float/pow/none.expected.stats b/tests/correctness/datatype/float/pow/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/pow/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/pow/none.lp b/tests/correctness/datatype/float/pow/none.lp new file mode 100644 index 00000000..fbe620dc --- /dev/null +++ b/tests/correctness/datatype/float/pow/none.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(pow,(val(float,float("2.5")),(val(none,none),()))). diff --git a/tests/correctness/unit/float_pow.expected.any b/tests/correctness/datatype/float/pow/variable.expected.any similarity index 100% rename from tests/correctness/unit/float_pow.expected.any rename to tests/correctness/datatype/float/pow/variable.expected.any diff --git a/tests/correctness/unit/bad_sub.expected.stats b/tests/correctness/datatype/float/pow/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_sub.expected.stats rename to tests/correctness/datatype/float/pow/variable.expected.stats diff --git a/tests/correctness/unit/float_pow.lp b/tests/correctness/datatype/float/pow/variable.lp similarity index 64% rename from tests/correctness/unit/float_pow.lp rename to tests/correctness/datatype/float/pow/variable.lp index 598b4a4f..bcbf59a7 100644 --- a/tests/correctness/unit/float_pow.lp +++ b/tests/correctness/datatype/float/pow/variable.lp @@ -1,10 +1,5 @@ phase_request(constantFolding,false). -evaluate(pow,(val(float,float("2.5")),(val(int,2),()))). -evaluate(pow,(val(float,float("2.5")),(val(none,none),()))). -evaluate(pow,(val(float,float("2.5")),(bad,()))). - - variable_declare(x,fromFacts). variable_domain(x,val(float,float("2.5"))). variable_domain(x,val(none,none)). diff --git a/tests/correctness/datatype/float/rounding.expected.all b/tests/correctness/datatype/float/rounding.expected.all index a885fe61..96dc4e0a 100644 --- a/tests/correctness/datatype/float/rounding.expected.all +++ b/tests/correctness/datatype/float/rounding.expected.all @@ -1,8 +1 @@ evaluated(python("int"),(variable(y),()),val(int,2)) - -value(f0,val(int,5)) -value(f2,val(int,5)) -value(f6,val(int,5)) -value(c0,val(int,5)) -value(c2,val(int,6)) -value(c6,val(int,6)) diff --git a/tests/correctness/datatype/float/rounding.lp b/tests/correctness/datatype/float/rounding.lp index 8a74f773..5fc7f799 100644 --- a/tests/correctness/datatype/float/rounding.lp +++ b/tests/correctness/datatype/float/rounding.lp @@ -5,11 +5,3 @@ variable_define(y,val(float,float("2.5"))). evaluate(python("int"),(variable(y),())). - -variable_define(f0,operation(floor,(val(float,float("5")),()))). -variable_define(f2,operation(floor,(val(float,float("5.2")),()))). -variable_define(f6,operation(floor,(val(float,float("5.6")),()))). - -variable_define(c0,operation(ceil,(val(float,float("5")),()))). -variable_define(c2,operation(ceil,(val(float,float("5.2")),()))). -variable_define(c6,operation(ceil,(val(float,float("5.6")),()))). diff --git a/tests/correctness/datatype/float/sub/bad.expected.all b/tests/correctness/datatype/float/sub/bad.expected.all new file mode 100644 index 00000000..7074bafe --- /dev/null +++ b/tests/correctness/datatype/float/sub/bad.expected.all @@ -0,0 +1,2 @@ +evaluated(sub,(val(float,float("2.5")),(bad,())),bad) +evaluated(sub,(bad,(val(float,float("3.1")),())),bad) diff --git a/tests/correctness/datatype/float/sub/bad.expected.none b/tests/correctness/datatype/float/sub/bad.expected.none new file mode 100644 index 00000000..efb19783 --- /dev/null +++ b/tests/correctness/datatype/float/sub/bad.expected.none @@ -0,0 +1 @@ +evaluated(sub,(val(float,float("2.5")),(bad,())),val(float,float("2.5"))) diff --git a/tests/correctness/datatype/float/sub/bad.expected.stats b/tests/correctness/datatype/float/sub/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/sub/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/sub/bad.lp b/tests/correctness/datatype/float/sub/bad.lp new file mode 100644 index 00000000..05b022ca --- /dev/null +++ b/tests/correctness/datatype/float/sub/bad.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(sub,(val(float,float("2.5")),(bad,()))). +evaluate(sub,(bad,(val(float,float("3.1")),()))). diff --git a/tests/correctness/datatype/float/sub/basic.expected.all b/tests/correctness/datatype/float/sub/basic.expected.all new file mode 100644 index 00000000..9afa64ba --- /dev/null +++ b/tests/correctness/datatype/float/sub/basic.expected.all @@ -0,0 +1,3 @@ +evaluated(sub,(val(float,float("2.5")),(val(int,2),())),val(float,float("0.5"))) +evaluated(sub,(val(float,float("2.5")),(val(float,float("3.125")),())),val(float,float("-0.625"))) +evaluated(sub,(val(int,2),(val(float,float("3.125")),())),val(float,float("-1.125"))) diff --git a/tests/correctness/datatype/float/sub/basic.expected.none b/tests/correctness/datatype/float/sub/basic.expected.none new file mode 100644 index 00000000..646a6339 --- /dev/null +++ b/tests/correctness/datatype/float/sub/basic.expected.none @@ -0,0 +1,3 @@ +evaluated(sub,(val(float,float("2.5")),(val(int,2),())),bad) +evaluated(sub,(val(float,float("2.5")),(val(float,float("3.125")),())),bad) +evaluated(sub,(val(int,2),(val(float,float("3.125")),())),bad) diff --git a/tests/correctness/datatype/float/sub/basic.expected.stats b/tests/correctness/datatype/float/sub/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/sub/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/sub/basic.lp b/tests/correctness/datatype/float/sub/basic.lp new file mode 100644 index 00000000..fa9d2c02 --- /dev/null +++ b/tests/correctness/datatype/float/sub/basic.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(sub,(val(float,float("2.5")),(val(int,2),()))). +evaluate(sub,(val(float,float("2.5")),(val(float,float("3.125")),()))). +evaluate(sub,(val(int,2),(val(float,float("3.125")),()))). diff --git a/tests/correctness/datatype/float/sub/none.expected.all b/tests/correctness/datatype/float/sub/none.expected.all new file mode 100644 index 00000000..2ad5ca37 --- /dev/null +++ b/tests/correctness/datatype/float/sub/none.expected.all @@ -0,0 +1,2 @@ +evaluated(sub,(val(float,float("2.5")),(val(none,none),())),bad) +evaluated(sub,(val(none,none),(val(float,float("2.5")),())),bad) diff --git a/tests/correctness/datatype/float/sub/none.expected.none b/tests/correctness/datatype/float/sub/none.expected.none new file mode 100644 index 00000000..4459063b --- /dev/null +++ b/tests/correctness/datatype/float/sub/none.expected.none @@ -0,0 +1,2 @@ +evaluated(sub,(val(float,float("2.5")),(val(none,none),())),val(none,none)) +evaluated(sub,(val(none,none),(val(float,float("2.5")),())),val(none,none)) diff --git a/tests/correctness/datatype/float/sub/none.expected.stats b/tests/correctness/datatype/float/sub/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/float/sub/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/float/sub/none.lp b/tests/correctness/datatype/float/sub/none.lp new file mode 100644 index 00000000..957207bf --- /dev/null +++ b/tests/correctness/datatype/float/sub/none.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(sub,(val(float,float("2.5")),(val(none,none),()))). +evaluate(sub,(val(none,none),(val(float,float("2.5")),()))). diff --git a/tests/correctness/datatype/float/sub/variable.expected.any b/tests/correctness/datatype/float/sub/variable.expected.any new file mode 100644 index 00000000..e6aeb39b --- /dev/null +++ b/tests/correctness/datatype/float/sub/variable.expected.any @@ -0,0 +1,10 @@ +evaluated(sub,(variable(x),(val(int,2),())),val(float,float("0.5"))) +evaluated(sub,(variable(x),(val(int,2),())),bad) +evaluated(sub,(val(int,6),(variable(x),())),val(float,float("3.5"))) +evaluated(sub,(val(int,6),(variable(x),())),bad) +evaluated(sub,(variable(x),(val(float,float("20.0")),())),val(float,float("-17.5"))) +evaluated(sub,(variable(x),(val(float,float("20.0")),())),bad) +evaluated(sub,(val(float,float("60.0")),(variable(x),())),val(float,float("57.5"))) +evaluated(sub,(val(float,float("60.0")),(variable(x),())),bad) +evaluated(sub,(variable(x),(val(none,none),())),bad) +evaluated(sub,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_conj.expected.stats b/tests/correctness/datatype/float/sub/variable.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_conj.expected.stats rename to tests/correctness/datatype/float/sub/variable.expected.stats diff --git a/tests/correctness/unit/float_sub.lp b/tests/correctness/datatype/float/sub/variable.lp similarity index 64% rename from tests/correctness/unit/float_sub.lp rename to tests/correctness/datatype/float/sub/variable.lp index 59e2dcc4..940a1713 100644 --- a/tests/correctness/unit/float_sub.lp +++ b/tests/correctness/datatype/float/sub/variable.lp @@ -1,14 +1,12 @@ phase_request(constantFolding,false). -evaluate(sub,(val(float,float("2.5")),(val(int,2),()))). -evaluate(sub,(val(float,float("2.5")),(val(none,none),()))). -evaluate(sub,(val(float,float("2.5")),(bad,()))). - - variable_declare(x,fromFacts). variable_domain(x,val(float,float("2.5"))). variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(sub,(variable(x),(val(int,2),()))). +evaluate(sub,(val(int,6),(variable(x),()))). +evaluate(sub,(variable(x),(val(float,float("20.0")),()))). +evaluate(sub,(val(float,float("60.0")),(variable(x),()))). evaluate(sub,(variable(x),(val(none,none),()))). evaluate(sub,(variable(x),(bad,()))). diff --git a/tests/correctness/datatype/int/abs.expected.all b/tests/correctness/datatype/int/abs.expected.all deleted file mode 100644 index 7d261df9..00000000 --- a/tests/correctness/datatype/int/abs.expected.all +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(abs,(variable(subtwoten),()),val(int,8)) -evaluated(abs,(variable(subtentwo),()),val(int,8)) diff --git a/tests/correctness/datatype/int/abs.lp b/tests/correctness/datatype/int/abs.lp deleted file mode 100644 index 739b7dc6..00000000 --- a/tests/correctness/datatype/int/abs.lp +++ /dev/null @@ -1,7 +0,0 @@ -variable_define(two,val(int,2)). -variable_define(ten,val(int,10)). -variable_define(subtwoten,operation(sub,(variable(two),(variable(ten),())))). -variable_define(subtentwo,operation(sub,(variable(ten),(variable(two),())))). - -evaluate(abs,(variable(subtwoten),())). -evaluate(abs,(variable(subtentwo),())). diff --git a/tests/correctness/datatype/int/abs/bad.expected.all b/tests/correctness/datatype/int/abs/bad.expected.all new file mode 100644 index 00000000..3260b98e --- /dev/null +++ b/tests/correctness/datatype/int/abs/bad.expected.all @@ -0,0 +1 @@ +evaluated(abs,(bad,()),bad) diff --git a/tests/correctness/datatype/int/abs/bad.expected.none b/tests/correctness/datatype/int/abs/bad.expected.none new file mode 100644 index 00000000..d26b1a13 --- /dev/null +++ b/tests/correctness/datatype/int/abs/bad.expected.none @@ -0,0 +1,2 @@ +evaluated(abs,(bad,()),val(int,0)) +evaluated(abs,(bad,()),val(none,none)) diff --git a/tests/correctness/datatype/int/abs/bad.expected.stats b/tests/correctness/datatype/int/abs/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/abs/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/abs/bad.lp b/tests/correctness/datatype/int/abs/bad.lp new file mode 100644 index 00000000..fa6613e7 --- /dev/null +++ b/tests/correctness/datatype/int/abs/bad.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(abs,(bad,())). diff --git a/tests/correctness/unit/unary/int_abs.expected.all b/tests/correctness/datatype/int/abs/basic.expected.all similarity index 55% rename from tests/correctness/unit/unary/int_abs.expected.all rename to tests/correctness/datatype/int/abs/basic.expected.all index 77d27bc7..bf2bae51 100644 --- a/tests/correctness/unit/unary/int_abs.expected.all +++ b/tests/correctness/datatype/int/abs/basic.expected.all @@ -1,4 +1,2 @@ evaluated(abs,(val(int,-3),()),val(int,3)) evaluated(abs,(val(int,2),()),val(int,2)) -evaluated(abs,(val(none,none),()),bad) -evaluated(abs,(bad,()),bad) diff --git a/tests/correctness/unit/unary/int_abs.expected.none b/tests/correctness/datatype/int/abs/basic.expected.none similarity index 59% rename from tests/correctness/unit/unary/int_abs.expected.none rename to tests/correctness/datatype/int/abs/basic.expected.none index a0ff975f..c9f2b6e7 100644 --- a/tests/correctness/unit/unary/int_abs.expected.none +++ b/tests/correctness/datatype/int/abs/basic.expected.none @@ -1,10 +1,6 @@ evaluated(abs,(val(int,-3),()),bad) -evaluated(abs,(val(int,-3),()),val(none,none)) evaluated(abs,(val(int,-3),()),val(int,-3)) +evaluated(abs,(val(int,-3),()),val(none,none)) evaluated(abs,(val(int,2),()),bad) -evaluated(abs,(val(int,2),()),val(none,none)) evaluated(abs,(val(int,2),()),val(int,-2)) -evaluated(abs,(val(none,none),()),val(none,none)) -evaluated(abs,(val(none,none),()),val(int,0)) -evaluated(abs,(bad,()),val(none,none)) -evaluated(abs,(bad,()),val(int,0)) +evaluated(abs,(val(int,2),()),val(none,none)) diff --git a/tests/correctness/datatype/int/abs/basic.expected.stats b/tests/correctness/datatype/int/abs/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/abs/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/abs/basic.lp b/tests/correctness/datatype/int/abs/basic.lp new file mode 100644 index 00000000..bac3845e --- /dev/null +++ b/tests/correctness/datatype/int/abs/basic.lp @@ -0,0 +1,6 @@ +phase_request(constantFolding,false). + +evaluate(abs,(val(int,-3),())). +evaluate(abs,(val(int,2),())). +evaluate(abs,(operation(sub,(val(int,2),(val(int,10),()))),())). +evaluate(abs,(operation(sub,(val(int,10),(val(int,2),()))),())). diff --git a/tests/correctness/datatype/int/abs/none.expected.all b/tests/correctness/datatype/int/abs/none.expected.all new file mode 100644 index 00000000..a596f85e --- /dev/null +++ b/tests/correctness/datatype/int/abs/none.expected.all @@ -0,0 +1 @@ +evaluated(abs,(val(none,none),()),bad) diff --git a/tests/correctness/datatype/int/abs/none.expected.none b/tests/correctness/datatype/int/abs/none.expected.none new file mode 100644 index 00000000..17a8caa8 --- /dev/null +++ b/tests/correctness/datatype/int/abs/none.expected.none @@ -0,0 +1,3 @@ +evaluated(abs,(val(none,none),()),val(int,0)) +evaluated(abs,(val(none,none),()),val(none,none)) +evaluated(abs,(val(none,none),()),val(float,float("0.0"))) diff --git a/tests/correctness/datatype/int/abs/none.expected.stats b/tests/correctness/datatype/int/abs/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/abs/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/abs/none.lp b/tests/correctness/datatype/int/abs/none.lp new file mode 100644 index 00000000..413576f8 --- /dev/null +++ b/tests/correctness/datatype/int/abs/none.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(abs,(val(none,none),())). diff --git a/tests/correctness/unit/unary/int_abs.expected.any b/tests/correctness/datatype/int/abs/variable.expected.any similarity index 100% rename from tests/correctness/unit/unary/int_abs.expected.any rename to tests/correctness/datatype/int/abs/variable.expected.any diff --git a/tests/correctness/unit/bad_geq.expected.stats b/tests/correctness/datatype/int/abs/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_geq.expected.stats rename to tests/correctness/datatype/int/abs/variable.expected.stats diff --git a/tests/correctness/unit/unary/int_abs.lp b/tests/correctness/datatype/int/abs/variable.lp similarity index 64% rename from tests/correctness/unit/unary/int_abs.lp rename to tests/correctness/datatype/int/abs/variable.lp index 53d874a2..89f48979 100644 --- a/tests/correctness/unit/unary/int_abs.lp +++ b/tests/correctness/datatype/int/abs/variable.lp @@ -1,11 +1,5 @@ phase_request(constantFolding,false). -evaluate(abs,(val(int,-3),())). -evaluate(abs,(val(int,2),())). -evaluate(abs,(val(none,none),())). -evaluate(abs,(bad,())). - - variable_declare(x,fromFacts). variable_domain(x,val(int,-3)). variable_domain(x,val(int,2)). diff --git a/tests/correctness/datatype/int/add/bad.expected.all b/tests/correctness/datatype/int/add/bad.expected.all new file mode 100644 index 00000000..a167fce6 --- /dev/null +++ b/tests/correctness/datatype/int/add/bad.expected.all @@ -0,0 +1 @@ +evaluated(add,(val(int,2),(bad,())),bad) diff --git a/tests/correctness/datatype/int/add/bad.expected.stats b/tests/correctness/datatype/int/add/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/add/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/add/bad.lp b/tests/correctness/datatype/int/add/bad.lp new file mode 100644 index 00000000..3fce2f78 --- /dev/null +++ b/tests/correctness/datatype/int/add/bad.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(add,(val(int,2),(bad,()))). diff --git a/tests/correctness/datatype/int/add/basic.expected.all b/tests/correctness/datatype/int/add/basic.expected.all new file mode 100644 index 00000000..f63cb92c --- /dev/null +++ b/tests/correctness/datatype/int/add/basic.expected.all @@ -0,0 +1,4 @@ +evaluated(add,(val(int,2),(val(int,3),())),val(int,5)) +evaluated(add,(val(int,5),(val(int,5),())),val(int,10)) +evaluated(add,(val(int,2),(val(bool,true),())),val(int,3)) +evaluated(add,(val(int,2),(val(bool,false),())),val(int,2)) diff --git a/tests/correctness/datatype/int/add/basic.expected.none b/tests/correctness/datatype/int/add/basic.expected.none new file mode 100644 index 00000000..916b938d --- /dev/null +++ b/tests/correctness/datatype/int/add/basic.expected.none @@ -0,0 +1,12 @@ +evaluated(add,(val(int,2),(val(int,3),())),bad) +evaluated(add,(val(int,2),(val(int,3),())),val(int,0)) +evaluated(add,(val(int,2),(val(int,3),())),val(int,2)) +evaluated(add,(val(int,2),(val(int,3),())),val(int,3)) +evaluated(add,(val(int,5),(val(int,5),())),val(int,0)) +evaluated(add,(val(int,5),(val(int,5),())),val(int,5)) +evaluated(add,(val(int,2),(val(bool,true),())),bad) +evaluated(add,(val(int,2),(val(bool,true),())),val(none,none)) +evaluated(add,(val(int,2),(val(bool,true),())),val(int,2)) +evaluated(add,(val(int,2),(val(bool,false),())),bad) +evaluated(add,(val(int,2),(val(bool,false),())),val(none,none)) +evaluated(add,(val(int,2),(val(bool,false),())),val(int,3)) diff --git a/tests/correctness/datatype/int/add/basic.expected.stats b/tests/correctness/datatype/int/add/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/add/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/add/basic.lp b/tests/correctness/datatype/int/add/basic.lp new file mode 100644 index 00000000..ef20f0e7 --- /dev/null +++ b/tests/correctness/datatype/int/add/basic.lp @@ -0,0 +1,6 @@ +phase_request(constantFolding,false). + +evaluate(add,(val(int,2),(val(int,3),()))). +evaluate(add,(val(int,5),(val(int,5),()))). +evaluate(add,(val(int,2),(val(bool,true),()))). +evaluate(add,(val(int,2),(val(bool,false),()))). diff --git a/tests/correctness/datatype/int/add/nary.expected.all b/tests/correctness/datatype/int/add/nary.expected.all new file mode 100644 index 00000000..4ea02479 --- /dev/null +++ b/tests/correctness/datatype/int/add/nary.expected.all @@ -0,0 +1,2 @@ +value(y,val(int,33)) +value(z,val(int,55)) diff --git a/tests/correctness/datatype/int/add/nary.expected.any b/tests/correctness/datatype/int/add/nary.expected.any new file mode 100644 index 00000000..4c918e7e --- /dev/null +++ b/tests/correctness/datatype/int/add/nary.expected.any @@ -0,0 +1,2 @@ +value(x,val(int,2)) +value(x,val(int,22)) diff --git a/tests/correctness/datatype/int/add/nary.lp b/tests/correctness/datatype/int/add/nary.lp new file mode 100644 index 00000000..d7cc90a1 --- /dev/null +++ b/tests/correctness/datatype/int/add/nary.lp @@ -0,0 +1,7 @@ +variable_declare((x;y;z),fromFacts). +variable_domain(x,val(int,(2;22))). +variable_domain(y,val(int,(3;33))). +variable_domain(z,val(int,(5;55))). + +variable_define(s,operation(add,(variable(x),(variable(y),(variable(z),()))))). +ensure(operation(geq,(variable(s),(val(int,90),())))). diff --git a/tests/correctness/datatype/int/add/none.expected.all b/tests/correctness/datatype/int/add/none.expected.all new file mode 100644 index 00000000..f4ada8b6 --- /dev/null +++ b/tests/correctness/datatype/int/add/none.expected.all @@ -0,0 +1 @@ +evaluated(add,(val(int,2),(val(none,none),())),bad) diff --git a/tests/correctness/datatype/int/add/none.expected.stats b/tests/correctness/datatype/int/add/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/add/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/add/none.lp b/tests/correctness/datatype/int/add/none.lp new file mode 100644 index 00000000..5d9cb18d --- /dev/null +++ b/tests/correctness/datatype/int/add/none.lp @@ -0,0 +1 @@ +evaluate(add,(val(int,2),(val(none,none),()))). diff --git a/tests/correctness/datatype/int/add/variable.expected.any b/tests/correctness/datatype/int/add/variable.expected.any new file mode 100644 index 00000000..6f6e8a22 --- /dev/null +++ b/tests/correctness/datatype/int/add/variable.expected.any @@ -0,0 +1,8 @@ +evaluated(add,(variable(x),(val(int,3),())),val(int,5)) +evaluated(add,(variable(x),(val(int,3),())),val(int,8)) +evaluated(add,(variable(x),(val(int,3),())),bad) +evaluated(add,(variable(x),(val(none,none),())),bad) +evaluated(add,(variable(x),(bad,())),bad) +evaluated(add,(variable(x),(val(int,7),())),val(int,9)) +evaluated(add,(variable(x),(val(int,7),())),val(int,12)) +evaluated(add,(variable(x),(val(int,7),())),bad) diff --git a/tests/correctness/datatype/int/add/variable.expected.none b/tests/correctness/datatype/int/add/variable.expected.none new file mode 100644 index 00000000..df6074a9 --- /dev/null +++ b/tests/correctness/datatype/int/add/variable.expected.none @@ -0,0 +1,16 @@ +evaluated(add,(variable(x),(val(int,3),())),val(none,none)) +evaluated(add,(variable(x),(val(int,3),())),val(int,0)) +evaluated(add,(variable(x),(val(int,3),())),val(int,3)) +evaluated(add,(variable(x),(val(int,3),())),val(int,7)) +evaluated(add,(variable(x),(val(int,3),())),val(int,9)) +evaluated(add,(variable(x),(val(int,3),())),val(int,12)) +evaluated(add,(variable(x),(val(int,7),())),val(int,0)) +evaluated(add,(variable(x),(val(int,7),())),val(int,3)) +evaluated(add,(variable(x),(val(int,7),())),val(int,5)) +evaluated(add,(variable(x),(val(int,7),())),val(int,7)) +evaluated(add,(variable(x),(val(int,7),())),val(int,8)) +evaluated(add,(variable(x),(val(int,7),())),val(none,none)) +evaluated(add,(variable(x),(val(none,none),())),val(none,none)) +evaluated(add,(variable(x),(val(none,none),())),val(int,0)) +evaluated(add,(variable(x),(bad,())),val(none,none)) +evaluated(add,(variable(x),(bad,())),val(int,0)) diff --git a/tests/correctness/unit/bad_gt.expected.stats b/tests/correctness/datatype/int/add/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_gt.expected.stats rename to tests/correctness/datatype/int/add/variable.expected.stats diff --git a/tests/correctness/unit/int_add.lp b/tests/correctness/datatype/int/add/variable.lp similarity index 54% rename from tests/correctness/unit/int_add.lp rename to tests/correctness/datatype/int/add/variable.lp index 783a2cf1..fa78ea4c 100644 --- a/tests/correctness/unit/int_add.lp +++ b/tests/correctness/datatype/int/add/variable.lp @@ -1,16 +1,11 @@ phase_request(constantFolding,false). -evaluate(add,(val(int,2),(val(bool,true),()))). -evaluate(add,(val(int,2),(val(bool,false),()))). -evaluate(add,(val(int,-3),(val(int,2),(val(bool,true),())))). -evaluate(add,(val(int,2),(val(none,none),()))). -evaluate(add,(val(int,2),(bad,()))). - - variable_declare(x,fromFacts). variable_domain(x,val(int,2)). +variable_domain(x,val(int,5)). variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(add,(variable(x),(val(int,3),()))). +evaluate(add,(variable(x),(val(int,7),()))). evaluate(add,(variable(x),(val(none,none),()))). evaluate(add,(variable(x),(bad,()))). diff --git a/tests/correctness/datatype/int/add/variadic.expected.all b/tests/correctness/datatype/int/add/variadic.expected.all new file mode 100644 index 00000000..8f37947c --- /dev/null +++ b/tests/correctness/datatype/int/add/variadic.expected.all @@ -0,0 +1,10 @@ +evaluated(add,(),val(int,0)) +evaluated(add,(variable(ten),()),val(int,10)) +evaluated(add,(val(int,-3),()),val(int,-3)) +evaluated(add,(val(bool,true),()),val(int,1)) +evaluated(add,(val(int,20),()),val(int,20)) +evaluated(add,(val(none,none),()),bad) +evaluated(add,(bad,()),bad) +evaluated(add,(variable(two),(variable(ten),())),val(int,12)) +evaluated(add,(variable(ten),(variable(two),(val(int,2),(variable(ten),())))),val(int,24)) +evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,0)) diff --git a/tests/correctness/datatype/int/add/variadic.expected.none b/tests/correctness/datatype/int/add/variadic.expected.none new file mode 100644 index 00000000..f0b79239 --- /dev/null +++ b/tests/correctness/datatype/int/add/variadic.expected.none @@ -0,0 +1,14 @@ +evaluated(add,(),val(none,none)) +evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),val(none,none)) +evaluated(add,(),bad) +evaluated(add,(variable(ten),()),bad) +evaluated(add,(val(int,-3),()),bad) +evaluated(add,(val(int,-3),()),val(int,0)) +evaluated(add,(val(bool,true),()),bad) +evaluated(add,(val(bool,true),()),val(int,0)) +evaluated(add,(val(int,20),()),bad) +evaluated(add,(variable(two),(variable(ten),())),bad) +evaluated(add,(variable(two),(variable(ten),())),val(int,0)) +evaluated(add,(variable(ten),(variable(two),(val(int,2),(variable(ten),())))),bad) +evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),bad) +evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,-1)) diff --git a/tests/correctness/datatype/int/add/variadic.expected.stats b/tests/correctness/datatype/int/add/variadic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/add/variadic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/add/variadic.lp b/tests/correctness/datatype/int/add/variadic.lp new file mode 100644 index 00000000..522233e7 --- /dev/null +++ b/tests/correctness/datatype/int/add/variadic.lp @@ -0,0 +1,14 @@ +phase_request(constantFolding,false). + +evaluate(add,()). +variable_define(two,val(int,2)). +variable_define(ten,val(int,10)). +evaluate(add,(variable(ten),())). +evaluate(add,(val(int,20),())). +evaluate(add,(val(int,-3),())). +evaluate(add,(val(bool,true),())). +evaluate(add,(val(none,none),())). +evaluate(add,(bad,())). +evaluate(add,(variable(two),(variable(ten),()))). +evaluate(add,(variable(ten),(variable(two),(val(int,2),(variable(ten),()))))). +evaluate(add,(val(int,-3),(val(int,2),(val(bool,true),())))). diff --git a/tests/correctness/datatype/int/arithmetic_add_mul_basic.expected.all b/tests/correctness/datatype/int/arithmetic_add_mul_basic.expected.all deleted file mode 100644 index 37a8d239..00000000 --- a/tests/correctness/datatype/int/arithmetic_add_mul_basic.expected.all +++ /dev/null @@ -1,12 +0,0 @@ -value(x,val(int,20)) -evaluated(add,(),val(int,0)) -evaluated(add,(variable(x),(val(int,10),())),val(int,30)) -evaluated(add,(variable(ten),()),val(int,10)) -evaluated(add,(variable(two),(variable(ten),())),val(int,12)) -evaluated(add,(variable(ten),(variable(two),())),val(int,12)) -evaluated(add,(variable(ten),(variable(two),(variable(two),(variable(ten),())))),val(int,24)) -evaluated(mult,(),val(int,1)) -evaluated(mult,(variable(ten),()),val(int,10)) -evaluated(mult,(variable(two),(variable(ten),())),val(int,20)) -evaluated(mult,(variable(ten),(variable(two),())),val(int,20)) -evaluated(mult,(variable(ten),(variable(two),(variable(two),(variable(ten),())))),val(int,400)) diff --git a/tests/correctness/datatype/int/arithmetic_add_mul_basic.lp b/tests/correctness/datatype/int/arithmetic_add_mul_basic.lp deleted file mode 100644 index 3a482daa..00000000 --- a/tests/correctness/datatype/int/arithmetic_add_mul_basic.lp +++ /dev/null @@ -1,16 +0,0 @@ -variable_define(x,val(int,20)). -variable_define(two,val(int,2)). -variable_define(ten,val(int,10)). - -evaluate(add,(variable(x),(val(int,10),()))). -evaluate(add,()). -evaluate(add,(variable(ten),())). -evaluate(add,(variable(two),(variable(ten),()))). -evaluate(add,(variable(ten),(variable(two),()))). -evaluate(add,(variable(ten),(variable(two),(variable(two),(variable(ten),()))))). - -evaluate(mult,()). -evaluate(mult,(variable(ten),())). -evaluate(mult,(variable(two),(variable(ten),()))). -evaluate(mult,(variable(ten),(variable(two),()))). -evaluate(mult,(variable(ten),(variable(two),(variable(two),(variable(ten),()))))). diff --git a/tests/correctness/datatype/int/arithmetic_sub_basic.lp b/tests/correctness/datatype/int/arithmetic_sub_basic.lp deleted file mode 100644 index e270fd38..00000000 --- a/tests/correctness/datatype/int/arithmetic_sub_basic.lp +++ /dev/null @@ -1,5 +0,0 @@ -variable_define(two,val(int,2)). -variable_define(ten,val(int,10)). - -evaluate(sub,(variable(two),(variable(ten),()))). -evaluate(sub,(variable(ten),(variable(two),()))). diff --git a/tests/correctness/datatype/int/comparison.expected.all b/tests/correctness/datatype/int/comparison.expected.all index 68653261..a380303a 100644 --- a/tests/correctness/datatype/int/comparison.expected.all +++ b/tests/correctness/datatype/int/comparison.expected.all @@ -15,3 +15,6 @@ evaluated(eq,(operation(float_div,(val(int,6),(val(int,2),()))),(val(float,float evaluated(eq,(operation(float_div,(val(int,5),(val(int,2),()))),(val(float,float("2.5")),())),val(bool,true)) evaluated(eq,(val(int,1),(val(float,float("1.0")),())),val(bool,true)) evaluated(neq,(val(int,1),(val(float,float("1.0")),())),val(bool,false)) +evaluated(eq,(operation(minus,(val(int,-8),())),(val(int,8),())),val(bool,true)) +evaluated(neq,(operation(minus,(val(int,2),())),(val(int,2),())),val(bool,true)) +evaluated(neq,(operation(minus,(operation(minus,(val(int,2),())),())),(val(int,2),())),val(bool,false)) diff --git a/tests/correctness/datatype/int/comparison.lp b/tests/correctness/datatype/int/comparison.lp index efbfac82..c265e878 100644 --- a/tests/correctness/datatype/int/comparison.lp +++ b/tests/correctness/datatype/int/comparison.lp @@ -23,3 +23,6 @@ evaluate(eq,(operation(float_div,(val(int,6),(val(int,2),()))),(val(float,float( evaluate(eq,(operation(float_div,(val(int,5),(val(int,2),()))),(val(float,float("2.5")),()))). evaluate(eq,(val(int,1),(val(float,float("1.0")),()))). evaluate(neq,(val(int,1),(val(float,float("1.0")),()))). +evaluate(eq,(operation(minus,(val(int,-8),())),(val(int,8),()))). +evaluate(neq,(operation(minus,(val(int,2),())),(val(int,2),()))). +evaluate(neq,(operation(minus,(operation(minus,(val(int,2),())),())),(val(int,2),()))). diff --git a/tests/correctness/datatype/int/minus.expected.all b/tests/correctness/datatype/int/minus.expected.all deleted file mode 100644 index 710ad482..00000000 --- a/tests/correctness/datatype/int/minus.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(eq,(operation(minus,(val(int,-8),())),(val(int,8),())),val(bool,true)) -evaluated(neq,(operation(minus,(val(int,2),())),(val(int,2),())),val(bool,true)) -evaluated(neq,(operation(minus,(operation(minus,(val(int,2),())),())),(val(int,2),())),val(bool,false)) diff --git a/tests/correctness/datatype/int/minus.lp b/tests/correctness/datatype/int/minus.lp deleted file mode 100644 index 0a71e6ff..00000000 --- a/tests/correctness/datatype/int/minus.lp +++ /dev/null @@ -1,5 +0,0 @@ -%%% unary minus checks moved from comparison -%%% -(-8)==8 -2!=2 --2==2 -evaluate(eq,(operation(minus,(val(int,-8),())),(val(int,8),()))). -evaluate(neq,(operation(minus,(val(int,2),())),(val(int,2),()))). -evaluate(neq,(operation(minus,(operation(minus,(val(int,2),())),())),(val(int,2),()))). diff --git a/tests/correctness/datatype/int/minus/bad.expected.all b/tests/correctness/datatype/int/minus/bad.expected.all new file mode 100644 index 00000000..3becc51e --- /dev/null +++ b/tests/correctness/datatype/int/minus/bad.expected.all @@ -0,0 +1 @@ +evaluated(minus,(bad,()),bad) diff --git a/tests/correctness/datatype/int/minus/bad.expected.none b/tests/correctness/datatype/int/minus/bad.expected.none new file mode 100644 index 00000000..69b94d78 --- /dev/null +++ b/tests/correctness/datatype/int/minus/bad.expected.none @@ -0,0 +1 @@ +evaluated(minus,(bad,()),val(int,0)) diff --git a/tests/correctness/datatype/int/minus/bad.expected.stats b/tests/correctness/datatype/int/minus/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/minus/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/minus/bad.lp b/tests/correctness/datatype/int/minus/bad.lp new file mode 100644 index 00000000..23ef7366 --- /dev/null +++ b/tests/correctness/datatype/int/minus/bad.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(minus,(bad,())). diff --git a/tests/correctness/unit/unary/int_minus.expected.all b/tests/correctness/datatype/int/minus/basic.expected.all similarity index 55% rename from tests/correctness/unit/unary/int_minus.expected.all rename to tests/correctness/datatype/int/minus/basic.expected.all index c4632b48..7f2368fd 100644 --- a/tests/correctness/unit/unary/int_minus.expected.all +++ b/tests/correctness/datatype/int/minus/basic.expected.all @@ -1,4 +1,2 @@ evaluated(minus,(val(int,-3),()),val(int,3)) evaluated(minus,(val(int,2),()),val(int,-2)) -evaluated(minus,(val(none,none),()),bad) -evaluated(minus,(bad,()),bad) diff --git a/tests/correctness/datatype/int/minus/basic.expected.none b/tests/correctness/datatype/int/minus/basic.expected.none new file mode 100644 index 00000000..493464a4 --- /dev/null +++ b/tests/correctness/datatype/int/minus/basic.expected.none @@ -0,0 +1,4 @@ +evaluated(minus,(val(int,-3),()),bad) +evaluated(minus,(val(int,-3),()),val(int,-3)) +evaluated(minus,(val(int,2),()),bad) +evaluated(minus,(val(int,2),()),val(int,2)) diff --git a/tests/correctness/datatype/int/minus/basic.expected.stats b/tests/correctness/datatype/int/minus/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/minus/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/minus/basic.lp b/tests/correctness/datatype/int/minus/basic.lp new file mode 100644 index 00000000..f42b43e6 --- /dev/null +++ b/tests/correctness/datatype/int/minus/basic.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(minus,(val(int,-3),())). +evaluate(minus,(val(int,2),())). diff --git a/tests/correctness/datatype/int/minus/none.expected.all b/tests/correctness/datatype/int/minus/none.expected.all new file mode 100644 index 00000000..6970eb22 --- /dev/null +++ b/tests/correctness/datatype/int/minus/none.expected.all @@ -0,0 +1 @@ +evaluated(minus,(val(none,none),()),bad) diff --git a/tests/correctness/datatype/int/minus/none.expected.none b/tests/correctness/datatype/int/minus/none.expected.none new file mode 100644 index 00000000..e14c62a2 --- /dev/null +++ b/tests/correctness/datatype/int/minus/none.expected.none @@ -0,0 +1,2 @@ +evaluated(minus,(val(none,none),()),val(int,0)) +evaluated(minus,(val(none,none),()),val(none,none)) diff --git a/tests/correctness/datatype/int/minus/none.expected.stats b/tests/correctness/datatype/int/minus/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/minus/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/minus/none.lp b/tests/correctness/datatype/int/minus/none.lp new file mode 100644 index 00000000..09cb80f2 --- /dev/null +++ b/tests/correctness/datatype/int/minus/none.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(minus,(val(none,none),())). diff --git a/tests/correctness/unit/unary/int_minus.expected.any b/tests/correctness/datatype/int/minus/variable.expected.any similarity index 100% rename from tests/correctness/unit/unary/int_minus.expected.any rename to tests/correctness/datatype/int/minus/variable.expected.any diff --git a/tests/correctness/datatype/int/minus/variable.expected.none b/tests/correctness/datatype/int/minus/variable.expected.none new file mode 100644 index 00000000..73e12402 --- /dev/null +++ b/tests/correctness/datatype/int/minus/variable.expected.none @@ -0,0 +1,2 @@ +evaluated(minus,(variable(x),()),val(int,0)) +evaluated(minus,(variable(x),()),val(none,none)) diff --git a/tests/correctness/unit/bad_leq.expected.stats b/tests/correctness/datatype/int/minus/variable.expected.stats similarity index 100% rename from tests/correctness/unit/bad_leq.expected.stats rename to tests/correctness/datatype/int/minus/variable.expected.stats diff --git a/tests/correctness/unit/unary/bad_minus.lp b/tests/correctness/datatype/int/minus/variable.lp similarity index 66% rename from tests/correctness/unit/unary/bad_minus.lp rename to tests/correctness/datatype/int/minus/variable.lp index 7af8e422..ace02289 100644 --- a/tests/correctness/unit/unary/bad_minus.lp +++ b/tests/correctness/datatype/int/minus/variable.lp @@ -1,10 +1,7 @@ phase_request(constantFolding,false). -evaluate(minus,(val(int,2),())). -evaluate(minus,(val(none,none),())). -evaluate(minus,(bad,())). - variable_declare(x,fromFacts). +variable_domain(x,val(int,-3)). variable_domain(x,val(int,2)). variable_domain(x,val(none,none)). variable_domain(x,bad). diff --git a/tests/correctness/datatype/int/mult/bad.expected.all b/tests/correctness/datatype/int/mult/bad.expected.all new file mode 100644 index 00000000..1df48fce --- /dev/null +++ b/tests/correctness/datatype/int/mult/bad.expected.all @@ -0,0 +1,4 @@ +evaluated(mult,(val(int,2),(bad,())),bad) +evaluated(mult,(val(int,4),(bad,())),bad) +evaluated(mult,(bad,(val(int,3),())),bad) +evaluated(mult,(bad,(bad,())),bad) diff --git a/tests/correctness/datatype/int/mult/bad.expected.none b/tests/correctness/datatype/int/mult/bad.expected.none new file mode 100644 index 00000000..8c061940 --- /dev/null +++ b/tests/correctness/datatype/int/mult/bad.expected.none @@ -0,0 +1,15 @@ +evaluated(mult,(val(int,2),(bad,())),val(int,0)) +evaluated(mult,(val(int,2),(bad,())),val(int,1)) +evaluated(mult,(val(int,2),(bad,())),val(int,2)) +evaluated(mult,(val(int,2),(bad,())),val(none,none)) +evaluated(mult,(val(int,4),(bad,())),val(int,0)) +evaluated(mult,(val(int,4),(bad,())),val(int,1)) +evaluated(mult,(val(int,4),(bad,())),val(int,4)) +evaluated(mult,(val(int,4),(bad,())),val(none,none)) +evaluated(mult,(bad,(val(int,3),())),val(int,0)) +evaluated(mult,(bad,(val(int,3),())),val(int,1)) +evaluated(mult,(bad,(val(int,3),())),val(int,3)) +evaluated(mult,(bad,(val(int,3),())),val(none,none)) +evaluated(mult,(bad,(bad,())),val(none,none)) +evaluated(mult,(bad,(bad,())),val(int,0)) +evaluated(mult,(bad,(bad,())),val(int,1)) diff --git a/tests/correctness/datatype/int/mult/bad.expected.stats b/tests/correctness/datatype/int/mult/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/mult/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/mult/bad.lp b/tests/correctness/datatype/int/mult/bad.lp new file mode 100644 index 00000000..5b9b42d0 --- /dev/null +++ b/tests/correctness/datatype/int/mult/bad.lp @@ -0,0 +1,6 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(int,2),(bad,()))). +evaluate(mult,(val(int,4),(bad,()))). +evaluate(mult,(bad,(val(int,3),()))). +evaluate(mult,(bad,(bad,()))). diff --git a/tests/correctness/datatype/int/mult/basic.expected.all b/tests/correctness/datatype/int/mult/basic.expected.all new file mode 100644 index 00000000..1655f8ee --- /dev/null +++ b/tests/correctness/datatype/int/mult/basic.expected.all @@ -0,0 +1,3 @@ +evaluated(mult,(val(int,2),(val(int,3),())),val(int,6)) +evaluated(mult,(val(int,5),(val(int,5),())),val(int,25)) +evaluated(mult,(val(int,2),(val(bool,false),())),val(int,0)) diff --git a/tests/correctness/datatype/int/mult/basic.expected.none b/tests/correctness/datatype/int/mult/basic.expected.none new file mode 100644 index 00000000..7dd285ab --- /dev/null +++ b/tests/correctness/datatype/int/mult/basic.expected.none @@ -0,0 +1,9 @@ +evaluated(mult,(val(int,2),(val(int,3),())),bad) +evaluated(mult,(val(int,2),(val(int,3),())),val(none,none)) +evaluated(mult,(val(int,5),(val(int,5),())),bad) +evaluated(mult,(val(int,5),(val(int,5),())),val(int,0)) +evaluated(mult,(val(int,5),(val(int,5),())),val(int,1)) +evaluated(mult,(val(int,5),(val(int,5),())),val(int,5)) +evaluated(mult,(val(int,2),(val(bool,false),())),bad) +evaluated(mult,(val(int,2),(val(bool,false),())),val(int,2)) +evaluated(mult,(val(int,2),(val(bool,false),())),val(none,none)) diff --git a/tests/correctness/datatype/int/mult/basic.expected.stats b/tests/correctness/datatype/int/mult/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/mult/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/mult/basic.lp b/tests/correctness/datatype/int/mult/basic.lp new file mode 100644 index 00000000..7ae8a143 --- /dev/null +++ b/tests/correctness/datatype/int/mult/basic.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(int,2),(val(int,3),()))). +evaluate(mult,(val(int,5),(val(int,5),()))). +evaluate(mult,(val(int,2),(val(bool,false),()))). diff --git a/tests/correctness/datatype/int/mult/nary.expected.all b/tests/correctness/datatype/int/mult/nary.expected.all new file mode 100644 index 00000000..a612a196 --- /dev/null +++ b/tests/correctness/datatype/int/mult/nary.expected.all @@ -0,0 +1,2 @@ +value(y,val(int,300)) +value(z,val(int,500)) diff --git a/tests/correctness/datatype/int/mult/nary.expected.any b/tests/correctness/datatype/int/mult/nary.expected.any new file mode 100644 index 00000000..cd724a88 --- /dev/null +++ b/tests/correctness/datatype/int/mult/nary.expected.any @@ -0,0 +1,2 @@ +value(x,val(int,2)) +value(x,val(int,20)) diff --git a/tests/correctness/datatype/int/mult/nary.lp b/tests/correctness/datatype/int/mult/nary.lp new file mode 100644 index 00000000..3665dc1f --- /dev/null +++ b/tests/correctness/datatype/int/mult/nary.lp @@ -0,0 +1,7 @@ +variable_declare((x;y;z),fromFacts). +variable_domain(x,val(int,(2;20))). +variable_domain(y,val(int,(3;300))). +variable_domain(z,val(int,(5;500))). + +variable_define(s,operation(mult,(variable(x),(variable(y),(variable(z),()))))). +ensure(operation(geq,(variable(s),(val(int,60000),())))). diff --git a/tests/correctness/datatype/int/mult/none.expected.all b/tests/correctness/datatype/int/mult/none.expected.all new file mode 100644 index 00000000..da985e85 --- /dev/null +++ b/tests/correctness/datatype/int/mult/none.expected.all @@ -0,0 +1,3 @@ +evaluated(mult,(val(int,2),(val(none,none),())),bad) +evaluated(mult,(val(none,none),(val(int,3),())),bad) +evaluated(mult,(val(none,none),(val(none,none),())),bad) diff --git a/tests/correctness/datatype/int/mult/none.expected.none b/tests/correctness/datatype/int/mult/none.expected.none new file mode 100644 index 00000000..94c9aaff --- /dev/null +++ b/tests/correctness/datatype/int/mult/none.expected.none @@ -0,0 +1,11 @@ +evaluated(mult,(val(int,2),(val(none,none),())),val(int,0)) +evaluated(mult,(val(int,2),(val(none,none),())),val(int,1)) +evaluated(mult,(val(int,2),(val(none,none),())),val(int,2)) +evaluated(mult,(val(int,2),(val(none,none),())),val(none,none)) +evaluated(mult,(val(none,none),(val(int,3),())),val(int,0)) +evaluated(mult,(val(none,none),(val(int,3),())),val(int,1)) +evaluated(mult,(val(none,none),(val(int,3),())),val(int,3)) +evaluated(mult,(val(none,none),(val(int,3),())),val(none,none)) +evaluated(mult,(val(none,none),(val(none,none),())),val(int,0)) +evaluated(mult,(val(none,none),(val(none,none),())),val(int,1)) +evaluated(mult,(val(none,none),(val(none,none),())),val(none,none)) diff --git a/tests/correctness/datatype/int/mult/none.expected.stats b/tests/correctness/datatype/int/mult/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/mult/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/mult/none.lp b/tests/correctness/datatype/int/mult/none.lp new file mode 100644 index 00000000..8f6b9ecd --- /dev/null +++ b/tests/correctness/datatype/int/mult/none.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(mult,(val(int,2),(val(none,none),()))). +evaluate(mult,(val(none,none),(val(int,3),()))). +evaluate(mult,(val(none,none),(val(none,none),()))). diff --git a/tests/correctness/unit/bad_mult.expected.any b/tests/correctness/datatype/int/mult/variable.expected.any similarity index 65% rename from tests/correctness/unit/bad_mult.expected.any rename to tests/correctness/datatype/int/mult/variable.expected.any index e4c5a067..7c89d932 100644 --- a/tests/correctness/unit/bad_mult.expected.any +++ b/tests/correctness/datatype/int/mult/variable.expected.any @@ -1,3 +1,5 @@ +evaluated(mult,(val(int,5),(variable(x),())),val(int,10)) +evaluated(mult,(val(int,5),(variable(x),())),bad) evaluated(mult,(variable(x),(val(int,3),())),val(int,6)) evaluated(mult,(variable(x),(val(int,3),())),bad) evaluated(mult,(variable(x),(val(none,none),())),bad) diff --git a/tests/correctness/unit/boolean_default.expected.stats b/tests/correctness/datatype/int/mult/variable.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_default.expected.stats rename to tests/correctness/datatype/int/mult/variable.expected.stats diff --git a/tests/correctness/unit/bad_mult.lp b/tests/correctness/datatype/int/mult/variable.lp similarity index 68% rename from tests/correctness/unit/bad_mult.lp rename to tests/correctness/datatype/int/mult/variable.lp index 9643cec6..6e621f2d 100644 --- a/tests/correctness/unit/bad_mult.lp +++ b/tests/correctness/datatype/int/mult/variable.lp @@ -1,13 +1,10 @@ phase_request(constantFolding,false). -evaluate(mult,(val(int,2),(val(int,3),()))). -evaluate(mult,(val(int,2),(val(none,none),()))). -evaluate(mult,(val(int,2),(bad,()))). - variable_declare(x,fromFacts). variable_domain(x,val(int,2)). variable_domain(x,val(none,none)). variable_domain(x,bad). +evaluate(mult,(val(int,5),(variable(x),()))). evaluate(mult,(variable(x),(val(int,3),()))). evaluate(mult,(variable(x),(val(none,none),()))). evaluate(mult,(variable(x),(bad,()))). diff --git a/tests/correctness/datatype/int/mult/variadic.expected.all b/tests/correctness/datatype/int/mult/variadic.expected.all new file mode 100644 index 00000000..32d5af55 --- /dev/null +++ b/tests/correctness/datatype/int/mult/variadic.expected.all @@ -0,0 +1,7 @@ +evaluated(mult,(),val(int,1)) +evaluated(mult,(val(int,-3),()),val(int,-3)) +evaluated(mult,(val(bool,true),()),val(int,1)) +evaluated(mult,(val(bool,false),()),val(int,0)) +evaluated(mult,(val(int,3),(val(int,2),(val(int,4),()))),val(int,24)) +evaluated(mult,(val(int,10),(val(int,2),(val(int,10),(val(int,10),())))),val(int,2000)) +evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,-6)) diff --git a/tests/correctness/datatype/int/mult/variadic.expected.none b/tests/correctness/datatype/int/mult/variadic.expected.none new file mode 100644 index 00000000..5b4c6c5a --- /dev/null +++ b/tests/correctness/datatype/int/mult/variadic.expected.none @@ -0,0 +1,22 @@ +evaluated(mult,(),bad) +evaluated(mult,(),val(int,0)) +evaluated(mult,(),val(none,none)) +evaluated(mult,(val(int,-3),()),bad) +evaluated(mult,(val(int,-3),()),val(int,0)) +evaluated(mult,(val(int,-3),()),val(int,1)) +evaluated(mult,(val(int,-3),()),val(int,3)) +evaluated(mult,(val(int,-3),()),val(none,none)) +evaluated(mult,(val(bool,true),()),bad) +evaluated(mult,(val(bool,true),()),val(int,0)) +evaluated(mult,(val(bool,true),()),val(none,none)) +evaluated(mult,(val(bool,false),()),bad) +evaluated(mult,(val(bool,false),()),val(int,1)) +evaluated(mult,(val(bool,false),()),val(none,none)) +evaluated(mult,(val(int,3),(val(int,2),(val(int,4),()))),bad) +evaluated(mult,(val(int,3),(val(int,2),(val(int,4),()))),val(int,6)) +evaluated(mult,(val(int,3),(val(int,2),(val(int,4),()))),val(int,8)) +evaluated(mult,(val(int,3),(val(int,2),(val(int,4),()))),val(int,12)) +evaluated(mult,(val(int,10),(val(int,2),(val(int,10),(val(int,10),())))),bad) +evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),bad) +evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,6)) +evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),val(none,none)) diff --git a/tests/correctness/datatype/int/mult/variadic.expected.stats b/tests/correctness/datatype/int/mult/variadic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/mult/variadic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/mult/variadic.lp b/tests/correctness/datatype/int/mult/variadic.lp new file mode 100644 index 00000000..fd70dbb1 --- /dev/null +++ b/tests/correctness/datatype/int/mult/variadic.lp @@ -0,0 +1,13 @@ +phase_request(constantFolding,false). + +variable_define(x,val(int,20)). +variable_define(two,val(int,2)). +variable_define(ten,val(int,10)). + +evaluate(mult,()). +evaluate(mult,(val(int,-3),())). +evaluate(mult,(val(bool,true),())). +evaluate(mult,(val(bool,false),())). +evaluate(mult,(val(int,3),(val(int,2),(val(int,4),())))). +evaluate(mult,(val(int,10),(val(int,2),(val(int,10),(val(int,10),()))))). +evaluate(mult,(val(int,-3),(val(int,2),(val(bool,true),())))). diff --git a/tests/correctness/datatype/int/pow/bad.expected.all b/tests/correctness/datatype/int/pow/bad.expected.all new file mode 100644 index 00000000..252ba274 --- /dev/null +++ b/tests/correctness/datatype/int/pow/bad.expected.all @@ -0,0 +1,3 @@ +evaluated(pow,(val(int,2),(bad,())),bad) +evaluated(pow,(bad,(val(int,3),())),bad) +evaluated(pow,(bad,(bad,())),bad) diff --git a/tests/correctness/datatype/int/pow/bad.expected.none b/tests/correctness/datatype/int/pow/bad.expected.none new file mode 100644 index 00000000..ffe42e42 --- /dev/null +++ b/tests/correctness/datatype/int/pow/bad.expected.none @@ -0,0 +1,2 @@ +evaluated(pow,(val(int,2),(bad,())),val(int,1)) +evaluated(pow,(bad,(val(int,3),())),val(int,1)) diff --git a/tests/correctness/datatype/int/pow/bad.expected.stats b/tests/correctness/datatype/int/pow/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/pow/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/pow/bad.lp b/tests/correctness/datatype/int/pow/bad.lp new file mode 100644 index 00000000..dba228c0 --- /dev/null +++ b/tests/correctness/datatype/int/pow/bad.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(pow,(val(int,2),(bad,()))). +evaluate(pow,(bad,(val(int,3),()))). +evaluate(pow,(bad,(bad,()))). diff --git a/tests/correctness/datatype/int/pow/basic.expected.all b/tests/correctness/datatype/int/pow/basic.expected.all new file mode 100644 index 00000000..c0080a80 --- /dev/null +++ b/tests/correctness/datatype/int/pow/basic.expected.all @@ -0,0 +1,5 @@ +evaluated(pow,(val(int,2),(val(int,3),())),val(int,8)) +evaluated(pow,(val(int,-3),(val(int,2),())),val(int,9)) +evaluated(pow,(val(int,-3),(val(int,5),())),val(int,-243)) +evaluated(pow,(val(int,4),(val(int,0),())),val(int,1)) +evaluated(pow,(val(int,-5),(val(int,0),())),val(int,1)) diff --git a/tests/correctness/datatype/int/pow/basic.expected.none b/tests/correctness/datatype/int/pow/basic.expected.none new file mode 100644 index 00000000..c28e8d2d --- /dev/null +++ b/tests/correctness/datatype/int/pow/basic.expected.none @@ -0,0 +1,7 @@ +evaluated(pow,(val(int,2),(val(int,3),())),bad) +evaluated(pow,(val(int,2),(val(int,3),())),val(int,6)) +evaluated(pow,(val(int,-3),(val(int,2),())),bad) +evaluated(pow,(val(int,-3),(val(int,2),())),val(int,-9)) +evaluated(pow,(val(int,-3),(val(int,52),())),val(int,243)) +evaluated(pow,(val(int,4),(val(int,0),())),val(int,4)) +evaluated(pow,(val(int,-5),(val(int,0),())),val(int,-1)) diff --git a/tests/correctness/datatype/int/pow/basic.expected.stats b/tests/correctness/datatype/int/pow/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/pow/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/pow/basic.lp b/tests/correctness/datatype/int/pow/basic.lp new file mode 100644 index 00000000..8b42043f --- /dev/null +++ b/tests/correctness/datatype/int/pow/basic.lp @@ -0,0 +1,7 @@ +phase_request(constantFolding,false). + +evaluate(pow,(val(int,2),(val(int,3),()))). +evaluate(pow,(val(int,-3),(val(int,2),()))). +evaluate(pow,(val(int,-3),(val(int,5),()))). +evaluate(pow,(val(int,4),(val(int,0),()))). +evaluate(pow,(val(int,-5),(val(int,0),()))). diff --git a/tests/correctness/datatype/int/pow/none.expected.all b/tests/correctness/datatype/int/pow/none.expected.all new file mode 100644 index 00000000..91a90189 --- /dev/null +++ b/tests/correctness/datatype/int/pow/none.expected.all @@ -0,0 +1,2 @@ +evaluated(pow,(val(none,none),(val(int,1),())),bad) +evaluated(pow,(val(int,2),(val(none,none),())),bad) diff --git a/tests/correctness/datatype/int/pow/none.expected.none b/tests/correctness/datatype/int/pow/none.expected.none new file mode 100644 index 00000000..8935f34a --- /dev/null +++ b/tests/correctness/datatype/int/pow/none.expected.none @@ -0,0 +1,4 @@ +evaluated(pow,(val(none,none),(val(int,1),())),val(int,0)) +evaluated(pow,(val(none,none),(val(int,1),())),val(none,none)) +evaluated(pow,(val(int,2),(val(none,none),())),val(int,1)) +evaluated(pow,(val(int,2),(val(none,none),())),val(none,none)) diff --git a/tests/correctness/datatype/int/pow/none.expected.stats b/tests/correctness/datatype/int/pow/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/pow/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/pow/none.lp b/tests/correctness/datatype/int/pow/none.lp new file mode 100644 index 00000000..931c6420 --- /dev/null +++ b/tests/correctness/datatype/int/pow/none.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(pow,(val(none,none),(val(int,1),()))). +evaluate(pow,(val(int,2),(val(none,none),()))). diff --git a/tests/correctness/datatype/int/pow/recovery.expected.all b/tests/correctness/datatype/int/pow/recovery.expected.all new file mode 100644 index 00000000..24c4d2f2 --- /dev/null +++ b/tests/correctness/datatype/int/pow/recovery.expected.all @@ -0,0 +1,3 @@ +evaluated(pow,(bad,(val(int,0),())),val(int,1)) +evaluated(pow,(val(none,none),(val(int,0),())),val(int,1)) +evaluated(pow,(val(int,0),(val(int,0),())),val(int,1)) diff --git a/tests/correctness/datatype/int/pow/recovery.lp b/tests/correctness/datatype/int/pow/recovery.lp new file mode 100644 index 00000000..dcd48973 --- /dev/null +++ b/tests/correctness/datatype/int/pow/recovery.lp @@ -0,0 +1,3 @@ +evaluate(pow,(bad,(val(int,0),()))). +evaluate(pow,(val(none,none),(val(int,0),()))). +evaluate(pow,(val(int,0),(val(int,0),()))). diff --git a/tests/correctness/unit/int_pow.expected.any b/tests/correctness/datatype/int/pow/variable.expected.any similarity index 100% rename from tests/correctness/unit/int_pow.expected.any rename to tests/correctness/datatype/int/pow/variable.expected.any diff --git a/tests/correctness/unit/boolean_disj.expected.stats b/tests/correctness/datatype/int/pow/variable.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_disj.expected.stats rename to tests/correctness/datatype/int/pow/variable.expected.stats diff --git a/tests/correctness/unit/unary/bad_floor.lp b/tests/correctness/datatype/int/pow/variable.lp similarity index 54% rename from tests/correctness/unit/unary/bad_floor.lp rename to tests/correctness/datatype/int/pow/variable.lp index dddd4bef..77c7a36e 100644 --- a/tests/correctness/unit/unary/bad_floor.lp +++ b/tests/correctness/datatype/int/pow/variable.lp @@ -1,11 +1,9 @@ phase_request(constantFolding,false). -evaluate(floor,(val(int,2),())). -evaluate(floor,(val(none,none),())). -evaluate(floor,(bad,())). - variable_declare(x,fromFacts). variable_domain(x,val(int,2)). variable_domain(x,val(none,none)). variable_domain(x,bad). -evaluate(floor,(variable(x),())). +evaluate(pow,(variable(x),(val(int,3),()))). +evaluate(pow,(variable(x),(val(none,none),()))). +evaluate(pow,(variable(x),(bad,()))). diff --git a/tests/correctness/datatype/int/power.expected.all b/tests/correctness/datatype/int/power.expected.all deleted file mode 100644 index 7fa9d241..00000000 --- a/tests/correctness/datatype/int/power.expected.all +++ /dev/null @@ -1,2 +0,0 @@ -value(powtwoten,val(int,1024)) -value(powtentwo,val(int,100)) diff --git a/tests/correctness/datatype/int/power.lp b/tests/correctness/datatype/int/power.lp deleted file mode 100644 index 3f8f5bb8..00000000 --- a/tests/correctness/datatype/int/power.lp +++ /dev/null @@ -1,6 +0,0 @@ -%%% power checks moved from comparison notes -%%% 2**10==1024 10**2==100 -variable_define(two,val(int,2)). -variable_define(ten,val(int,10)). -variable_define(powtwoten,operation(pow,(variable(two),(variable(ten),())))). -variable_define(powtentwo,operation(pow,(variable(ten),(variable(two),())))). diff --git a/tests/correctness/datatype/int/sub/bad.expected.all b/tests/correctness/datatype/int/sub/bad.expected.all new file mode 100644 index 00000000..4e775f42 --- /dev/null +++ b/tests/correctness/datatype/int/sub/bad.expected.all @@ -0,0 +1,3 @@ +evaluated(sub,(val(int,2),(bad,())),bad) +evaluated(sub,(bad,(val(int,3),())),bad) +evaluated(sub,(bad,(bad,())),bad) diff --git a/tests/correctness/datatype/int/sub/bad.expected.none b/tests/correctness/datatype/int/sub/bad.expected.none new file mode 100644 index 00000000..cb2b8e62 --- /dev/null +++ b/tests/correctness/datatype/int/sub/bad.expected.none @@ -0,0 +1,3 @@ +evaluated(sub,(val(int,2),(bad,())),val(none,none)) +evaluated(sub,(val(int,2),(bad,())),val(int,2)) +evaluated(sub,(val(int,2),(bad,())),val(int,0)) diff --git a/tests/correctness/datatype/int/sub/bad.expected.stats b/tests/correctness/datatype/int/sub/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/sub/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/sub/bad.lp b/tests/correctness/datatype/int/sub/bad.lp new file mode 100644 index 00000000..5069b7c9 --- /dev/null +++ b/tests/correctness/datatype/int/sub/bad.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(sub,(val(int,2),(bad,()))). +evaluate(sub,(bad,(val(int,3),()))). +evaluate(sub,(bad,(bad,()))). diff --git a/tests/correctness/datatype/int/sub/basic.expected.all b/tests/correctness/datatype/int/sub/basic.expected.all new file mode 100644 index 00000000..faecf273 --- /dev/null +++ b/tests/correctness/datatype/int/sub/basic.expected.all @@ -0,0 +1,6 @@ +evaluated(sub,(val(int,2),(val(int,-3),())),val(int,5)) +evaluated(sub,(val(int,-3),(val(int,2),())),val(int,-5)) +evaluated(sub,(val(int,2),(val(int,3),())),val(int,-1)) +evaluated(sub,(val(int,3),(val(int,2),())),val(int,1)) +evaluated(sub,(val(int,-2),(val(int,-3),())),val(int,1)) +evaluated(sub,(val(int,-3),(val(int,-2),())),val(int,-1)) diff --git a/tests/correctness/unit/int_sub.expected.none b/tests/correctness/datatype/int/sub/basic.expected.none similarity index 59% rename from tests/correctness/unit/int_sub.expected.none rename to tests/correctness/datatype/int/sub/basic.expected.none index 15a056f3..488c9206 100644 --- a/tests/correctness/unit/int_sub.expected.none +++ b/tests/correctness/datatype/int/sub/basic.expected.none @@ -4,7 +4,3 @@ evaluated(sub,(val(int,2),(val(int,-3),())),val(int,-1)) evaluated(sub,(val(int,-3),(val(int,2),())),bad) evaluated(sub,(val(int,-3),(val(int,2),())),val(none,none)) evaluated(sub,(val(int,-3),(val(int,2),())),val(int,5)) -evaluated(sub,(val(none,none),(val(int,2),())),val(none,none)) -evaluated(sub,(val(none,none),(val(int,2),())),val(int,-2)) -evaluated(sub,(val(int,2),(bad,())),val(none,none)) -evaluated(sub,(val(int,2),(bad,())),val(int,2)) diff --git a/tests/correctness/datatype/int/sub/basic.expected.stats b/tests/correctness/datatype/int/sub/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/sub/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/sub/basic.lp b/tests/correctness/datatype/int/sub/basic.lp new file mode 100644 index 00000000..2c545ad0 --- /dev/null +++ b/tests/correctness/datatype/int/sub/basic.lp @@ -0,0 +1,8 @@ +phase_request(constantFolding,false). + +evaluate(sub,(val(int,2),(val(int,-3),()))). +evaluate(sub,(val(int,-3),(val(int,2),()))). +evaluate(sub,(val(int,2),(val(int,3),()))). +evaluate(sub,(val(int,3),(val(int,2),()))). +evaluate(sub,(val(int,-2),(val(int,-3),()))). +evaluate(sub,(val(int,-3),(val(int,-2),()))). diff --git a/tests/correctness/datatype/int/sub/none.expected.all b/tests/correctness/datatype/int/sub/none.expected.all new file mode 100644 index 00000000..19d2051c --- /dev/null +++ b/tests/correctness/datatype/int/sub/none.expected.all @@ -0,0 +1,3 @@ +evaluated(sub,(val(none,none),(val(int,2),())),bad) +evaluated(sub,(val(int,3),(val(none,none),())),bad) +evaluated(sub,(val(none,none),(val(none,none),())),bad) diff --git a/tests/correctness/datatype/int/sub/none.expected.none b/tests/correctness/datatype/int/sub/none.expected.none new file mode 100644 index 00000000..b3712c5a --- /dev/null +++ b/tests/correctness/datatype/int/sub/none.expected.none @@ -0,0 +1,6 @@ +evaluated(sub,(val(none,none),(val(int,2),())),val(none,none)) +evaluated(sub,(val(none,none),(val(int,2),())),val(int,0)) +evaluated(sub,(val(none,none),(val(int,2),())),val(int,-2)) +evaluated(sub,(val(int,3),(val(none,none),())),val(int,0)) +evaluated(sub,(val(int,3),(val(none,none),())),val(int,3)) +evaluated(sub,(val(int,3),(val(none,none),())),val(none,none)) diff --git a/tests/correctness/datatype/int/sub/none.expected.stats b/tests/correctness/datatype/int/sub/none.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/int/sub/none.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/int/sub/none.lp b/tests/correctness/datatype/int/sub/none.lp new file mode 100644 index 00000000..6d96bfea --- /dev/null +++ b/tests/correctness/datatype/int/sub/none.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(sub,(val(none,none),(val(int,2),()))). +evaluate(sub,(val(int,3),(val(none,none),()))). +evaluate(sub,(val(none,none),(val(none,none),()))). diff --git a/tests/correctness/datatype/int/arithmetic_sub_basic.expected.all b/tests/correctness/datatype/int/sub/variable.expected.all similarity index 100% rename from tests/correctness/datatype/int/arithmetic_sub_basic.expected.all rename to tests/correctness/datatype/int/sub/variable.expected.all diff --git a/tests/correctness/unit/int_sub.expected.any b/tests/correctness/datatype/int/sub/variable.expected.any similarity index 100% rename from tests/correctness/unit/int_sub.expected.any rename to tests/correctness/datatype/int/sub/variable.expected.any diff --git a/tests/correctness/datatype/int/sub/variable.expected.none b/tests/correctness/datatype/int/sub/variable.expected.none new file mode 100644 index 00000000..9301bbcb --- /dev/null +++ b/tests/correctness/datatype/int/sub/variable.expected.none @@ -0,0 +1,6 @@ +evaluated(sub,(variable(two),(variable(ten),())),bad) +evaluated(sub,(variable(two),(variable(ten),())),val(none,none)) +evaluated(sub,(variable(two),(variable(ten),())),val(int,8)) +evaluated(sub,(variable(ten),(variable(two),())),bad) +evaluated(sub,(variable(ten),(variable(two),())),val(none,none)) +evaluated(sub,(variable(ten),(variable(two),())),val(int,-8)) diff --git a/tests/correctness/unit/boolean_disj_none_bug.expected.stats b/tests/correctness/datatype/int/sub/variable.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_disj_none_bug.expected.stats rename to tests/correctness/datatype/int/sub/variable.expected.stats diff --git a/tests/correctness/unit/int_sub.lp b/tests/correctness/datatype/int/sub/variable.lp similarity index 62% rename from tests/correctness/unit/int_sub.lp rename to tests/correctness/datatype/int/sub/variable.lp index 75208570..a2545665 100644 --- a/tests/correctness/unit/int_sub.lp +++ b/tests/correctness/datatype/int/sub/variable.lp @@ -1,15 +1,14 @@ phase_request(constantFolding,false). -evaluate(sub,(val(int,2),(val(int,-3),()))). -evaluate(sub,(val(int,-3),(val(int,2),()))). -evaluate(sub,(val(none,none),(val(int,2),()))). -evaluate(sub,(val(int,2),(bad,()))). - +variable_define(two,val(int,2)). +variable_define(ten,val(int,10)). variable_declare(x,fromFacts). variable_domain(x,val(int,2)). variable_domain(x,val(none,none)). variable_domain(x,bad). +evaluate(sub,(variable(two),(variable(ten),()))). +evaluate(sub,(variable(ten),(variable(two),()))). evaluate(sub,(variable(x),(val(int,3),()))). evaluate(sub,(variable(x),(val(none,none),()))). evaluate(sub,(variable(x),(bad,()))). diff --git a/tests/correctness/datatype/string/concat/bad.expected.all b/tests/correctness/datatype/string/concat/bad.expected.all new file mode 100644 index 00000000..39079ba2 --- /dev/null +++ b/tests/correctness/datatype/string/concat/bad.expected.all @@ -0,0 +1,3 @@ +evaluated(concat,(bad,(val(string,"c"),())),bad) +evaluated(concat,(val(string,"ab"),(bad,())),bad) +evaluated(concat,(bad,(bad,())),bad) diff --git a/tests/correctness/datatype/string/concat/bad.expected.stats b/tests/correctness/datatype/string/concat/bad.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/string/concat/bad.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/string/concat/bad.lp b/tests/correctness/datatype/string/concat/bad.lp new file mode 100644 index 00000000..53251c1f --- /dev/null +++ b/tests/correctness/datatype/string/concat/bad.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(concat,(bad,(val(string,"c"),()))). +evaluate(concat,(val(string,"ab"),(bad,()))). +evaluate(concat,(bad,(bad,()))). diff --git a/tests/correctness/unit/string_concat.expected.all b/tests/correctness/datatype/string/concat/basic.expected.all similarity index 56% rename from tests/correctness/unit/string_concat.expected.all rename to tests/correctness/datatype/string/concat/basic.expected.all index e2e89982..45634490 100644 --- a/tests/correctness/unit/string_concat.expected.all +++ b/tests/correctness/datatype/string/concat/basic.expected.all @@ -1,6 +1,3 @@ evaluated(concat,(val(string,"ab"),(val(string,"c"),())),val(string,"abc")) evaluated(concat,(val(string,""),(val(string,"c"),())),val(string,"c")) evaluated(concat,(val(string,"ab"),(val(string,""),())),val(string,"ab")) -evaluated(concat,(val(none,none),(val(string,"c"),())),bad) -evaluated(concat,(val(string,"ab"),(val(none,none),())),bad) -evaluated(concat,(bad,(val(string,"c"),())),bad) diff --git a/tests/correctness/unit/string_concat.expected.none b/tests/correctness/datatype/string/concat/basic.expected.none similarity index 50% rename from tests/correctness/unit/string_concat.expected.none rename to tests/correctness/datatype/string/concat/basic.expected.none index bb221698..1b85199a 100644 --- a/tests/correctness/unit/string_concat.expected.none +++ b/tests/correctness/datatype/string/concat/basic.expected.none @@ -7,12 +7,3 @@ evaluated(concat,(val(string,""),(val(string,"c"),())),bad) evaluated(concat,(val(string,"ab"),(val(string,""),())),val(string,"abc")) evaluated(concat,(val(string,"ab"),(val(string,""),())),val(string,"c")) evaluated(concat,(val(string,"ab"),(val(string,""),())),bad) -evaluated(concat,(val(none,none),(val(string,"c"),())),val(string,"abc")) -evaluated(concat,(val(none,none),(val(string,"c"),())),val(string,"c")) -evaluated(concat,(val(none,none),(val(string,"c"),())),val(string,"ab")) -evaluated(concat,(val(string,"ab"),(val(none,none),())),val(string,"abc")) -evaluated(concat,(val(string,"ab"),(val(none,none),())),val(string,"c")) -evaluated(concat,(val(string,"ab"),(val(none,none),())),val(string,"ab")) -evaluated(concat,(bad,(val(string,"c"),())),val(string,"abc")) -evaluated(concat,(bad,(val(string,"c"),())),val(string,"c")) -evaluated(concat,(bad,(val(string,"c"),())),val(string,"ab")) diff --git a/tests/correctness/datatype/string/concat/basic.expected.stats b/tests/correctness/datatype/string/concat/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/string/concat/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/string/concat/basic.lp b/tests/correctness/datatype/string/concat/basic.lp new file mode 100644 index 00000000..921e9566 --- /dev/null +++ b/tests/correctness/datatype/string/concat/basic.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(concat,(val(string,"ab"),(val(string,"c"),()))). +evaluate(concat,(val(string,""),(val(string,"c"),()))). +evaluate(concat,(val(string,"ab"),(val(string,""),()))). diff --git a/tests/correctness/datatype/string/concat/none.expected.all b/tests/correctness/datatype/string/concat/none.expected.all new file mode 100644 index 00000000..0f77bca4 --- /dev/null +++ b/tests/correctness/datatype/string/concat/none.expected.all @@ -0,0 +1,3 @@ +evaluated(concat,(val(none,none),(val(string,"c"),())),bad) +evaluated(concat,(val(string,"ab"),(val(none,none),())),bad) +evaluated(concat,(val(none,none),(val(none,none),())),bad) diff --git a/tests/correctness/datatype/string/concat/none.expected.none b/tests/correctness/datatype/string/concat/none.expected.none new file mode 100644 index 00000000..6d4ed565 --- /dev/null +++ b/tests/correctness/datatype/string/concat/none.expected.none @@ -0,0 +1,6 @@ +evaluated(concat,(val(none,none),(val(string,"c"),())),val(string,"abc")) +evaluated(concat,(val(none,none),(val(string,"c"),())),val(string,"c")) +evaluated(concat,(val(none,none),(val(string,"c"),())),val(string,"ab")) +evaluated(concat,(val(string,"ab"),(val(none,none),())),val(string,"abc")) +evaluated(concat,(val(string,"ab"),(val(none,none),())),val(string,"c")) +evaluated(concat,(val(string,"ab"),(val(none,none),())),val(string,"ab")) diff --git a/tests/correctness/datatype/string/concat/none.lp b/tests/correctness/datatype/string/concat/none.lp new file mode 100644 index 00000000..8ff1e44f --- /dev/null +++ b/tests/correctness/datatype/string/concat/none.lp @@ -0,0 +1,3 @@ +evaluate(concat,(val(none,none),(val(string,"c"),()))). +evaluate(concat,(val(string,"ab"),(val(none,none),()))). +evaluate(concat,(val(none,none),(val(none,none),()))). diff --git a/tests/correctness/unit/bad_concat.expected.any b/tests/correctness/datatype/string/concat/variable.expected.any similarity index 61% rename from tests/correctness/unit/bad_concat.expected.any rename to tests/correctness/datatype/string/concat/variable.expected.any index c02d16c2..1ef36811 100644 --- a/tests/correctness/unit/bad_concat.expected.any +++ b/tests/correctness/datatype/string/concat/variable.expected.any @@ -2,3 +2,5 @@ evaluated(concat,(variable(x),(val(string,"c"),())),val(string,"abc")) evaluated(concat,(variable(x),(val(string,"c"),())),bad) evaluated(concat,(variable(x),(val(none,none),())),bad) evaluated(concat,(variable(x),(bad,())),bad) +evaluated(concat,(val(string,"c"),(variable(y),())),val(string,"cab")) +evaluated(concat,(val(string,"c"),(variable(y),())),val(string,"cba")) diff --git a/tests/correctness/datatype/string/concat/variable.expected.none b/tests/correctness/datatype/string/concat/variable.expected.none new file mode 100644 index 00000000..f4e813ed --- /dev/null +++ b/tests/correctness/datatype/string/concat/variable.expected.none @@ -0,0 +1 @@ +evaluated(concat,(val(string,"c"),(variable(y),())),bad) diff --git a/tests/correctness/datatype/string/concat/variable.expected.stats b/tests/correctness/datatype/string/concat/variable.expected.stats new file mode 100644 index 00000000..2b7dde30 --- /dev/null +++ b/tests/correctness/datatype/string/concat/variable.expected.stats @@ -0,0 +1 @@ +models=6 diff --git a/tests/correctness/unit/bad_concat.lp b/tests/correctness/datatype/string/concat/variable.lp similarity index 66% rename from tests/correctness/unit/bad_concat.lp rename to tests/correctness/datatype/string/concat/variable.lp index e83d1a89..0289cce0 100644 --- a/tests/correctness/unit/bad_concat.lp +++ b/tests/correctness/datatype/string/concat/variable.lp @@ -1,9 +1,5 @@ phase_request(constantFolding,false). -evaluate(concat,(val(string,"ab"),(val(string,"c"),()))). -evaluate(concat,(val(none,none),(val(string,"c"),()))). -evaluate(concat,(bad,(val(string,"c"),()))). - variable_declare(x,fromFacts). variable_domain(x,val(string,"ab")). variable_domain(x,val(none,none)). @@ -11,3 +7,8 @@ variable_domain(x,bad). evaluate(concat,(variable(x),(val(string,"c"),()))). evaluate(concat,(variable(x),(val(none,none),()))). evaluate(concat,(variable(x),(bad,()))). + +variable_declare(y,fromFacts). +variable_domain(y,val(string,"ab")). +variable_domain(y,val(string,"ba")). +evaluate(concat,(val(string,"c"),(variable(y),()))). diff --git a/tests/correctness/datatype/string/length/bad.expected.all b/tests/correctness/datatype/string/length/bad.expected.all new file mode 100644 index 00000000..e57b6dab --- /dev/null +++ b/tests/correctness/datatype/string/length/bad.expected.all @@ -0,0 +1 @@ +evaluated(length,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_length.expected.any b/tests/correctness/datatype/string/length/bad.expected.any similarity index 100% rename from tests/correctness/unit/unary/bad_length.expected.any rename to tests/correctness/datatype/string/length/bad.expected.any diff --git a/tests/correctness/datatype/string/length/bad.expected.none b/tests/correctness/datatype/string/length/bad.expected.none new file mode 100644 index 00000000..c8ea8e1e --- /dev/null +++ b/tests/correctness/datatype/string/length/bad.expected.none @@ -0,0 +1,3 @@ +evaluated(length,(bad,()),val(int,0)) +evaluated(length,(bad,()),val(int,2)) +evaluated(length,(variable(x),()),val(int,0)) diff --git a/tests/correctness/datatype/string/length/bad.expected.stats b/tests/correctness/datatype/string/length/bad.expected.stats new file mode 100644 index 00000000..9e41aaf6 --- /dev/null +++ b/tests/correctness/datatype/string/length/bad.expected.stats @@ -0,0 +1 @@ +models=2 diff --git a/tests/correctness/unit/unary/bad_length.lp b/tests/correctness/datatype/string/length/bad.lp similarity index 53% rename from tests/correctness/unit/unary/bad_length.lp rename to tests/correctness/datatype/string/length/bad.lp index c767da3b..6711ca50 100644 --- a/tests/correctness/unit/unary/bad_length.lp +++ b/tests/correctness/datatype/string/length/bad.lp @@ -1,15 +1,8 @@ phase_request(constantFolding,false). -evaluate(length,(val(string,"ab"),())). -evaluate(length,(val(none,none),())). evaluate(length,(bad,())). variable_declare(x,fromFacts). variable_domain(x,val(string,"ab")). -variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(length,(variable(x),())). - -#show value/2. -%#show _se_value/2. -#show evaluated/3. diff --git a/tests/correctness/unit/unary/string_length.expected.all b/tests/correctness/datatype/string/length/basic.expected.all similarity index 57% rename from tests/correctness/unit/unary/string_length.expected.all rename to tests/correctness/datatype/string/length/basic.expected.all index d9680459..c011b562 100644 --- a/tests/correctness/unit/unary/string_length.expected.all +++ b/tests/correctness/datatype/string/length/basic.expected.all @@ -1,4 +1,2 @@ evaluated(length,(val(string,"ab"),()),val(int,2)) evaluated(length,(val(string,""),()),val(int,0)) -evaluated(length,(val(none,none),()),bad) -evaluated(length,(bad,()),bad) diff --git a/tests/correctness/datatype/string/length/basic.expected.none b/tests/correctness/datatype/string/length/basic.expected.none new file mode 100644 index 00000000..57fe1dd4 --- /dev/null +++ b/tests/correctness/datatype/string/length/basic.expected.none @@ -0,0 +1,4 @@ +evaluated(length,(val(string,"ab"),()),val(int,0)) +evaluated(length,(val(string,"ab"),()),bad) +evaluated(length,(val(string,""),()),val(int,2)) +evaluated(length,(val(string,""),()),bad) diff --git a/tests/correctness/datatype/string/length/basic.expected.stats b/tests/correctness/datatype/string/length/basic.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/string/length/basic.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/string/length/basic.lp b/tests/correctness/datatype/string/length/basic.lp new file mode 100644 index 00000000..9e87011a --- /dev/null +++ b/tests/correctness/datatype/string/length/basic.lp @@ -0,0 +1,4 @@ +phase_request(constantFolding,false). + +evaluate(length,(val(string,"ab"),())). +evaluate(length,(val(string,""),())). diff --git a/tests/correctness/datatype/string/length/none.expected.all b/tests/correctness/datatype/string/length/none.expected.all new file mode 100644 index 00000000..7ab8668e --- /dev/null +++ b/tests/correctness/datatype/string/length/none.expected.all @@ -0,0 +1 @@ +evaluated(length,(val(none,none),()),bad) diff --git a/tests/correctness/datatype/string/length/none.expected.none b/tests/correctness/datatype/string/length/none.expected.none new file mode 100644 index 00000000..932aa411 --- /dev/null +++ b/tests/correctness/datatype/string/length/none.expected.none @@ -0,0 +1 @@ +evaluated(length,(val(none,none),()),val(int,0)) diff --git a/tests/correctness/datatype/string/length/none.lp b/tests/correctness/datatype/string/length/none.lp new file mode 100644 index 00000000..1a5326ae --- /dev/null +++ b/tests/correctness/datatype/string/length/none.lp @@ -0,0 +1,3 @@ +phase_request(constantFolding,false). + +evaluate(length,(val(none,none),())). diff --git a/tests/correctness/unit/unary/string_length.expected.any b/tests/correctness/datatype/string/length/variable.expected.any similarity index 58% rename from tests/correctness/unit/unary/string_length.expected.any rename to tests/correctness/datatype/string/length/variable.expected.any index bb41cb4e..281cf47f 100644 --- a/tests/correctness/unit/unary/string_length.expected.any +++ b/tests/correctness/datatype/string/length/variable.expected.any @@ -1,3 +1,5 @@ evaluated(length,(variable(x),()),val(int,2)) evaluated(length,(variable(x),()),val(int,0)) evaluated(length,(variable(x),()),bad) +evaluated(length,(variable(y),()),val(int,3)) +evaluated(length,(variable(y),()),val(int,4)) diff --git a/tests/correctness/datatype/string/length/variable.expected.none b/tests/correctness/datatype/string/length/variable.expected.none new file mode 100644 index 00000000..7e298f19 --- /dev/null +++ b/tests/correctness/datatype/string/length/variable.expected.none @@ -0,0 +1,5 @@ +evaluated(length,(variable(x),()),val(int,3)) +evaluated(length,(variable(x),()),val(int,4)) +evaluated(length,(variable(y),()),val(int,0)) +evaluated(length,(variable(y),()),val(int,2)) +evaluated(length,(variable(y),()),bad) diff --git a/tests/correctness/datatype/string/length/variable.expected.stats b/tests/correctness/datatype/string/length/variable.expected.stats new file mode 100644 index 00000000..2b7dde30 --- /dev/null +++ b/tests/correctness/datatype/string/length/variable.expected.stats @@ -0,0 +1 @@ +models=6 diff --git a/tests/correctness/unit/unary/string_length.lp b/tests/correctness/datatype/string/length/variable.lp similarity index 53% rename from tests/correctness/unit/unary/string_length.lp rename to tests/correctness/datatype/string/length/variable.lp index 41d78eb0..0f04645e 100644 --- a/tests/correctness/unit/unary/string_length.lp +++ b/tests/correctness/datatype/string/length/variable.lp @@ -3,11 +3,10 @@ phase_request(constantFolding,false). variable_declare(x,fromFacts). variable_domain(x,val(string,"ab")). variable_domain(x,val(string,"")). -variable_domain(x,val(none,none)). variable_domain(x,bad). evaluate(length,(variable(x),())). -evaluate(length,(val(string,"ab"),())). -evaluate(length,(val(string,""),())). -evaluate(length,(val(none,none),())). -evaluate(length,(bad,())). +variable_declare(y,fromFacts). +variable_domain(y,val(string,"abc")). +variable_domain(y,val(string,"abcd")). +evaluate(length,(variable(y),())). diff --git a/tests/correctness/datatype/strings.expected.all b/tests/correctness/datatype/string/mixed.expected.all similarity index 100% rename from tests/correctness/datatype/strings.expected.all rename to tests/correctness/datatype/string/mixed.expected.all diff --git a/tests/correctness/datatype/strings.expected.any b/tests/correctness/datatype/string/mixed.expected.any similarity index 100% rename from tests/correctness/datatype/strings.expected.any rename to tests/correctness/datatype/string/mixed.expected.any diff --git a/tests/correctness/datatype/strings.lp b/tests/correctness/datatype/string/mixed.lp similarity index 100% rename from tests/correctness/datatype/strings.lp rename to tests/correctness/datatype/string/mixed.lp diff --git a/tests/correctness/datatype/string/order/bad.expected.all b/tests/correctness/datatype/string/order/bad.expected.all new file mode 100644 index 00000000..aa868f46 --- /dev/null +++ b/tests/correctness/datatype/string/order/bad.expected.all @@ -0,0 +1,4 @@ +evaluated(geq,(val(string,"aa"),(bad,())),bad) +evaluated(gt,(val(string,"aa"),(bad,())),bad) +evaluated(leq,(val(string,"aa"),(bad,())),bad) +evaluated(lt,(val(string,"aa"),(bad,())),bad) diff --git a/tests/correctness/datatype/string/order/bad.expected.none b/tests/correctness/datatype/string/order/bad.expected.none new file mode 100644 index 00000000..9179103b --- /dev/null +++ b/tests/correctness/datatype/string/order/bad.expected.none @@ -0,0 +1,8 @@ +evaluated(geq,(val(string,"aa"),(bad,())),val(bool,true)) +evaluated(geq,(val(string,"aa"),(bad,())),val(bool,false)) +evaluated(gt,(val(string,"aa"),(bad,())),val(bool,true)) +evaluated(gt,(val(string,"aa"),(bad,())),val(bool,false)) +evaluated(leq,(val(string,"aa"),(bad,())),val(bool,true)) +evaluated(leq,(val(string,"aa"),(bad,())),val(bool,false)) +evaluated(lt,(val(string,"aa"),(bad,())),val(bool,true)) +evaluated(lt,(val(string,"aa"),(bad,())),val(bool,false)) diff --git a/tests/correctness/datatype/string/order/bad.lp b/tests/correctness/datatype/string/order/bad.lp new file mode 100644 index 00000000..5ced0806 --- /dev/null +++ b/tests/correctness/datatype/string/order/bad.lp @@ -0,0 +1,6 @@ +phase_request(constantFolding,false). + +evaluate(geq,(val(string,"aa"),(bad,()))). +evaluate(gt,(val(string,"aa"),(bad,()))). +evaluate(leq,(val(string,"aa"),(bad,()))). +evaluate(lt,(val(string,"aa"),(bad,()))). diff --git a/tests/correctness/unit/string_geq.expected.all b/tests/correctness/datatype/string/order/geq.expected.all similarity index 56% rename from tests/correctness/unit/string_geq.expected.all rename to tests/correctness/datatype/string/order/geq.expected.all index ee640923..4a82e53c 100644 --- a/tests/correctness/unit/string_geq.expected.all +++ b/tests/correctness/datatype/string/order/geq.expected.all @@ -1,6 +1,3 @@ -evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),val(bool,true)) -evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),val(bool,false)) evaluated(geq,(val(string,"aa"),(val(string,"aa"),())),val(bool,true)) -evaluated(geq,(val(none,none),(val(string,"ab"),())),bad) -evaluated(geq,(val(string,"aa"),(val(none,none),())),bad) -evaluated(geq,(val(string,"aa"),(bad,())),bad) +evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),val(bool,false)) +evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),val(bool,true)) diff --git a/tests/correctness/unit/string_geq.expected.none b/tests/correctness/datatype/string/order/geq.expected.none similarity index 50% rename from tests/correctness/unit/string_geq.expected.none rename to tests/correctness/datatype/string/order/geq.expected.none index c25a14d1..53831204 100644 --- a/tests/correctness/unit/string_geq.expected.none +++ b/tests/correctness/datatype/string/order/geq.expected.none @@ -1,18 +1,9 @@ -evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),val(bool,false)) -evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),bad) -evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),val(none,none)) -evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),val(bool,true)) -evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),bad) -evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),val(none,none)) evaluated(geq,(val(string,"aa"),(val(string,"aa"),())),val(bool,false)) evaluated(geq,(val(string,"aa"),(val(string,"aa"),())),bad) evaluated(geq,(val(string,"aa"),(val(string,"aa"),())),val(none,none)) -evaluated(geq,(val(none,none),(val(string,"ab"),())),val(bool,true)) -evaluated(geq,(val(none,none),(val(string,"ab"),())),val(bool,false)) -evaluated(geq,(val(none,none),(val(string,"ab"),())),val(none,none)) -evaluated(geq,(val(string,"aa"),(val(none,none),())),val(bool,true)) -evaluated(geq,(val(string,"aa"),(val(none,none),())),val(bool,false)) -evaluated(geq,(val(string,"aa"),(val(none,none),())),val(none,none)) -evaluated(geq,(val(string,"aa"),(bad,())),val(bool,true)) -evaluated(geq,(val(string,"aa"),(bad,())),val(bool,false)) -evaluated(geq,(val(string,"aa"),(bad,())),val(none,none)) +evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),val(bool,true)) +evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),bad) +evaluated(geq,(val(string,"aa"),(val(string,"ab"),())),val(none,none)) +evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),val(bool,false)) +evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),bad) +evaluated(geq,(val(string,"ab"),(val(string,"aa"),())),val(none,none)) diff --git a/tests/correctness/datatype/string/order/geq.expected.stats b/tests/correctness/datatype/string/order/geq.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/string/order/geq.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/string/order/geq.lp b/tests/correctness/datatype/string/order/geq.lp new file mode 100644 index 00000000..e4303ceb --- /dev/null +++ b/tests/correctness/datatype/string/order/geq.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(geq,(val(string,"aa"),(val(string,"aa"),()))). +evaluate(geq,(val(string,"aa"),(val(string,"ab"),()))). +evaluate(geq,(val(string,"ab"),(val(string,"aa"),()))). diff --git a/tests/correctness/unit/string_gt.expected.all b/tests/correctness/datatype/string/order/gt.expected.all similarity index 56% rename from tests/correctness/unit/string_gt.expected.all rename to tests/correctness/datatype/string/order/gt.expected.all index 34801ba7..df479276 100644 --- a/tests/correctness/unit/string_gt.expected.all +++ b/tests/correctness/datatype/string/order/gt.expected.all @@ -1,6 +1,3 @@ -evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),val(bool,true)) -evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),val(bool,false)) evaluated(gt,(val(string,"aa"),(val(string,"aa"),())),val(bool,false)) -evaluated(gt,(val(none,none),(val(string,"ab"),())),bad) -evaluated(gt,(val(string,"aa"),(val(none,none),())),bad) -evaluated(gt,(val(string,"aa"),(bad,())),bad) +evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),val(bool,false)) +evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),val(bool,true)) diff --git a/tests/correctness/unit/string_gt.expected.none b/tests/correctness/datatype/string/order/gt.expected.none similarity index 50% rename from tests/correctness/unit/string_gt.expected.none rename to tests/correctness/datatype/string/order/gt.expected.none index 093ee68b..dd758f6b 100644 --- a/tests/correctness/unit/string_gt.expected.none +++ b/tests/correctness/datatype/string/order/gt.expected.none @@ -1,18 +1,9 @@ -evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),val(bool,false)) -evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),bad) -evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),val(none,none)) -evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),val(bool,true)) -evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),bad) -evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),val(none,none)) evaluated(gt,(val(string,"aa"),(val(string,"aa"),())),val(bool,true)) evaluated(gt,(val(string,"aa"),(val(string,"aa"),())),bad) evaluated(gt,(val(string,"aa"),(val(string,"aa"),())),val(none,none)) -evaluated(gt,(val(none,none),(val(string,"ab"),())),val(bool,true)) -evaluated(gt,(val(none,none),(val(string,"ab"),())),val(bool,false)) -evaluated(gt,(val(none,none),(val(string,"ab"),())),val(none,none)) -evaluated(gt,(val(string,"aa"),(val(none,none),())),val(bool,true)) -evaluated(gt,(val(string,"aa"),(val(none,none),())),val(bool,false)) -evaluated(gt,(val(string,"aa"),(val(none,none),())),val(none,none)) -evaluated(gt,(val(string,"aa"),(bad,())),val(bool,true)) -evaluated(gt,(val(string,"aa"),(bad,())),val(bool,false)) -evaluated(gt,(val(string,"aa"),(bad,())),val(none,none)) +evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),val(bool,true)) +evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),bad) +evaluated(gt,(val(string,"aa"),(val(string,"ab"),())),val(none,none)) +evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),val(bool,false)) +evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),bad) +evaluated(gt,(val(string,"ab"),(val(string,"aa"),())),val(none,none)) diff --git a/tests/correctness/datatype/string/order/gt.expected.stats b/tests/correctness/datatype/string/order/gt.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/string/order/gt.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/string/order/gt.lp b/tests/correctness/datatype/string/order/gt.lp new file mode 100644 index 00000000..67fb05c9 --- /dev/null +++ b/tests/correctness/datatype/string/order/gt.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(gt,(val(string,"aa"),(val(string,"aa"),()))). +evaluate(gt,(val(string,"aa"),(val(string,"ab"),()))). +evaluate(gt,(val(string,"ab"),(val(string,"aa"),()))). diff --git a/tests/correctness/unit/string_leq.expected.all b/tests/correctness/datatype/string/order/leq.expected.all similarity index 56% rename from tests/correctness/unit/string_leq.expected.all rename to tests/correctness/datatype/string/order/leq.expected.all index 22bdfa54..c21a239c 100644 --- a/tests/correctness/unit/string_leq.expected.all +++ b/tests/correctness/datatype/string/order/leq.expected.all @@ -1,6 +1,3 @@ +evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),val(bool,true)) evaluated(leq,(val(string,"aa"),(val(string,"ab"),())),val(bool,true)) evaluated(leq,(val(string,"ab"),(val(string,"aa"),())),val(bool,false)) -evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),val(bool,true)) -evaluated(leq,(val(none,none),(val(string,"ab"),())),bad) -evaluated(leq,(val(string,"aa"),(val(none,none),())),bad) -evaluated(leq,(val(string,"aa"),(bad,())),bad) diff --git a/tests/correctness/unit/string_leq.expected.none b/tests/correctness/datatype/string/order/leq.expected.none similarity index 50% rename from tests/correctness/unit/string_leq.expected.none rename to tests/correctness/datatype/string/order/leq.expected.none index e3f75cc7..76c3f9e9 100644 --- a/tests/correctness/unit/string_leq.expected.none +++ b/tests/correctness/datatype/string/order/leq.expected.none @@ -1,18 +1,9 @@ +evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),val(bool,false)) +evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),bad) +evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),val(none,none)) evaluated(leq,(val(string,"aa"),(val(string,"ab"),())),val(bool,false)) evaluated(leq,(val(string,"aa"),(val(string,"ab"),())),bad) evaluated(leq,(val(string,"aa"),(val(string,"ab"),())),val(none,none)) evaluated(leq,(val(string,"ab"),(val(string,"aa"),())),val(bool,true)) evaluated(leq,(val(string,"ab"),(val(string,"aa"),())),bad) evaluated(leq,(val(string,"ab"),(val(string,"aa"),())),val(none,none)) -evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),val(bool,false)) -evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),bad) -evaluated(leq,(val(string,"aa"),(val(string,"aa"),())),val(none,none)) -evaluated(leq,(val(none,none),(val(string,"ab"),())),val(bool,true)) -evaluated(leq,(val(none,none),(val(string,"ab"),())),val(bool,false)) -evaluated(leq,(val(none,none),(val(string,"ab"),())),val(none,none)) -evaluated(leq,(val(string,"aa"),(val(none,none),())),val(bool,true)) -evaluated(leq,(val(string,"aa"),(val(none,none),())),val(bool,false)) -evaluated(leq,(val(string,"aa"),(val(none,none),())),val(none,none)) -evaluated(leq,(val(string,"aa"),(bad,())),val(bool,true)) -evaluated(leq,(val(string,"aa"),(bad,())),val(bool,false)) -evaluated(leq,(val(string,"aa"),(bad,())),val(none,none)) diff --git a/tests/correctness/datatype/string/order/leq.expected.stats b/tests/correctness/datatype/string/order/leq.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/string/order/leq.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/string/order/leq.lp b/tests/correctness/datatype/string/order/leq.lp new file mode 100644 index 00000000..52dd05bd --- /dev/null +++ b/tests/correctness/datatype/string/order/leq.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(leq,(val(string,"aa"),(val(string,"aa"),()))). +evaluate(leq,(val(string,"aa"),(val(string,"ab"),()))). +evaluate(leq,(val(string,"ab"),(val(string,"aa"),()))). diff --git a/tests/correctness/unit/string_lt.expected.all b/tests/correctness/datatype/string/order/lt.expected.all similarity index 56% rename from tests/correctness/unit/string_lt.expected.all rename to tests/correctness/datatype/string/order/lt.expected.all index 60b8a4e7..7b7cf183 100644 --- a/tests/correctness/unit/string_lt.expected.all +++ b/tests/correctness/datatype/string/order/lt.expected.all @@ -1,6 +1,3 @@ +evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),val(bool,false)) evaluated(lt,(val(string,"aa"),(val(string,"ab"),())),val(bool,true)) evaluated(lt,(val(string,"ab"),(val(string,"aa"),())),val(bool,false)) -evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),val(bool,false)) -evaluated(lt,(val(none,none),(val(string,"ab"),())),bad) -evaluated(lt,(val(string,"aa"),(val(none,none),())),bad) -evaluated(lt,(val(string,"aa"),(bad,())),bad) diff --git a/tests/correctness/unit/string_lt.expected.none b/tests/correctness/datatype/string/order/lt.expected.none similarity index 50% rename from tests/correctness/unit/string_lt.expected.none rename to tests/correctness/datatype/string/order/lt.expected.none index ed91d72b..c89558f4 100644 --- a/tests/correctness/unit/string_lt.expected.none +++ b/tests/correctness/datatype/string/order/lt.expected.none @@ -1,18 +1,9 @@ +evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),val(bool,true)) +evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),bad) +evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),val(none,none)) evaluated(lt,(val(string,"aa"),(val(string,"ab"),())),val(bool,false)) evaluated(lt,(val(string,"aa"),(val(string,"ab"),())),bad) evaluated(lt,(val(string,"aa"),(val(string,"ab"),())),val(none,none)) evaluated(lt,(val(string,"ab"),(val(string,"aa"),())),val(bool,true)) evaluated(lt,(val(string,"ab"),(val(string,"aa"),())),bad) evaluated(lt,(val(string,"ab"),(val(string,"aa"),())),val(none,none)) -evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),val(bool,true)) -evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),bad) -evaluated(lt,(val(string,"aa"),(val(string,"aa"),())),val(none,none)) -evaluated(lt,(val(none,none),(val(string,"ab"),())),val(bool,true)) -evaluated(lt,(val(none,none),(val(string,"ab"),())),val(bool,false)) -evaluated(lt,(val(none,none),(val(string,"ab"),())),val(none,none)) -evaluated(lt,(val(string,"aa"),(val(none,none),())),val(bool,true)) -evaluated(lt,(val(string,"aa"),(val(none,none),())),val(bool,false)) -evaluated(lt,(val(string,"aa"),(val(none,none),())),val(none,none)) -evaluated(lt,(val(string,"aa"),(bad,())),val(bool,true)) -evaluated(lt,(val(string,"aa"),(bad,())),val(bool,false)) -evaluated(lt,(val(string,"aa"),(bad,())),val(none,none)) diff --git a/tests/correctness/datatype/string/order/lt.expected.stats b/tests/correctness/datatype/string/order/lt.expected.stats new file mode 100644 index 00000000..fc149c61 --- /dev/null +++ b/tests/correctness/datatype/string/order/lt.expected.stats @@ -0,0 +1 @@ +models=1 diff --git a/tests/correctness/datatype/string/order/lt.lp b/tests/correctness/datatype/string/order/lt.lp new file mode 100644 index 00000000..d9a491d4 --- /dev/null +++ b/tests/correctness/datatype/string/order/lt.lp @@ -0,0 +1,5 @@ +phase_request(constantFolding,false). + +evaluate(lt,(val(string,"aa"),(val(string,"aa"),()))). +evaluate(lt,(val(string,"aa"),(val(string,"ab"),()))). +evaluate(lt,(val(string,"ab"),(val(string,"aa"),()))). diff --git a/tests/correctness/datatype/string/order/none.expected.all b/tests/correctness/datatype/string/order/none.expected.all new file mode 100644 index 00000000..dd8927c4 --- /dev/null +++ b/tests/correctness/datatype/string/order/none.expected.all @@ -0,0 +1,8 @@ +evaluated(geq,(val(none,none),(val(string,"ab"),())),bad) +evaluated(geq,(val(string,"aa"),(val(none,none),())),bad) +evaluated(gt,(val(none,none),(val(string,"ab"),())),bad) +evaluated(gt,(val(string,"aa"),(val(none,none),())),bad) +evaluated(leq,(val(none,none),(val(string,"ab"),())),bad) +evaluated(leq,(val(string,"aa"),(val(none,none),())),bad) +evaluated(lt,(val(none,none),(val(string,"ab"),())),bad) +evaluated(lt,(val(string,"aa"),(val(none,none),())),bad) diff --git a/tests/correctness/datatype/string/order/none.expected.none b/tests/correctness/datatype/string/order/none.expected.none new file mode 100644 index 00000000..c7d8ec9d --- /dev/null +++ b/tests/correctness/datatype/string/order/none.expected.none @@ -0,0 +1,16 @@ +evaluated(geq,(val(none,none),(val(string,"ab"),())),val(bool,false)) +evaluated(geq,(val(none,none),(val(string,"ab"),())),val(bool,true)) +evaluated(geq,(val(string,"aa"),(val(none,none),())),val(bool,false)) +evaluated(geq,(val(string,"aa"),(val(none,none),())),val(bool,true)) +evaluated(gt,(val(none,none),(val(string,"ab"),())),val(bool,true)) +evaluated(gt,(val(none,none),(val(string,"ab"),())),val(bool,false)) +evaluated(gt,(val(string,"aa"),(val(none,none),())),val(bool,true)) +evaluated(gt,(val(string,"aa"),(val(none,none),())),val(bool,false)) +evaluated(leq,(val(none,none),(val(string,"ab"),())),val(bool,false)) +evaluated(leq,(val(string,"aa"),(val(none,none),())),val(bool,false)) +evaluated(leq,(val(none,none),(val(string,"ab"),())),val(bool,true)) +evaluated(leq,(val(string,"aa"),(val(none,none),())),val(bool,true)) +evaluated(lt,(val(none,none),(val(string,"ab"),())),val(bool,false)) +evaluated(lt,(val(none,none),(val(string,"ab"),())),val(bool,true)) +evaluated(lt,(val(string,"aa"),(val(none,none),())),val(bool,false)) +evaluated(lt,(val(string,"aa"),(val(none,none),())),val(bool,true)) diff --git a/tests/correctness/datatype/string/order/none.lp b/tests/correctness/datatype/string/order/none.lp new file mode 100644 index 00000000..8ae4f2bc --- /dev/null +++ b/tests/correctness/datatype/string/order/none.lp @@ -0,0 +1,8 @@ +evaluate(geq,(val(none,none),(val(string,"ab"),()))). +evaluate(geq,(val(string,"aa"),(val(none,none),()))). +evaluate(gt,(val(none,none),(val(string,"ab"),()))). +evaluate(gt,(val(string,"aa"),(val(none,none),()))). +evaluate(leq,(val(none,none),(val(string,"ab"),()))). +evaluate(leq,(val(string,"aa"),(val(none,none),()))). +evaluate(lt,(val(none,none),(val(string,"ab"),()))). +evaluate(lt,(val(string,"aa"),(val(none,none),()))). diff --git a/tests/correctness/datatype/string/order/variable.expected.all b/tests/correctness/datatype/string/order/variable.expected.all new file mode 100644 index 00000000..76f46929 --- /dev/null +++ b/tests/correctness/datatype/string/order/variable.expected.all @@ -0,0 +1,4 @@ +evaluated(geq,(variable(x),(bad,())),bad) +evaluated(gt,(variable(x),(bad,())),bad) +evaluated(leq,(variable(x),(bad,())),bad) +evaluated(gt,(variable(x),(bad,())),bad) diff --git a/tests/correctness/datatype/string/order/variable.expected.any b/tests/correctness/datatype/string/order/variable.expected.any new file mode 100644 index 00000000..fed63b21 --- /dev/null +++ b/tests/correctness/datatype/string/order/variable.expected.any @@ -0,0 +1,24 @@ +evaluated(geq,(variable(x),(val(string,"aa"),())),val(bool,true)) +evaluated(geq,(variable(x),(val(string,"ab"),())),val(bool,true)) +evaluated(geq,(variable(x),(val(string,"za"),())),val(bool,false)) +evaluated(gt,(variable(x),(val(string,"aa"),())),val(bool,true)) +evaluated(gt,(variable(x),(val(string,"ab"),())),val(bool,false)) +evaluated(gt,(variable(x),(val(string,"za"),())),val(bool,false)) +evaluated(leq,(variable(x),(val(string,"aa"),())),val(bool,false)) +evaluated(leq,(variable(x),(val(string,"ab"),())),val(bool,true)) +evaluated(leq,(variable(x),(val(string,"za"),())),val(bool,true)) +evaluated(lt,(variable(x),(val(string,"aa"),())),val(bool,false)) +evaluated(lt,(variable(x),(val(string,"ab"),())),val(bool,false)) +evaluated(lt,(variable(x),(val(string,"za"),())),val(bool,true)) +evaluated(geq,(variable(x),(val(string,"aa"),())),bad) +evaluated(gt,(variable(x),(val(string,"aa"),())),bad) +evaluated(leq,(variable(x),(val(string,"aa"),())),bad) +evaluated(lt,(variable(x),(val(string,"aa"),())),bad) +evaluated(geq,(variable(x),(val(string,"ab"),())),bad) +evaluated(gt,(variable(x),(val(string,"ab"),())),bad) +evaluated(leq,(variable(x),(val(string,"ab"),())),bad) +evaluated(lt,(variable(x),(val(string,"ab"),())),bad) +evaluated(geq,(variable(x),(val(string,"za"),())),bad) +evaluated(gt,(variable(x),(val(string,"za"),())),bad) +evaluated(leq,(variable(x),(val(string,"za"),())),bad) +evaluated(lt,(variable(x),(val(string,"za"),())),bad) diff --git a/tests/correctness/datatype/string/order/variable.expected.stats b/tests/correctness/datatype/string/order/variable.expected.stats new file mode 100644 index 00000000..9e41aaf6 --- /dev/null +++ b/tests/correctness/datatype/string/order/variable.expected.stats @@ -0,0 +1 @@ +models=2 diff --git a/tests/correctness/datatype/string/order/variable.lp b/tests/correctness/datatype/string/order/variable.lp new file mode 100644 index 00000000..73a06194 --- /dev/null +++ b/tests/correctness/datatype/string/order/variable.lp @@ -0,0 +1,21 @@ +phase_request(constantFolding,false). + +variable_declare(x,fromFacts). +variable_domain(x,val(string,"ab")). +variable_domain(x,bad). +evaluate(geq,(variable(x),(val(string,"aa"),()))). +evaluate(geq,(variable(x),(val(string,"ab"),()))). +evaluate(geq,(variable(x),(val(string,"za"),()))). +evaluate(geq,(variable(x),(bad,()))). +evaluate(gt,(variable(x),(val(string,"aa"),()))). +evaluate(gt,(variable(x),(val(string,"ab"),()))). +evaluate(gt,(variable(x),(val(string,"za"),()))). +evaluate(gt,(variable(x),(bad,()))). +evaluate(leq,(variable(x),(val(string,"aa"),()))). +evaluate(leq,(variable(x),(val(string,"ab"),()))). +evaluate(leq,(variable(x),(val(string,"za"),()))). +evaluate(leq,(variable(x),(bad,()))). +evaluate(lt,(variable(x),(val(string,"aa"),()))). +evaluate(lt,(variable(x),(val(string,"ab"),()))). +evaluate(lt,(variable(x),(val(string,"za"),()))). +evaluate(lt,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/bad_eq.expected.all b/tests/correctness/unit/bad/bad_eq.expected.all similarity index 100% rename from tests/correctness/unit/bad_eq.expected.all rename to tests/correctness/unit/bad/bad_eq.expected.all diff --git a/tests/correctness/unit/bad_eq.expected.any b/tests/correctness/unit/bad/bad_eq.expected.any similarity index 100% rename from tests/correctness/unit/bad_eq.expected.any rename to tests/correctness/unit/bad/bad_eq.expected.any diff --git a/tests/correctness/unit/bad_eq.expected.none b/tests/correctness/unit/bad/bad_eq.expected.none similarity index 100% rename from tests/correctness/unit/bad_eq.expected.none rename to tests/correctness/unit/bad/bad_eq.expected.none diff --git a/tests/correctness/unit/bad_leqv.expected.stats b/tests/correctness/unit/bad/bad_eq.expected.stats similarity index 100% rename from tests/correctness/unit/bad_leqv.expected.stats rename to tests/correctness/unit/bad/bad_eq.expected.stats diff --git a/tests/correctness/unit/bad_eq.lp b/tests/correctness/unit/bad/bad_eq.lp similarity index 100% rename from tests/correctness/unit/bad_eq.lp rename to tests/correctness/unit/bad/bad_eq.lp diff --git a/tests/correctness/unit/bad_float_div.expected.all b/tests/correctness/unit/bad/bad_float_div.expected.all similarity index 100% rename from tests/correctness/unit/bad_float_div.expected.all rename to tests/correctness/unit/bad/bad_float_div.expected.all diff --git a/tests/correctness/unit/bad_float_div.expected.any b/tests/correctness/unit/bad/bad_float_div.expected.any similarity index 100% rename from tests/correctness/unit/bad_float_div.expected.any rename to tests/correctness/unit/bad/bad_float_div.expected.any diff --git a/tests/correctness/unit/bad_float_div.expected.none b/tests/correctness/unit/bad/bad_float_div.expected.none similarity index 100% rename from tests/correctness/unit/bad_float_div.expected.none rename to tests/correctness/unit/bad/bad_float_div.expected.none diff --git a/tests/correctness/unit/boolean_if.expected.stats b/tests/correctness/unit/bad/bad_float_div.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_if.expected.stats rename to tests/correctness/unit/bad/bad_float_div.expected.stats diff --git a/tests/correctness/unit/bad_float_div.lp b/tests/correctness/unit/bad/bad_float_div.lp similarity index 100% rename from tests/correctness/unit/bad_float_div.lp rename to tests/correctness/unit/bad/bad_float_div.lp diff --git a/tests/correctness/unit/bad_geq.expected.all b/tests/correctness/unit/bad/bad_geq.expected.all similarity index 100% rename from tests/correctness/unit/bad_geq.expected.all rename to tests/correctness/unit/bad/bad_geq.expected.all diff --git a/tests/correctness/unit/bad_geq.expected.any b/tests/correctness/unit/bad/bad_geq.expected.any similarity index 100% rename from tests/correctness/unit/bad_geq.expected.any rename to tests/correctness/unit/bad/bad_geq.expected.any diff --git a/tests/correctness/unit/bad_geq.expected.none b/tests/correctness/unit/bad/bad_geq.expected.none similarity index 100% rename from tests/correctness/unit/bad_geq.expected.none rename to tests/correctness/unit/bad/bad_geq.expected.none diff --git a/tests/correctness/unit/bad_lt.expected.stats b/tests/correctness/unit/bad/bad_geq.expected.stats similarity index 100% rename from tests/correctness/unit/bad_lt.expected.stats rename to tests/correctness/unit/bad/bad_geq.expected.stats diff --git a/tests/correctness/unit/bad_geq.lp b/tests/correctness/unit/bad/bad_geq.lp similarity index 100% rename from tests/correctness/unit/bad_geq.lp rename to tests/correctness/unit/bad/bad_geq.lp diff --git a/tests/correctness/unit/bad_gt.expected.all b/tests/correctness/unit/bad/bad_gt.expected.all similarity index 100% rename from tests/correctness/unit/bad_gt.expected.all rename to tests/correctness/unit/bad/bad_gt.expected.all diff --git a/tests/correctness/unit/bad_gt.expected.any b/tests/correctness/unit/bad/bad_gt.expected.any similarity index 100% rename from tests/correctness/unit/bad_gt.expected.any rename to tests/correctness/unit/bad/bad_gt.expected.any diff --git a/tests/correctness/unit/bad_gt.expected.none b/tests/correctness/unit/bad/bad_gt.expected.none similarity index 100% rename from tests/correctness/unit/bad_gt.expected.none rename to tests/correctness/unit/bad/bad_gt.expected.none diff --git a/tests/correctness/unit/bad_lxor.expected.stats b/tests/correctness/unit/bad/bad_gt.expected.stats similarity index 100% rename from tests/correctness/unit/bad_lxor.expected.stats rename to tests/correctness/unit/bad/bad_gt.expected.stats diff --git a/tests/correctness/unit/bad_gt.lp b/tests/correctness/unit/bad/bad_gt.lp similarity index 100% rename from tests/correctness/unit/bad_gt.lp rename to tests/correctness/unit/bad/bad_gt.lp diff --git a/tests/correctness/unit/bad_int_div.expected.all b/tests/correctness/unit/bad/bad_int_div.expected.all similarity index 100% rename from tests/correctness/unit/bad_int_div.expected.all rename to tests/correctness/unit/bad/bad_int_div.expected.all diff --git a/tests/correctness/unit/bad_int_div.expected.any b/tests/correctness/unit/bad/bad_int_div.expected.any similarity index 100% rename from tests/correctness/unit/bad_int_div.expected.any rename to tests/correctness/unit/bad/bad_int_div.expected.any diff --git a/tests/correctness/unit/bad_int_div.expected.none b/tests/correctness/unit/bad/bad_int_div.expected.none similarity index 100% rename from tests/correctness/unit/bad_int_div.expected.none rename to tests/correctness/unit/bad/bad_int_div.expected.none diff --git a/tests/correctness/unit/boolean_ite.expected.stats b/tests/correctness/unit/bad/bad_int_div.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_ite.expected.stats rename to tests/correctness/unit/bad/bad_int_div.expected.stats diff --git a/tests/correctness/unit/bad_int_div.lp b/tests/correctness/unit/bad/bad_int_div.lp similarity index 100% rename from tests/correctness/unit/bad_int_div.lp rename to tests/correctness/unit/bad/bad_int_div.lp diff --git a/tests/correctness/unit/bad_leq.expected.all b/tests/correctness/unit/bad/bad_leq.expected.all similarity index 100% rename from tests/correctness/unit/bad_leq.expected.all rename to tests/correctness/unit/bad/bad_leq.expected.all diff --git a/tests/correctness/unit/bad_leq.expected.any b/tests/correctness/unit/bad/bad_leq.expected.any similarity index 100% rename from tests/correctness/unit/bad_leq.expected.any rename to tests/correctness/unit/bad/bad_leq.expected.any diff --git a/tests/correctness/unit/bad_leq.expected.none b/tests/correctness/unit/bad/bad_leq.expected.none similarity index 100% rename from tests/correctness/unit/bad_leq.expected.none rename to tests/correctness/unit/bad/bad_leq.expected.none diff --git a/tests/correctness/unit/bad_neq.expected.stats b/tests/correctness/unit/bad/bad_leq.expected.stats similarity index 100% rename from tests/correctness/unit/bad_neq.expected.stats rename to tests/correctness/unit/bad/bad_leq.expected.stats diff --git a/tests/correctness/unit/bad_leq.lp b/tests/correctness/unit/bad/bad_leq.lp similarity index 100% rename from tests/correctness/unit/bad_leq.lp rename to tests/correctness/unit/bad/bad_leq.lp diff --git a/tests/correctness/unit/bad_lt.expected.all b/tests/correctness/unit/bad/bad_lt.expected.all similarity index 100% rename from tests/correctness/unit/bad_lt.expected.all rename to tests/correctness/unit/bad/bad_lt.expected.all diff --git a/tests/correctness/unit/bad_lt.expected.any b/tests/correctness/unit/bad/bad_lt.expected.any similarity index 100% rename from tests/correctness/unit/bad_lt.expected.any rename to tests/correctness/unit/bad/bad_lt.expected.any diff --git a/tests/correctness/unit/bad_lt.expected.none b/tests/correctness/unit/bad/bad_lt.expected.none similarity index 100% rename from tests/correctness/unit/bad_lt.expected.none rename to tests/correctness/unit/bad/bad_lt.expected.none diff --git a/tests/correctness/unit/unary/bad_leqv.expected.stats b/tests/correctness/unit/bad/bad_lt.expected.stats similarity index 100% rename from tests/correctness/unit/unary/bad_leqv.expected.stats rename to tests/correctness/unit/bad/bad_lt.expected.stats diff --git a/tests/correctness/unit/bad_lt.lp b/tests/correctness/unit/bad/bad_lt.lp similarity index 100% rename from tests/correctness/unit/bad_lt.lp rename to tests/correctness/unit/bad/bad_lt.lp diff --git a/tests/correctness/unit/bad_max.expected.all b/tests/correctness/unit/bad/bad_max.expected.all similarity index 100% rename from tests/correctness/unit/bad_max.expected.all rename to tests/correctness/unit/bad/bad_max.expected.all diff --git a/tests/correctness/unit/bad_max.expected.any b/tests/correctness/unit/bad/bad_max.expected.any similarity index 100% rename from tests/correctness/unit/bad_max.expected.any rename to tests/correctness/unit/bad/bad_max.expected.any diff --git a/tests/correctness/unit/bad_max.expected.none b/tests/correctness/unit/bad/bad_max.expected.none similarity index 100% rename from tests/correctness/unit/bad_max.expected.none rename to tests/correctness/unit/bad/bad_max.expected.none diff --git a/tests/correctness/unit/boolean_leqv.expected.stats b/tests/correctness/unit/bad/bad_max.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_leqv.expected.stats rename to tests/correctness/unit/bad/bad_max.expected.stats diff --git a/tests/correctness/unit/bad_max.lp b/tests/correctness/unit/bad/bad_max.lp similarity index 100% rename from tests/correctness/unit/bad_max.lp rename to tests/correctness/unit/bad/bad_max.lp diff --git a/tests/correctness/unit/bad_min.expected.all b/tests/correctness/unit/bad/bad_min.expected.all similarity index 100% rename from tests/correctness/unit/bad_min.expected.all rename to tests/correctness/unit/bad/bad_min.expected.all diff --git a/tests/correctness/unit/bad_min.expected.any b/tests/correctness/unit/bad/bad_min.expected.any similarity index 100% rename from tests/correctness/unit/bad_min.expected.any rename to tests/correctness/unit/bad/bad_min.expected.any diff --git a/tests/correctness/unit/bad_min.expected.none b/tests/correctness/unit/bad/bad_min.expected.none similarity index 100% rename from tests/correctness/unit/bad_min.expected.none rename to tests/correctness/unit/bad/bad_min.expected.none diff --git a/tests/correctness/unit/boolean_leqv_none_bug.expected.stats b/tests/correctness/unit/bad/bad_min.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_leqv_none_bug.expected.stats rename to tests/correctness/unit/bad/bad_min.expected.stats diff --git a/tests/correctness/unit/bad_min.lp b/tests/correctness/unit/bad/bad_min.lp similarity index 100% rename from tests/correctness/unit/bad_min.lp rename to tests/correctness/unit/bad/bad_min.lp diff --git a/tests/correctness/unit/boolean_limp.expected.stats b/tests/correctness/unit/bad/bad_mult.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_limp.expected.stats rename to tests/correctness/unit/bad/bad_mult.expected.stats diff --git a/tests/correctness/unit/bad_neq.expected.all b/tests/correctness/unit/bad/bad_neq.expected.all similarity index 100% rename from tests/correctness/unit/bad_neq.expected.all rename to tests/correctness/unit/bad/bad_neq.expected.all diff --git a/tests/correctness/unit/bad_neq.expected.any b/tests/correctness/unit/bad/bad_neq.expected.any similarity index 100% rename from tests/correctness/unit/bad_neq.expected.any rename to tests/correctness/unit/bad/bad_neq.expected.any diff --git a/tests/correctness/unit/bad_neq.expected.none b/tests/correctness/unit/bad/bad_neq.expected.none similarity index 100% rename from tests/correctness/unit/bad_neq.expected.none rename to tests/correctness/unit/bad/bad_neq.expected.none diff --git a/tests/correctness/unit/unary/bad_lnot.expected.stats b/tests/correctness/unit/bad/bad_neq.expected.stats similarity index 100% rename from tests/correctness/unit/unary/bad_lnot.expected.stats rename to tests/correctness/unit/bad/bad_neq.expected.stats diff --git a/tests/correctness/unit/bad_neq.lp b/tests/correctness/unit/bad/bad_neq.lp similarity index 100% rename from tests/correctness/unit/bad_neq.lp rename to tests/correctness/unit/bad/bad_neq.lp diff --git a/tests/correctness/unit/bad_add.expected.all b/tests/correctness/unit/bad_add.expected.all deleted file mode 100644 index f7f2f34f..00000000 --- a/tests/correctness/unit/bad_add.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(add,(val(int,1),(val(int,2),())),val(int,3)) -evaluated(add,(variable(x),(val(none,none),())),bad) -evaluated(add,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_add.expected.any b/tests/correctness/unit/bad_add.expected.any deleted file mode 100644 index 9d1c2f67..00000000 --- a/tests/correctness/unit/bad_add.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(add,(variable(x),(val(int,2),())),val(int,3)) -evaluated(add,(variable(x),(val(int,2),())),bad) -evaluated(add,(variable(x),(val(none,none),())),bad) -evaluated(add,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_add.expected.none b/tests/correctness/unit/bad_add.expected.none deleted file mode 100644 index 8fd420ba..00000000 --- a/tests/correctness/unit/bad_add.expected.none +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(add,(val(int,1),(val(int,2),())),bad) -evaluated(add,(val(int,1),(val(int,2),())),val(none,none)) diff --git a/tests/correctness/unit/bad_concat.expected.all b/tests/correctness/unit/bad_concat.expected.all deleted file mode 100644 index f19e7fa6..00000000 --- a/tests/correctness/unit/bad_concat.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(concat,(val(string,"ab"),(val(string,"c"),())),val(string,"abc")) -evaluated(concat,(val(none,none),(val(string,"c"),())),bad) -evaluated(concat,(bad,(val(string,"c"),())),bad) -evaluated(concat,(variable(x),(val(none,none),())),bad) -evaluated(concat,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_concat.expected.none b/tests/correctness/unit/bad_concat.expected.none deleted file mode 100644 index c0dabd31..00000000 --- a/tests/correctness/unit/bad_concat.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(concat,(val(string,"ab"),(val(string,"c"),())),bad) -evaluated(concat,(val(string,"ab"),(val(string,"c"),())),val(none,none)) -evaluated(concat,(val(none,none),(val(string,"c"),())),val(string,"abc")) -evaluated(concat,(val(none,none),(val(string,"c"),())),val(none,none)) -evaluated(concat,(bad,(val(string,"c"),())),val(string,"abc")) -evaluated(concat,(bad,(val(string,"c"),())),val(none,none)) diff --git a/tests/correctness/unit/bad_leqv.expected.all b/tests/correctness/unit/bad_leqv.expected.all deleted file mode 100644 index 8e8bf61f..00000000 --- a/tests/correctness/unit/bad_leqv.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(leqv,(val(bool,false),(val(none,none),())),bad) -evaluated(leqv,(val(bool,true),(val(bool,false),())),val(bool,false)) -evaluated(leqv,(val(bool,true),(bad,())),bad) -evaluated(leqv,(variable(x),(val(none,none),())),bad) -evaluated(leqv,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_leqv.expected.any b/tests/correctness/unit/bad_leqv.expected.any deleted file mode 100644 index ac32d75c..00000000 --- a/tests/correctness/unit/bad_leqv.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(leqv,(variable(x),(val(bool,false),())),val(bool,true)) -evaluated(leqv,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(leqv,(variable(x),(val(bool,false),())),bad) diff --git a/tests/correctness/unit/bad_leqv.expected.none b/tests/correctness/unit/bad_leqv.expected.none deleted file mode 100644 index 2c6ffa6e..00000000 --- a/tests/correctness/unit/bad_leqv.expected.none +++ /dev/null @@ -1,9 +0,0 @@ -evaluated(leqv,(val(bool,false),(val(none,none),())),val(bool,true)) -evaluated(leqv,(val(bool,false),(val(none,none),())),val(bool,false)) -evaluated(leqv,(val(bool,false),(val(none,none),())),val(none,none)) -evaluated(leqv,(val(bool,true),(val(bool,false),())),val(bool,true)) -evaluated(leqv,(val(bool,true),(val(bool,false),())),val(none,none)) -evaluated(leqv,(val(bool,true),(val(bool,false),())),bad) -evaluated(leqv,(val(bool,true),(bad,())),val(bool,true)) -evaluated(leqv,(val(bool,true),(bad,())),val(bool,false)) -evaluated(leqv,(val(bool,true),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/bad_leqv.lp b/tests/correctness/unit/bad_leqv.lp deleted file mode 100644 index d829c3eb..00000000 --- a/tests/correctness/unit/bad_leqv.lp +++ /dev/null @@ -1,14 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(leqv,(val(bool,false),(val(none,none),()))). -evaluate(leqv,(val(bool,true),(val(bool,false),()))). -evaluate(leqv,(val(bool,true),(bad,()))). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(leqv,(variable(x),(val(bool,false),()))). -evaluate(leqv,(variable(x),(val(none,none),()))). -evaluate(leqv,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/bad_lxor.expected.all b/tests/correctness/unit/bad_lxor.expected.all deleted file mode 100644 index 8a52b2f2..00000000 --- a/tests/correctness/unit/bad_lxor.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(lxor,(val(bool,false),(val(none,none),())),bad) -evaluated(lxor,(val(bool,true),(val(bool,false),())),val(bool,true)) -evaluated(lxor,(val(bool,true),(bad,())),bad) -evaluated(lxor,(variable(x),(val(none,none),())),bad) -evaluated(lxor,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_lxor.expected.any b/tests/correctness/unit/bad_lxor.expected.any deleted file mode 100644 index ad5e7727..00000000 --- a/tests/correctness/unit/bad_lxor.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,true)) -evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(lxor,(variable(x),(val(bool,false),())),bad) diff --git a/tests/correctness/unit/bad_lxor.expected.none b/tests/correctness/unit/bad_lxor.expected.none deleted file mode 100644 index 07faca79..00000000 --- a/tests/correctness/unit/bad_lxor.expected.none +++ /dev/null @@ -1,8 +0,0 @@ -evaluated(lxor,(val(bool,false),(val(none,none),())),val(bool,true)) -evaluated(lxor,(val(bool,false),(val(none,none),())),val(none,none)) -evaluated(lxor,(val(bool,true),(val(bool,false),())),val(bool,false)) -evaluated(lxor,(val(bool,true),(val(bool,false),())),val(none,none)) -evaluated(lxor,(val(bool,true),(val(bool,false),())),bad) -evaluated(lxor,(val(bool,true),(bad,())),val(bool,true)) -evaluated(lxor,(val(bool,true),(bad,())),val(bool,false)) -evaluated(lxor,(val(bool,true),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/bad_mult.expected.all b/tests/correctness/unit/bad_mult.expected.all deleted file mode 100644 index 4ae55a65..00000000 --- a/tests/correctness/unit/bad_mult.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(mult,(val(int,2),(val(int,3),())),val(int,6)) -evaluated(mult,(val(int,2),(val(none,none),())),bad) -evaluated(mult,(val(int,2),(bad,())),bad) -evaluated(mult,(variable(x),(val(none,none),())),bad) -evaluated(mult,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_mult.expected.none b/tests/correctness/unit/bad_mult.expected.none deleted file mode 100644 index 2580b813..00000000 --- a/tests/correctness/unit/bad_mult.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(mult,(val(int,2),(val(int,3),())),bad) -evaluated(mult,(val(int,2),(val(int,3),())),val(none,none)) -evaluated(mult,(val(int,2),(val(none,none),())),val(int,6)) -evaluated(mult,(val(int,2),(val(none,none),())),val(none,none)) -evaluated(mult,(val(int,2),(bad,())),val(int,6)) -evaluated(mult,(val(int,2),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/bad_sub.expected.all b/tests/correctness/unit/bad_sub.expected.all deleted file mode 100644 index 42ac2cc1..00000000 --- a/tests/correctness/unit/bad_sub.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(sub,(val(int,3),(val(int,2),())),val(int,1)) -evaluated(sub,(val(int,3),(val(none,none),())),bad) -evaluated(sub,(val(int,3),(bad,())),bad) -evaluated(sub,(variable(x),(val(none,none),())),bad) -evaluated(sub,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_sub.expected.any b/tests/correctness/unit/bad_sub.expected.any deleted file mode 100644 index 39d870f9..00000000 --- a/tests/correctness/unit/bad_sub.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(sub,(variable(x),(val(int,2),())),val(int,1)) -evaluated(sub,(variable(x),(val(int,2),())),bad) -evaluated(sub,(variable(x),(val(none,none),())),bad) -evaluated(sub,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/bad_sub.expected.none b/tests/correctness/unit/bad_sub.expected.none deleted file mode 100644 index b7e83d0d..00000000 --- a/tests/correctness/unit/bad_sub.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(sub,(val(int,3),(val(int,2),())),bad) -evaluated(sub,(val(int,3),(val(int,2),())),val(none,none)) -evaluated(sub,(val(int,3),(val(none,none),())),val(int,1)) -evaluated(sub,(val(int,3),(val(none,none),())),val(none,none)) -evaluated(sub,(val(int,3),(bad,())),val(int,1)) -evaluated(sub,(val(int,3),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/bad_sub.lp b/tests/correctness/unit/bad_sub.lp deleted file mode 100644 index f6dfb65b..00000000 --- a/tests/correctness/unit/bad_sub.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(sub,(val(int,3),(val(int,2),()))). -evaluate(sub,(val(int,3),(val(none,none),()))). -evaluate(sub,(val(int,3),(bad,()))). - -variable_declare(x,fromFacts). -variable_domain(x,val(int,3)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(sub,(variable(x),(val(int,2),()))). -evaluate(sub,(variable(x),(val(none,none),()))). -evaluate(sub,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/boolean_ite.expected.all b/tests/correctness/unit/boolean/boolean_ite.expected.all similarity index 100% rename from tests/correctness/unit/boolean_ite.expected.all rename to tests/correctness/unit/boolean/boolean_ite.expected.all diff --git a/tests/correctness/unit/boolean_ite.expected.any b/tests/correctness/unit/boolean/boolean_ite.expected.any similarity index 100% rename from tests/correctness/unit/boolean_ite.expected.any rename to tests/correctness/unit/boolean/boolean_ite.expected.any diff --git a/tests/correctness/unit/boolean_ite.expected.none b/tests/correctness/unit/boolean/boolean_ite.expected.none similarity index 100% rename from tests/correctness/unit/boolean_ite.expected.none rename to tests/correctness/unit/boolean/boolean_ite.expected.none diff --git a/tests/correctness/unit/boolean_limp_none_bug.expected.stats b/tests/correctness/unit/boolean/boolean_ite.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_limp_none_bug.expected.stats rename to tests/correctness/unit/boolean/boolean_ite.expected.stats diff --git a/tests/correctness/unit/boolean_ite.lp b/tests/correctness/unit/boolean/boolean_ite.lp similarity index 100% rename from tests/correctness/unit/boolean_ite.lp rename to tests/correctness/unit/boolean/boolean_ite.lp diff --git a/tests/correctness/unit/boolean_limp.expected.all b/tests/correctness/unit/boolean/boolean_limp.expected.all similarity index 100% rename from tests/correctness/unit/boolean_limp.expected.all rename to tests/correctness/unit/boolean/boolean_limp.expected.all diff --git a/tests/correctness/unit/boolean_limp.expected.any b/tests/correctness/unit/boolean/boolean_limp.expected.any similarity index 100% rename from tests/correctness/unit/boolean_limp.expected.any rename to tests/correctness/unit/boolean/boolean_limp.expected.any diff --git a/tests/correctness/unit/boolean_limp.expected.none b/tests/correctness/unit/boolean/boolean_limp.expected.none similarity index 100% rename from tests/correctness/unit/boolean_limp.expected.none rename to tests/correctness/unit/boolean/boolean_limp.expected.none diff --git a/tests/correctness/unit/boolean_lxor.expected.stats b/tests/correctness/unit/boolean/boolean_limp.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_lxor.expected.stats rename to tests/correctness/unit/boolean/boolean_limp.expected.stats diff --git a/tests/correctness/unit/boolean_limp.lp b/tests/correctness/unit/boolean/boolean_limp.lp similarity index 100% rename from tests/correctness/unit/boolean_limp.lp rename to tests/correctness/unit/boolean/boolean_limp.lp diff --git a/tests/correctness/unit/boolean_limp_none_bug.expected.all b/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.all similarity index 100% rename from tests/correctness/unit/boolean_limp_none_bug.expected.all rename to tests/correctness/unit/boolean/boolean_limp_none_bug.expected.all diff --git a/tests/correctness/unit/boolean_limp_none_bug.expected.any b/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.any similarity index 100% rename from tests/correctness/unit/boolean_limp_none_bug.expected.any rename to tests/correctness/unit/boolean/boolean_limp_none_bug.expected.any diff --git a/tests/correctness/unit/boolean_limp_none_bug.expected.none b/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.none similarity index 100% rename from tests/correctness/unit/boolean_limp_none_bug.expected.none rename to tests/correctness/unit/boolean/boolean_limp_none_bug.expected.none diff --git a/tests/correctness/unit/boolean_lxor_none_bug.expected.stats b/tests/correctness/unit/boolean/boolean_limp_none_bug.expected.stats similarity index 100% rename from tests/correctness/unit/boolean_lxor_none_bug.expected.stats rename to tests/correctness/unit/boolean/boolean_limp_none_bug.expected.stats diff --git a/tests/correctness/unit/boolean_limp_none_bug.lp b/tests/correctness/unit/boolean/boolean_limp_none_bug.lp similarity index 100% rename from tests/correctness/unit/boolean_limp_none_bug.lp rename to tests/correctness/unit/boolean/boolean_limp_none_bug.lp diff --git a/tests/correctness/unit/boolean_conj.expected.all b/tests/correctness/unit/boolean_conj.expected.all deleted file mode 100644 index cab8c5ad..00000000 --- a/tests/correctness/unit/boolean_conj.expected.all +++ /dev/null @@ -1,9 +0,0 @@ -evaluated(conj,(val(bool,true),(val(bool,true),())),val(bool,true)) -evaluated(conj,(val(none,none),(val(bool,true),())),val(none,none)) -evaluated(conj,(val(bool,true),(val(none,none),())),val(none,none)) -evaluated(conj,(val(bool,false),(val(bool,true),())),val(bool,false)) -evaluated(conj,(val(bool,false),(val(none,none),())),val(bool,false)) -evaluated(conj,(val(none,none),(bad,())),bad) -evaluated(conj,(val(bool,true),(bad,())),bad) -evaluated(conj,(val(bool,false),(bad,())),val(bool,false)) -evaluated(conj,(variable(x),(val(bool,false),())),val(bool,false)) diff --git a/tests/correctness/unit/boolean_conj.expected.any b/tests/correctness/unit/boolean_conj.expected.any deleted file mode 100644 index 120b31f2..00000000 --- a/tests/correctness/unit/boolean_conj.expected.any +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(conj,(variable(x),(val(bool,true),())),val(bool,true)) -evaluated(conj,(variable(x),(val(bool,true),())),val(none,none)) -evaluated(conj,(variable(x),(val(bool,true),())),bad) -evaluated(conj,(variable(x),(val(none,none),())),val(none,none)) -evaluated(conj,(variable(x),(val(none,none),())),bad) -evaluated(conj,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_conj.expected.none b/tests/correctness/unit/boolean_conj.expected.none deleted file mode 100644 index b3303324..00000000 --- a/tests/correctness/unit/boolean_conj.expected.none +++ /dev/null @@ -1,27 +0,0 @@ -evaluated(conj,(val(bool,true),(val(bool,true),())),val(bool,false)) -evaluated(conj,(val(bool,true),(val(bool,true),())),val(none,none)) -evaluated(conj,(val(bool,true),(val(bool,true),())),bad) -evaluated(conj,(val(bool,true),(val(none,none),())),val(bool,true)) -evaluated(conj,(val(bool,true),(val(none,none),())),val(bool,false)) -evaluated(conj,(val(bool,true),(val(none,none),())),bad) -evaluated(conj,(val(bool,false),(val(bool,true),())),val(bool,true)) -evaluated(conj,(val(bool,false),(val(bool,true),())),val(none,none)) -evaluated(conj,(val(bool,false),(val(bool,true),())),bad) -evaluated(conj,(val(bool,false),(val(none,none),())),val(bool,true)) -evaluated(conj,(val(bool,false),(val(none,none),())),val(none,none)) -evaluated(conj,(val(bool,false),(val(none,none),())),bad) -evaluated(conj,(val(none,none),(bad,())),val(bool,true)) -evaluated(conj,(val(none,none),(bad,())),val(bool,false)) -evaluated(conj,(val(none,none),(bad,())),val(none,none)) -evaluated(conj,(val(bool,true),(bad,())),val(bool,true)) -evaluated(conj,(val(bool,true),(bad,())),val(bool,false)) -evaluated(conj,(val(bool,true),(bad,())),val(none,none)) -evaluated(conj,(val(bool,false),(bad,())),val(bool,true)) -evaluated(conj,(val(bool,false),(bad,())),val(none,none)) -evaluated(conj,(val(bool,false),(bad,())),bad) -evaluated(disj,(variable(x),(val(bool,true),())),val(bool,false)) -evaluated(disj,(variable(x),(val(bool,true),())),bad) -evaluated(disj,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(conj,(variable(x),(val(bool,false),())),bad) -evaluated(conj,(variable(x),(val(none,none),())),val(bool,false)) -evaluated(conj,(variable(x),(bad,())),val(bool,false)) diff --git a/tests/correctness/unit/boolean_conj.lp b/tests/correctness/unit/boolean_conj.lp deleted file mode 100644 index ad9c403e..00000000 --- a/tests/correctness/unit/boolean_conj.lp +++ /dev/null @@ -1,18 +0,0 @@ -phase_request(constantFolding,false). -evaluate(conj,(val(bool,true),(val(bool,true),()))). -evaluate(conj,(val(bool,true),(val(none,none),()))). -evaluate(conj,(val(bool,true),(bad,()))). -evaluate(conj,(val(bool,false),(val(bool,true),()))). -evaluate(conj,(val(bool,false),(val(none,none),()))). -evaluate(conj,(val(bool,false),(bad,()))). -evaluate(conj,(val(none,none),(val(bool,true),()))). -evaluate(conj,(val(none,none),(bad,()))). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(conj,(variable(x),(val(bool,false),()))). -evaluate(conj,(variable(x),(val(bool,true),()))). -evaluate(conj,(variable(x),(val(none,none),()))). -evaluate(conj,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/boolean_default.expected.all b/tests/correctness/unit/boolean_default.expected.all deleted file mode 100644 index 8b8ddd07..00000000 --- a/tests/correctness/unit/boolean_default.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(default,(val(int,1),(val(int,2),())),val(int,1)) -evaluated(default,(bad,(val(int,2),())),bad) -evaluated(default,(val(none,none),(val(int,2),())),val(int,2)) -evaluated(default,(val(none,none),(bad,())),bad) -evaluated(default,(val(none,none),(val(none,none),())),val(none,none)) diff --git a/tests/correctness/unit/boolean_disj.expected.all b/tests/correctness/unit/boolean_disj.expected.all deleted file mode 100644 index 26a99635..00000000 --- a/tests/correctness/unit/boolean_disj.expected.all +++ /dev/null @@ -1,7 +0,0 @@ -evaluated(disj,(val(bool,false),(val(bool,false),())),val(bool,false)) -evaluated(disj,(val(bool,false),(val(none,none),())),val(none,none)) -evaluated(disj,(val(bool,false),(bad,())),bad) -evaluated(disj,(val(bool,true),(val(bool,false),())),val(bool,true)) -evaluated(disj,(val(bool,true),(val(none,none),())),val(bool,true)) -evaluated(disj,(val(bool,true),(bad,())),val(bool,true)) -evaluated(disj,(variable(x),(val(bool,true),())),val(bool,true)) diff --git a/tests/correctness/unit/boolean_disj.expected.any b/tests/correctness/unit/boolean_disj.expected.any deleted file mode 100644 index cbd7f219..00000000 --- a/tests/correctness/unit/boolean_disj.expected.any +++ /dev/null @@ -1,7 +0,0 @@ -evaluated(disj,(variable(x),(val(bool,false),())),val(bool,true)) -evaluated(disj,(variable(x),(val(bool,false),())),bad) -evaluated(disj,(variable(x),(val(none,none),())),val(bool,true)) -evaluated(disj,(variable(x),(val(none,none),())),val(none,none)) -evaluated(disj,(variable(x),(val(none,none),())),bad) -evaluated(disj,(variable(x),(bad,())),val(bool,true)) -evaluated(disj,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_disj.expected.none b/tests/correctness/unit/boolean_disj.expected.none deleted file mode 100644 index 4e05a7d5..00000000 --- a/tests/correctness/unit/boolean_disj.expected.none +++ /dev/null @@ -1,18 +0,0 @@ -evaluated(disj,(val(bool,false),(val(bool,false),())),val(bool,true)) -evaluated(disj,(val(bool,false),(val(bool,false),())),val(none,none)) -evaluated(disj,(val(bool,false),(val(bool,false),())),bad) -evaluated(disj,(val(bool,false),(val(none,none),())),val(bool,true)) -evaluated(disj,(val(bool,false),(val(none,none),())),val(bool,false)) -evaluated(disj,(val(bool,false),(val(none,none),())),bad) -evaluated(disj,(val(bool,true),(val(bool,false),())),val(bool,false)) -evaluated(disj,(val(bool,true),(val(bool,false),())),val(none,none)) -evaluated(disj,(val(bool,true),(val(bool,false),())),bad) -evaluated(disj,(val(bool,true),(val(none,none),())),val(bool,false)) -evaluated(disj,(val(bool,true),(val(none,none),())),val(none,none)) -evaluated(disj,(val(bool,true),(val(none,none),())),bad) -evaluated(disj,(val(bool,false),(bad,())),val(bool,true)) -evaluated(disj,(val(bool,false),(bad,())),val(bool,false)) -evaluated(disj,(val(bool,false),(bad,())),val(none,none)) -evaluated(disj,(val(bool,true),(bad,())),val(bool,false)) -evaluated(disj,(val(bool,true),(bad,())),val(none,none)) -evaluated(disj,(val(bool,true),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_disj.lp b/tests/correctness/unit/boolean_disj.lp deleted file mode 100644 index e4f90be6..00000000 --- a/tests/correctness/unit/boolean_disj.lp +++ /dev/null @@ -1,15 +0,0 @@ -evaluate(disj,(val(bool,true),(val(bool,false),()))). -evaluate(disj,(val(bool,true),(val(none,none),()))). -evaluate(disj,(val(bool,true),(bad,()))). -evaluate(disj,(val(bool,false),(val(bool,false),()))). -evaluate(disj,(val(bool,false),(val(none,none),()))). -evaluate(disj,(val(bool,false),(bad,()))). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(disj,(variable(x),(val(bool,false),()))). -evaluate(disj,(variable(x),(val(bool,true),()))). -evaluate(disj,(variable(x),(val(none,none),()))). -evaluate(disj,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/boolean_disj_none_bug.expected.all b/tests/correctness/unit/boolean_disj_none_bug.expected.all deleted file mode 100644 index e284af37..00000000 --- a/tests/correctness/unit/boolean_disj_none_bug.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(disj,(val(none,none),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_disj_none_bug.expected.any b/tests/correctness/unit/boolean_disj_none_bug.expected.any deleted file mode 100644 index 4aea28ba..00000000 --- a/tests/correctness/unit/boolean_disj_none_bug.expected.any +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(disj,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(disj,(variable(x),(val(bool,false),())),bad) -evaluated(disj,(variable(x),(val(none,none),())),val(none,none)) -evaluated(disj,(variable(x),(val(none,none),())),bad) -evaluated(disj,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_disj_none_bug.expected.none b/tests/correctness/unit/boolean_disj_none_bug.expected.none deleted file mode 100644 index 60ce0341..00000000 --- a/tests/correctness/unit/boolean_disj_none_bug.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(disj,(val(none,none),(bad,())),val(bool,true)) -evaluated(disj,(val(none,none),(bad,())),val(bool,false)) -evaluated(disj,(val(none,none),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/boolean_disj_none_bug.lp b/tests/correctness/unit/boolean_disj_none_bug.lp deleted file mode 100644 index a1abda43..00000000 --- a/tests/correctness/unit/boolean_disj_none_bug.lp +++ /dev/null @@ -1,13 +0,0 @@ -% compile2 currently goes UNSAT here, while the other engines derive bad. - - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(disj,(variable(x),(val(bool,false),()))). -evaluate(disj,(variable(x),(val(none,none),()))). -evaluate(disj,(variable(x),(bad,()))). - - -evaluate(disj,(val(none,none),(bad,()))). diff --git a/tests/correctness/unit/boolean_if.expected.any b/tests/correctness/unit/boolean_if.expected.any deleted file mode 100644 index 4e610a08..00000000 --- a/tests/correctness/unit/boolean_if.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(if,(variable(x),(val(int,1),())),val(int,1)) -evaluated(if,(variable(x),(val(int,1),())),bad) -evaluated(if,(variable(x),(val(int,1),())),val(none,none)) diff --git a/tests/correctness/unit/boolean_if.expected.none b/tests/correctness/unit/boolean_if.expected.none deleted file mode 100644 index cd560a7c..00000000 --- a/tests/correctness/unit/boolean_if.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(if,(val(bool,true),(val(int,1),())),val(none,none)) -evaluated(if,(val(bool,true),(val(int,1),())),bad) -evaluated(if,(val(bool,true),(bad,())),val(int,1)) -evaluated(if,(val(bool,true),(bad,())),val(none,none)) -evaluated(if,(val(bool,false),(val(int,1),())),val(int,1)) -evaluated(if,(val(bool,false),(val(int,1),())),bad) -evaluated(if,(val(bool,false),(bad,())),val(int,1)) -evaluated(if,(val(bool,false),(bad,())),bad) -evaluated(if,(val(none,none),(val(int,1),())),val(int,1)) -evaluated(if,(val(none,none),(val(int,1),())),bad) -evaluated(if,(bad,(val(int,1),())),val(int,1)) -evaluated(if,(bad,(val(int,1),())),val(none,none)) diff --git a/tests/correctness/unit/boolean_if.lp b/tests/correctness/unit/boolean_if.lp deleted file mode 100644 index bb833832..00000000 --- a/tests/correctness/unit/boolean_if.lp +++ /dev/null @@ -1,14 +0,0 @@ - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(if,(variable(x),(val(int,1),()))). - - -evaluate(if,(val(bool,true),(val(int,1),()))). -evaluate(if,(val(bool,true),(bad,()))). -evaluate(if,(val(bool,false),(val(int,1),()))). -evaluate(if,(val(bool,false),(bad,()))). -evaluate(if,(val(none,none),(val(int,1),()))). -evaluate(if,(bad,(val(int,1),()))). diff --git a/tests/correctness/unit/boolean_leqv.expected.all b/tests/correctness/unit/boolean_leqv.expected.all deleted file mode 100644 index 304b4065..00000000 --- a/tests/correctness/unit/boolean_leqv.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(leqv,(val(bool,true),(val(bool,false),())),val(bool,false)) -evaluated(leqv,(val(bool,false),(val(bool,false),())),val(bool,true)) -evaluated(leqv,(val(bool,true),(val(bool,false),(val(bool,false),()))),val(bool,true)) -evaluated(leqv,(val(bool,true),(val(bool,true),(val(bool,false),()))),val(bool,false)) -evaluated(leqv,(val(bool,true),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_leqv.expected.any b/tests/correctness/unit/boolean_leqv.expected.any deleted file mode 100644 index 4b8b017f..00000000 --- a/tests/correctness/unit/boolean_leqv.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(leqv,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(leqv,(variable(x),(val(bool,false),())),bad) -evaluated(leqv,(variable(x),(val(none,none),())),bad) -evaluated(leqv,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_leqv.expected.none b/tests/correctness/unit/boolean_leqv.expected.none deleted file mode 100644 index 4edc2b8d..00000000 --- a/tests/correctness/unit/boolean_leqv.expected.none +++ /dev/null @@ -1,16 +0,0 @@ -evaluated(leqv,(val(bool,true),(val(bool,false),())),val(bool,true)) -evaluated(leqv,(val(bool,true),(val(bool,false),())),val(none,none)) -evaluated(leqv,(val(bool,true),(val(bool,false),())),bad) -evaluated(leqv,(val(bool,false),(val(bool,false),())),val(bool,false)) -evaluated(leqv,(val(bool,false),(val(bool,false),())),val(none,none)) -evaluated(leqv,(val(bool,false),(val(bool,false),())),bad) -evaluated(leqv,(val(bool,true),(val(bool,false),(val(bool,false),()))),val(bool,false)) -evaluated(leqv,(val(bool,true),(val(bool,false),(val(bool,false),()))),val(none,none)) -evaluated(leqv,(val(bool,true),(val(bool,false),(val(bool,false),()))),bad) -evaluated(leqv,(val(bool,true),(val(bool,true),(val(bool,false),()))),val(bool,true)) -evaluated(leqv,(val(bool,true),(val(bool,true),(val(bool,false),()))),val(none,none)) -evaluated(leqv,(val(bool,true),(val(bool,true),(val(bool,false),()))),bad) -evaluated(leqv,(val(bool,true),(bad,())),val(bool,true)) -evaluated(leqv,(val(bool,true),(bad,())),val(bool,false)) -evaluated(leqv,(val(bool,true),(bad,())),val(none,none)) -evaluated(leqv,(variable(x),(val(none,none),())),val(bool,true)) diff --git a/tests/correctness/unit/boolean_leqv.lp b/tests/correctness/unit/boolean_leqv.lp deleted file mode 100644 index 1c7f8149..00000000 --- a/tests/correctness/unit/boolean_leqv.lp +++ /dev/null @@ -1,16 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(leqv,(variable(x),(val(bool,false),()))). -evaluate(leqv,(variable(x),(val(none,none),()))). -evaluate(leqv,(variable(x),(bad,()))). - - -evaluate(leqv,(val(bool,true),(val(bool,false),()))). -evaluate(leqv,(val(bool,false),(val(bool,false),()))). -evaluate(leqv,(val(bool,true),(val(bool,false),(val(bool,false),())))). -evaluate(leqv,(val(bool,true),(val(bool,true),(val(bool,false),())))). -evaluate(leqv,(val(bool,true),(bad,()))). diff --git a/tests/correctness/unit/boolean_leqv_none_bug.expected.all b/tests/correctness/unit/boolean_leqv_none_bug.expected.all deleted file mode 100644 index 7da02f74..00000000 --- a/tests/correctness/unit/boolean_leqv_none_bug.expected.all +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(leqv,(val(none,none),()),bad) -evaluated(leqv,(val(bool,false),(val(none,none),())),bad) diff --git a/tests/correctness/unit/boolean_leqv_none_bug.expected.any b/tests/correctness/unit/boolean_leqv_none_bug.expected.any deleted file mode 100644 index 4b8b017f..00000000 --- a/tests/correctness/unit/boolean_leqv_none_bug.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(leqv,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(leqv,(variable(x),(val(bool,false),())),bad) -evaluated(leqv,(variable(x),(val(none,none),())),bad) -evaluated(leqv,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_leqv_none_bug.expected.none b/tests/correctness/unit/boolean_leqv_none_bug.expected.none deleted file mode 100644 index 71aa9309..00000000 --- a/tests/correctness/unit/boolean_leqv_none_bug.expected.none +++ /dev/null @@ -1,7 +0,0 @@ -evaluated(leqv,(val(none,none),()),val(bool,true)) -evaluated(leqv,(val(none,none),()),val(bool,false)) -evaluated(leqv,(val(none,none),()),val(none,none)) -evaluated(leqv,(val(bool,false),(val(none,none),())),val(bool,true)) -evaluated(leqv,(val(bool,false),(val(none,none),())),val(bool,false)) -evaluated(leqv,(val(bool,false),(val(none,none),())),val(none,none)) -evaluated(leqv,(variable(x),(val(none,none),())),val(bool,true)) diff --git a/tests/correctness/unit/boolean_leqv_none_bug.lp b/tests/correctness/unit/boolean_leqv_none_bug.lp deleted file mode 100644 index a6b4fc4d..00000000 --- a/tests/correctness/unit/boolean_leqv_none_bug.lp +++ /dev/null @@ -1,14 +0,0 @@ -% compile2 currently goes UNSAT for leqv with none-valued operands. -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(leqv,(variable(x),(val(bool,false),()))). -evaluate(leqv,(variable(x),(val(none,none),()))). -evaluate(leqv,(variable(x),(bad,()))). - - -evaluate(leqv,(val(none,none),())). -evaluate(leqv,(val(bool,false),(val(none,none),()))). diff --git a/tests/correctness/unit/boolean_lxor.expected.all b/tests/correctness/unit/boolean_lxor.expected.all deleted file mode 100644 index 5b059a0c..00000000 --- a/tests/correctness/unit/boolean_lxor.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lxor,(val(bool,true),(val(bool,false),())),val(bool,true)) -evaluated(lxor,(val(bool,true),(val(bool,true),())),val(bool,false)) -evaluated(lxor,(val(bool,true),(val(bool,true),(val(bool,true),()))),val(bool,true)) -evaluated(lxor,(val(bool,true),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_lxor.expected.any b/tests/correctness/unit/boolean_lxor.expected.any deleted file mode 100644 index 1c6d5ca8..00000000 --- a/tests/correctness/unit/boolean_lxor.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,true)) -evaluated(lxor,(variable(x),(val(bool,false),())),bad) -evaluated(lxor,(variable(x),(val(none,none),())),bad) -evaluated(lxor,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_lxor.expected.none b/tests/correctness/unit/boolean_lxor.expected.none deleted file mode 100644 index 33899c2d..00000000 --- a/tests/correctness/unit/boolean_lxor.expected.none +++ /dev/null @@ -1,15 +0,0 @@ -evaluated(lxor,(val(bool,true),(val(bool,false),())),val(bool,false)) -evaluated(lxor,(val(bool,true),(val(bool,false),())),val(none,none)) -evaluated(lxor,(val(bool,true),(val(bool,false),())),bad) -evaluated(lxor,(val(bool,true),(val(bool,true),())),val(bool,true)) -evaluated(lxor,(val(bool,true),(val(bool,true),())),val(none,none)) -evaluated(lxor,(val(bool,true),(val(bool,true),())),bad) -evaluated(lxor,(val(bool,true),(val(bool,true),(val(bool,true),()))),val(bool,false)) -evaluated(lxor,(val(bool,true),(val(bool,true),(val(bool,true),()))),val(none,none)) -evaluated(lxor,(val(bool,true),(val(bool,true),(val(bool,true),()))),bad) -evaluated(lxor,(val(bool,true),(bad,())),val(bool,true)) -evaluated(lxor,(val(bool,true),(bad,())),val(bool,false)) -evaluated(lxor,(val(bool,true),(bad,())),val(none,none)) -evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(lxor,(variable(x),(val(none,none),())),val(bool,true)) -evaluated(lxor,(variable(x),(val(none,none),())),val(bool,false)) diff --git a/tests/correctness/unit/boolean_lxor.lp b/tests/correctness/unit/boolean_lxor.lp deleted file mode 100644 index 254c8f4f..00000000 --- a/tests/correctness/unit/boolean_lxor.lp +++ /dev/null @@ -1,15 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(lxor,(variable(x),(val(bool,false),()))). -evaluate(lxor,(variable(x),(val(none,none),()))). -evaluate(lxor,(variable(x),(bad,()))). - - -evaluate(lxor,(val(bool,true),(val(bool,false),()))). -evaluate(lxor,(val(bool,true),(val(bool,true),()))). -evaluate(lxor,(val(bool,true),(val(bool,true),(val(bool,true),())))). -evaluate(lxor,(val(bool,true),(bad,()))). diff --git a/tests/correctness/unit/boolean_lxor_none_bug.expected.all b/tests/correctness/unit/boolean_lxor_none_bug.expected.all deleted file mode 100644 index d8639382..00000000 --- a/tests/correctness/unit/boolean_lxor_none_bug.expected.all +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(lxor,(val(none,none),()),bad) -evaluated(lxor,(val(bool,false),(val(none,none),())),bad) diff --git a/tests/correctness/unit/boolean_lxor_none_bug.expected.any b/tests/correctness/unit/boolean_lxor_none_bug.expected.any deleted file mode 100644 index 1c6d5ca8..00000000 --- a/tests/correctness/unit/boolean_lxor_none_bug.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,true)) -evaluated(lxor,(variable(x),(val(bool,false),())),bad) -evaluated(lxor,(variable(x),(val(none,none),())),bad) -evaluated(lxor,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/boolean_lxor_none_bug.expected.none b/tests/correctness/unit/boolean_lxor_none_bug.expected.none deleted file mode 100644 index a4637bf1..00000000 --- a/tests/correctness/unit/boolean_lxor_none_bug.expected.none +++ /dev/null @@ -1,9 +0,0 @@ -evaluated(lxor,(val(none,none),()),val(bool,true)) -evaluated(lxor,(val(none,none),()),val(bool,false)) -evaluated(lxor,(val(none,none),()),val(none,none)) -evaluated(lxor,(val(bool,false),(val(none,none),())),val(bool,true)) -evaluated(lxor,(val(bool,false),(val(none,none),())),val(bool,false)) -evaluated(lxor,(val(bool,false),(val(none,none),())),val(none,none)) -evaluated(lxor,(variable(x),(val(bool,false),())),val(bool,false)) -evaluated(lxor,(variable(x),(val(none,none),())),val(bool,true)) -evaluated(lxor,(variable(x),(val(none,none),())),val(bool,false)) diff --git a/tests/correctness/unit/boolean_lxor_none_bug.lp b/tests/correctness/unit/boolean_lxor_none_bug.lp deleted file mode 100644 index 334b0d1c..00000000 --- a/tests/correctness/unit/boolean_lxor_none_bug.lp +++ /dev/null @@ -1,14 +0,0 @@ -% compile2 currently goes UNSAT for lxor with none-valued operands. -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(lxor,(variable(x),(val(bool,false),()))). -evaluate(lxor,(variable(x),(val(none,none),()))). -evaluate(lxor,(variable(x),(bad,()))). - - -evaluate(lxor,(val(none,none),())). -evaluate(lxor,(val(bool,false),(val(none,none),()))). diff --git a/tests/correctness/unit/float_eq.expected.all b/tests/correctness/unit/float/float_eq.expected.all similarity index 100% rename from tests/correctness/unit/float_eq.expected.all rename to tests/correctness/unit/float/float_eq.expected.all diff --git a/tests/correctness/unit/float_eq.expected.any b/tests/correctness/unit/float/float_eq.expected.any similarity index 100% rename from tests/correctness/unit/float_eq.expected.any rename to tests/correctness/unit/float/float_eq.expected.any diff --git a/tests/correctness/unit/float_eq.expected.none b/tests/correctness/unit/float/float_eq.expected.none similarity index 100% rename from tests/correctness/unit/float_eq.expected.none rename to tests/correctness/unit/float/float_eq.expected.none diff --git a/tests/correctness/unit/float_eq.expected.stats b/tests/correctness/unit/float/float_eq.expected.stats similarity index 100% rename from tests/correctness/unit/float_eq.expected.stats rename to tests/correctness/unit/float/float_eq.expected.stats diff --git a/tests/correctness/unit/float_eq.lp b/tests/correctness/unit/float/float_eq.lp similarity index 100% rename from tests/correctness/unit/float_eq.lp rename to tests/correctness/unit/float/float_eq.lp diff --git a/tests/correctness/unit/float_float_div.expected.all b/tests/correctness/unit/float/float_float_div.expected.all similarity index 100% rename from tests/correctness/unit/float_float_div.expected.all rename to tests/correctness/unit/float/float_float_div.expected.all diff --git a/tests/correctness/unit/float_float_div.expected.any b/tests/correctness/unit/float/float_float_div.expected.any similarity index 100% rename from tests/correctness/unit/float_float_div.expected.any rename to tests/correctness/unit/float/float_float_div.expected.any diff --git a/tests/correctness/unit/float_float_div.expected.none b/tests/correctness/unit/float/float_float_div.expected.none similarity index 100% rename from tests/correctness/unit/float_float_div.expected.none rename to tests/correctness/unit/float/float_float_div.expected.none diff --git a/tests/correctness/unit/float_float_div.expected.stats b/tests/correctness/unit/float/float_float_div.expected.stats similarity index 100% rename from tests/correctness/unit/float_float_div.expected.stats rename to tests/correctness/unit/float/float_float_div.expected.stats diff --git a/tests/correctness/unit/float_float_div.lp b/tests/correctness/unit/float/float_float_div.lp similarity index 100% rename from tests/correctness/unit/float_float_div.lp rename to tests/correctness/unit/float/float_float_div.lp diff --git a/tests/correctness/unit/float_geq.expected.all b/tests/correctness/unit/float/float_geq.expected.all similarity index 100% rename from tests/correctness/unit/float_geq.expected.all rename to tests/correctness/unit/float/float_geq.expected.all diff --git a/tests/correctness/unit/float_geq.expected.any b/tests/correctness/unit/float/float_geq.expected.any similarity index 100% rename from tests/correctness/unit/float_geq.expected.any rename to tests/correctness/unit/float/float_geq.expected.any diff --git a/tests/correctness/unit/float_geq.expected.none b/tests/correctness/unit/float/float_geq.expected.none similarity index 100% rename from tests/correctness/unit/float_geq.expected.none rename to tests/correctness/unit/float/float_geq.expected.none diff --git a/tests/correctness/unit/float_geq.expected.stats b/tests/correctness/unit/float/float_geq.expected.stats similarity index 100% rename from tests/correctness/unit/float_geq.expected.stats rename to tests/correctness/unit/float/float_geq.expected.stats diff --git a/tests/correctness/unit/float_geq.lp b/tests/correctness/unit/float/float_geq.lp similarity index 100% rename from tests/correctness/unit/float_geq.lp rename to tests/correctness/unit/float/float_geq.lp diff --git a/tests/correctness/unit/float_gt.expected.all b/tests/correctness/unit/float/float_gt.expected.all similarity index 100% rename from tests/correctness/unit/float_gt.expected.all rename to tests/correctness/unit/float/float_gt.expected.all diff --git a/tests/correctness/unit/float_gt.expected.any b/tests/correctness/unit/float/float_gt.expected.any similarity index 100% rename from tests/correctness/unit/float_gt.expected.any rename to tests/correctness/unit/float/float_gt.expected.any diff --git a/tests/correctness/unit/float_gt.expected.none b/tests/correctness/unit/float/float_gt.expected.none similarity index 100% rename from tests/correctness/unit/float_gt.expected.none rename to tests/correctness/unit/float/float_gt.expected.none diff --git a/tests/correctness/unit/float_gt.expected.stats b/tests/correctness/unit/float/float_gt.expected.stats similarity index 100% rename from tests/correctness/unit/float_gt.expected.stats rename to tests/correctness/unit/float/float_gt.expected.stats diff --git a/tests/correctness/unit/float_gt.lp b/tests/correctness/unit/float/float_gt.lp similarity index 100% rename from tests/correctness/unit/float_gt.lp rename to tests/correctness/unit/float/float_gt.lp diff --git a/tests/correctness/unit/float_int_div.expected.all b/tests/correctness/unit/float/float_int_div.expected.all similarity index 100% rename from tests/correctness/unit/float_int_div.expected.all rename to tests/correctness/unit/float/float_int_div.expected.all diff --git a/tests/correctness/unit/float_int_div.expected.any b/tests/correctness/unit/float/float_int_div.expected.any similarity index 100% rename from tests/correctness/unit/float_int_div.expected.any rename to tests/correctness/unit/float/float_int_div.expected.any diff --git a/tests/correctness/unit/float_int_div.expected.none b/tests/correctness/unit/float/float_int_div.expected.none similarity index 100% rename from tests/correctness/unit/float_int_div.expected.none rename to tests/correctness/unit/float/float_int_div.expected.none diff --git a/tests/correctness/unit/float_int_div.expected.stats b/tests/correctness/unit/float/float_int_div.expected.stats similarity index 100% rename from tests/correctness/unit/float_int_div.expected.stats rename to tests/correctness/unit/float/float_int_div.expected.stats diff --git a/tests/correctness/unit/float_int_div.lp b/tests/correctness/unit/float/float_int_div.lp similarity index 100% rename from tests/correctness/unit/float_int_div.lp rename to tests/correctness/unit/float/float_int_div.lp diff --git a/tests/correctness/unit/float_leq.expected.all b/tests/correctness/unit/float/float_leq.expected.all similarity index 100% rename from tests/correctness/unit/float_leq.expected.all rename to tests/correctness/unit/float/float_leq.expected.all diff --git a/tests/correctness/unit/float_leq.expected.any b/tests/correctness/unit/float/float_leq.expected.any similarity index 100% rename from tests/correctness/unit/float_leq.expected.any rename to tests/correctness/unit/float/float_leq.expected.any diff --git a/tests/correctness/unit/float_leq.expected.none b/tests/correctness/unit/float/float_leq.expected.none similarity index 100% rename from tests/correctness/unit/float_leq.expected.none rename to tests/correctness/unit/float/float_leq.expected.none diff --git a/tests/correctness/unit/float_leq.expected.stats b/tests/correctness/unit/float/float_leq.expected.stats similarity index 100% rename from tests/correctness/unit/float_leq.expected.stats rename to tests/correctness/unit/float/float_leq.expected.stats diff --git a/tests/correctness/unit/float_leq.lp b/tests/correctness/unit/float/float_leq.lp similarity index 100% rename from tests/correctness/unit/float_leq.lp rename to tests/correctness/unit/float/float_leq.lp diff --git a/tests/correctness/unit/float_lt.expected.all b/tests/correctness/unit/float/float_lt.expected.all similarity index 100% rename from tests/correctness/unit/float_lt.expected.all rename to tests/correctness/unit/float/float_lt.expected.all diff --git a/tests/correctness/unit/float_lt.expected.any b/tests/correctness/unit/float/float_lt.expected.any similarity index 100% rename from tests/correctness/unit/float_lt.expected.any rename to tests/correctness/unit/float/float_lt.expected.any diff --git a/tests/correctness/unit/float_lt.expected.none b/tests/correctness/unit/float/float_lt.expected.none similarity index 100% rename from tests/correctness/unit/float_lt.expected.none rename to tests/correctness/unit/float/float_lt.expected.none diff --git a/tests/correctness/unit/float_lt.expected.stats b/tests/correctness/unit/float/float_lt.expected.stats similarity index 100% rename from tests/correctness/unit/float_lt.expected.stats rename to tests/correctness/unit/float/float_lt.expected.stats diff --git a/tests/correctness/unit/float_lt.lp b/tests/correctness/unit/float/float_lt.lp similarity index 100% rename from tests/correctness/unit/float_lt.lp rename to tests/correctness/unit/float/float_lt.lp diff --git a/tests/correctness/unit/float_max.expected.all b/tests/correctness/unit/float/float_max.expected.all similarity index 100% rename from tests/correctness/unit/float_max.expected.all rename to tests/correctness/unit/float/float_max.expected.all diff --git a/tests/correctness/unit/float_max.expected.any b/tests/correctness/unit/float/float_max.expected.any similarity index 100% rename from tests/correctness/unit/float_max.expected.any rename to tests/correctness/unit/float/float_max.expected.any diff --git a/tests/correctness/unit/float_max.expected.none b/tests/correctness/unit/float/float_max.expected.none similarity index 100% rename from tests/correctness/unit/float_max.expected.none rename to tests/correctness/unit/float/float_max.expected.none diff --git a/tests/correctness/unit/float_max.expected.stats b/tests/correctness/unit/float/float_max.expected.stats similarity index 100% rename from tests/correctness/unit/float_max.expected.stats rename to tests/correctness/unit/float/float_max.expected.stats diff --git a/tests/correctness/unit/float_max.lp b/tests/correctness/unit/float/float_max.lp similarity index 100% rename from tests/correctness/unit/float_max.lp rename to tests/correctness/unit/float/float_max.lp diff --git a/tests/correctness/unit/float_min.expected.all b/tests/correctness/unit/float/float_min.expected.all similarity index 100% rename from tests/correctness/unit/float_min.expected.all rename to tests/correctness/unit/float/float_min.expected.all diff --git a/tests/correctness/unit/float_min.expected.any b/tests/correctness/unit/float/float_min.expected.any similarity index 100% rename from tests/correctness/unit/float_min.expected.any rename to tests/correctness/unit/float/float_min.expected.any diff --git a/tests/correctness/unit/float_min.expected.none b/tests/correctness/unit/float/float_min.expected.none similarity index 100% rename from tests/correctness/unit/float_min.expected.none rename to tests/correctness/unit/float/float_min.expected.none diff --git a/tests/correctness/unit/float_min.expected.stats b/tests/correctness/unit/float/float_min.expected.stats similarity index 100% rename from tests/correctness/unit/float_min.expected.stats rename to tests/correctness/unit/float/float_min.expected.stats diff --git a/tests/correctness/unit/float_min.lp b/tests/correctness/unit/float/float_min.lp similarity index 100% rename from tests/correctness/unit/float_min.lp rename to tests/correctness/unit/float/float_min.lp diff --git a/tests/correctness/unit/float_neq.expected.all b/tests/correctness/unit/float/float_neq.expected.all similarity index 100% rename from tests/correctness/unit/float_neq.expected.all rename to tests/correctness/unit/float/float_neq.expected.all diff --git a/tests/correctness/unit/float_neq.expected.any b/tests/correctness/unit/float/float_neq.expected.any similarity index 100% rename from tests/correctness/unit/float_neq.expected.any rename to tests/correctness/unit/float/float_neq.expected.any diff --git a/tests/correctness/unit/float_neq.expected.none b/tests/correctness/unit/float/float_neq.expected.none similarity index 100% rename from tests/correctness/unit/float_neq.expected.none rename to tests/correctness/unit/float/float_neq.expected.none diff --git a/tests/correctness/unit/float_neq.expected.stats b/tests/correctness/unit/float/float_neq.expected.stats similarity index 100% rename from tests/correctness/unit/float_neq.expected.stats rename to tests/correctness/unit/float/float_neq.expected.stats diff --git a/tests/correctness/unit/float_neq.lp b/tests/correctness/unit/float/float_neq.lp similarity index 100% rename from tests/correctness/unit/float_neq.lp rename to tests/correctness/unit/float/float_neq.lp diff --git a/tests/correctness/unit/float_add.expected.all b/tests/correctness/unit/float_add.expected.all deleted file mode 100644 index da1cd2b4..00000000 --- a/tests/correctness/unit/float_add.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(add,(val(float,float("1.5")),(val(int,2),())),val(float,float("3.5"))) -evaluated(add,(val(float,float("1.5")),(val(none,none),())),bad) -evaluated(add,(val(float,float("1.5")),(bad,())),bad) diff --git a/tests/correctness/unit/float_add.expected.none b/tests/correctness/unit/float_add.expected.none deleted file mode 100644 index 8b038450..00000000 --- a/tests/correctness/unit/float_add.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(add,(val(float,float("1.5")),(val(int,2),())),bad) -evaluated(add,(val(float,float("1.5")),(val(int,2),())),val(int,3)) -evaluated(add,(val(float,float("1.5")),(val(none,none),())),val(none,none)) -evaluated(add,(val(float,float("1.5")),(val(none,none),())),val(float,float("1.5"))) -evaluated(add,(val(float,float("1.5")),(bad,())),val(none,none)) -evaluated(add,(val(float,float("1.5")),(bad,())),val(float,float("1.5"))) diff --git a/tests/correctness/unit/float_add.expected.stats b/tests/correctness/unit/float_add.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/float_add.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/float_add.lp b/tests/correctness/unit/float_add.lp deleted file mode 100644 index 9173e3d6..00000000 --- a/tests/correctness/unit/float_add.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). -evaluate(add,(val(float,float("1.5")),(val(int,2),()))). -evaluate(add,(val(float,float("1.5")),(val(none,none),()))). -evaluate(add,(val(float,float("1.5")),(bad,()))). - - -variable_declare(x,fromFacts). -variable_domain(x,val(float,float("2.5"))). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(add,(variable(x),(val(int,2),()))). -evaluate(add,(variable(x),(val(none,none),()))). -evaluate(add,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/float_mult.expected.all b/tests/correctness/unit/float_mult.expected.all deleted file mode 100644 index 82172ee8..00000000 --- a/tests/correctness/unit/float_mult.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(mult,(val(float,float("2.5")),(val(int,2),())),val(float,float("5.0"))) -evaluated(mult,(val(float,float("0.0")),(bad,())),bad) -evaluated(mult,(val(float,float("2.5")),(val(none,none),())),bad) -evaluated(mult,(val(float,float("2.5")),(bad,())),bad) diff --git a/tests/correctness/unit/float_mult.expected.none b/tests/correctness/unit/float_mult.expected.none deleted file mode 100644 index 8f341679..00000000 --- a/tests/correctness/unit/float_mult.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(mult,(val(float,float("2.5")),(val(int,2),())),bad) -evaluated(mult,(val(float,float("2.5")),(val(int,2),())),val(none,none)) -evaluated(mult,(val(float,float("2.5")),(val(int,2),())),val(float,float("0.0"))) -evaluated(mult,(val(float,float("0.0")),(bad,())),val(none,none)) -evaluated(mult,(val(float,float("2.5")),(val(none,none),())),val(none,none)) -evaluated(mult,(val(float,float("2.5")),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/float_mult.expected.stats b/tests/correctness/unit/float_mult.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/float_mult.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/float_pow.expected.all b/tests/correctness/unit/float_pow.expected.all deleted file mode 100644 index 2ad9fe39..00000000 --- a/tests/correctness/unit/float_pow.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(pow,(val(float,float("2.5")),(val(int,2),())),val(float,float("6.25"))) -evaluated(pow,(val(float,float("2.5")),(val(none,none),())),bad) -evaluated(pow,(val(float,float("2.5")),(bad,())),bad) diff --git a/tests/correctness/unit/float_pow.expected.none b/tests/correctness/unit/float_pow.expected.none deleted file mode 100644 index 6d04ba94..00000000 --- a/tests/correctness/unit/float_pow.expected.none +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(pow,(val(float,float("2.5")),(val(int,2),())),bad) -evaluated(pow,(val(float,float("2.5")),(val(int,2),())),val(none,none)) -evaluated(pow,(val(float,float("2.5")),(val(int,2),())),val(float,float("0.0"))) -evaluated(pow,(val(float,float("2.5")),(val(none,none),())),val(none,none)) -evaluated(pow,(val(float,float("2.5")),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/float_pow.expected.stats b/tests/correctness/unit/float_pow.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/float_pow.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/float_sub.expected.all b/tests/correctness/unit/float_sub.expected.all deleted file mode 100644 index 2e953071..00000000 --- a/tests/correctness/unit/float_sub.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(sub,(val(float,float("2.5")),(val(int,2),())),val(float,float("0.5"))) -evaluated(sub,(val(float,float("2.5")),(val(none,none),())),bad) -evaluated(sub,(val(float,float("2.5")),(bad,())),bad) diff --git a/tests/correctness/unit/float_sub.expected.any b/tests/correctness/unit/float_sub.expected.any deleted file mode 100644 index 245286eb..00000000 --- a/tests/correctness/unit/float_sub.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(sub,(variable(x),(val(int,2),())),val(float,float("0.5"))) -evaluated(sub,(variable(x),(val(int,2),())),bad) -evaluated(sub,(variable(x),(val(none,none),())),bad) -evaluated(sub,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/float_sub.expected.none b/tests/correctness/unit/float_sub.expected.none deleted file mode 100644 index d7c23af7..00000000 --- a/tests/correctness/unit/float_sub.expected.none +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(sub,(val(float,float("2.5")),(val(int,2),())),bad) -evaluated(sub,(val(float,float("2.5")),(val(int,2),())),val(none,none)) -evaluated(sub,(val(float,float("2.5")),(val(int,2),())),val(float,float("0.0"))) -evaluated(sub,(val(float,float("2.5")),(val(none,none),())),val(none,none)) -evaluated(sub,(val(float,float("2.5")),(bad,())),val(none,none)) diff --git a/tests/correctness/unit/float_sub.expected.stats b/tests/correctness/unit/float_sub.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/float_sub.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/int_geq.expected.all b/tests/correctness/unit/int/int_geq.expected.all similarity index 100% rename from tests/correctness/unit/int_geq.expected.all rename to tests/correctness/unit/int/int_geq.expected.all diff --git a/tests/correctness/unit/int_geq.expected.any b/tests/correctness/unit/int/int_geq.expected.any similarity index 100% rename from tests/correctness/unit/int_geq.expected.any rename to tests/correctness/unit/int/int_geq.expected.any diff --git a/tests/correctness/unit/int_geq.expected.none b/tests/correctness/unit/int/int_geq.expected.none similarity index 100% rename from tests/correctness/unit/int_geq.expected.none rename to tests/correctness/unit/int/int_geq.expected.none diff --git a/tests/correctness/unit/int_geq.expected.stats b/tests/correctness/unit/int/int_geq.expected.stats similarity index 100% rename from tests/correctness/unit/int_geq.expected.stats rename to tests/correctness/unit/int/int_geq.expected.stats diff --git a/tests/correctness/unit/int_geq.lp b/tests/correctness/unit/int/int_geq.lp similarity index 100% rename from tests/correctness/unit/int_geq.lp rename to tests/correctness/unit/int/int_geq.lp diff --git a/tests/correctness/unit/int_gt.expected.all b/tests/correctness/unit/int/int_gt.expected.all similarity index 100% rename from tests/correctness/unit/int_gt.expected.all rename to tests/correctness/unit/int/int_gt.expected.all diff --git a/tests/correctness/unit/int_gt.expected.any b/tests/correctness/unit/int/int_gt.expected.any similarity index 100% rename from tests/correctness/unit/int_gt.expected.any rename to tests/correctness/unit/int/int_gt.expected.any diff --git a/tests/correctness/unit/int_gt.expected.none b/tests/correctness/unit/int/int_gt.expected.none similarity index 100% rename from tests/correctness/unit/int_gt.expected.none rename to tests/correctness/unit/int/int_gt.expected.none diff --git a/tests/correctness/unit/int_gt.expected.stats b/tests/correctness/unit/int/int_gt.expected.stats similarity index 100% rename from tests/correctness/unit/int_gt.expected.stats rename to tests/correctness/unit/int/int_gt.expected.stats diff --git a/tests/correctness/unit/int_gt.lp b/tests/correctness/unit/int/int_gt.lp similarity index 100% rename from tests/correctness/unit/int_gt.lp rename to tests/correctness/unit/int/int_gt.lp diff --git a/tests/correctness/unit/int_int_div.expected.all b/tests/correctness/unit/int/int_int_div.expected.all similarity index 100% rename from tests/correctness/unit/int_int_div.expected.all rename to tests/correctness/unit/int/int_int_div.expected.all diff --git a/tests/correctness/unit/int_int_div.expected.any b/tests/correctness/unit/int/int_int_div.expected.any similarity index 100% rename from tests/correctness/unit/int_int_div.expected.any rename to tests/correctness/unit/int/int_int_div.expected.any diff --git a/tests/correctness/unit/int_int_div.expected.none b/tests/correctness/unit/int/int_int_div.expected.none similarity index 100% rename from tests/correctness/unit/int_int_div.expected.none rename to tests/correctness/unit/int/int_int_div.expected.none diff --git a/tests/correctness/unit/int_int_div.expected.stats b/tests/correctness/unit/int/int_int_div.expected.stats similarity index 100% rename from tests/correctness/unit/int_int_div.expected.stats rename to tests/correctness/unit/int/int_int_div.expected.stats diff --git a/tests/correctness/unit/int_int_div.lp b/tests/correctness/unit/int/int_int_div.lp similarity index 100% rename from tests/correctness/unit/int_int_div.lp rename to tests/correctness/unit/int/int_int_div.lp diff --git a/tests/correctness/unit/int_leq.expected.all b/tests/correctness/unit/int/int_leq.expected.all similarity index 100% rename from tests/correctness/unit/int_leq.expected.all rename to tests/correctness/unit/int/int_leq.expected.all diff --git a/tests/correctness/unit/int_leq.expected.any b/tests/correctness/unit/int/int_leq.expected.any similarity index 100% rename from tests/correctness/unit/int_leq.expected.any rename to tests/correctness/unit/int/int_leq.expected.any diff --git a/tests/correctness/unit/int_leq.expected.none b/tests/correctness/unit/int/int_leq.expected.none similarity index 100% rename from tests/correctness/unit/int_leq.expected.none rename to tests/correctness/unit/int/int_leq.expected.none diff --git a/tests/correctness/unit/int_leq.expected.stats b/tests/correctness/unit/int/int_leq.expected.stats similarity index 100% rename from tests/correctness/unit/int_leq.expected.stats rename to tests/correctness/unit/int/int_leq.expected.stats diff --git a/tests/correctness/unit/int_leq.lp b/tests/correctness/unit/int/int_leq.lp similarity index 100% rename from tests/correctness/unit/int_leq.lp rename to tests/correctness/unit/int/int_leq.lp diff --git a/tests/correctness/unit/int_lt.expected.all b/tests/correctness/unit/int/int_lt.expected.all similarity index 100% rename from tests/correctness/unit/int_lt.expected.all rename to tests/correctness/unit/int/int_lt.expected.all diff --git a/tests/correctness/unit/int_lt.expected.any b/tests/correctness/unit/int/int_lt.expected.any similarity index 100% rename from tests/correctness/unit/int_lt.expected.any rename to tests/correctness/unit/int/int_lt.expected.any diff --git a/tests/correctness/unit/int_lt.expected.none b/tests/correctness/unit/int/int_lt.expected.none similarity index 100% rename from tests/correctness/unit/int_lt.expected.none rename to tests/correctness/unit/int/int_lt.expected.none diff --git a/tests/correctness/unit/int_lt.expected.stats b/tests/correctness/unit/int/int_lt.expected.stats similarity index 100% rename from tests/correctness/unit/int_lt.expected.stats rename to tests/correctness/unit/int/int_lt.expected.stats diff --git a/tests/correctness/unit/int_lt.lp b/tests/correctness/unit/int/int_lt.lp similarity index 100% rename from tests/correctness/unit/int_lt.lp rename to tests/correctness/unit/int/int_lt.lp diff --git a/tests/correctness/unit/int_max.expected.all b/tests/correctness/unit/int/int_max.expected.all similarity index 100% rename from tests/correctness/unit/int_max.expected.all rename to tests/correctness/unit/int/int_max.expected.all diff --git a/tests/correctness/unit/int_max.expected.any b/tests/correctness/unit/int/int_max.expected.any similarity index 100% rename from tests/correctness/unit/int_max.expected.any rename to tests/correctness/unit/int/int_max.expected.any diff --git a/tests/correctness/unit/int_max.expected.none b/tests/correctness/unit/int/int_max.expected.none similarity index 100% rename from tests/correctness/unit/int_max.expected.none rename to tests/correctness/unit/int/int_max.expected.none diff --git a/tests/correctness/unit/int_max.expected.stats b/tests/correctness/unit/int/int_max.expected.stats similarity index 100% rename from tests/correctness/unit/int_max.expected.stats rename to tests/correctness/unit/int/int_max.expected.stats diff --git a/tests/correctness/unit/int_max.lp b/tests/correctness/unit/int/int_max.lp similarity index 100% rename from tests/correctness/unit/int_max.lp rename to tests/correctness/unit/int/int_max.lp diff --git a/tests/correctness/unit/int_min.expected.all b/tests/correctness/unit/int/int_min.expected.all similarity index 100% rename from tests/correctness/unit/int_min.expected.all rename to tests/correctness/unit/int/int_min.expected.all diff --git a/tests/correctness/unit/int_min.expected.any b/tests/correctness/unit/int/int_min.expected.any similarity index 100% rename from tests/correctness/unit/int_min.expected.any rename to tests/correctness/unit/int/int_min.expected.any diff --git a/tests/correctness/unit/int_min.expected.none b/tests/correctness/unit/int/int_min.expected.none similarity index 100% rename from tests/correctness/unit/int_min.expected.none rename to tests/correctness/unit/int/int_min.expected.none diff --git a/tests/correctness/unit/int_min.expected.stats b/tests/correctness/unit/int/int_min.expected.stats similarity index 100% rename from tests/correctness/unit/int_min.expected.stats rename to tests/correctness/unit/int/int_min.expected.stats diff --git a/tests/correctness/unit/int_min.lp b/tests/correctness/unit/int/int_min.lp similarity index 100% rename from tests/correctness/unit/int_min.lp rename to tests/correctness/unit/int/int_min.lp diff --git a/tests/correctness/unit/int_add.expected.all b/tests/correctness/unit/int_add.expected.all deleted file mode 100644 index ee5f567f..00000000 --- a/tests/correctness/unit/int_add.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(add,(val(int,2),(val(bool,true),())),val(int,3)) -evaluated(add,(val(int,2),(val(bool,false),())),val(int,2)) -evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,0)) -evaluated(add,(val(int,2),(val(none,none),())),bad) -evaluated(add,(val(int,2),(bad,())),bad) diff --git a/tests/correctness/unit/int_add.expected.any b/tests/correctness/unit/int_add.expected.any deleted file mode 100644 index b3122d29..00000000 --- a/tests/correctness/unit/int_add.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(add,(variable(x),(val(int,3),())),val(int,5)) -evaluated(add,(variable(x),(val(int,3),())),bad) -evaluated(add,(variable(x),(val(none,none),())),bad) -evaluated(add,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/int_add.expected.none b/tests/correctness/unit/int_add.expected.none deleted file mode 100644 index 5fbf826d..00000000 --- a/tests/correctness/unit/int_add.expected.none +++ /dev/null @@ -1,13 +0,0 @@ -evaluated(add,(val(int,2),(val(bool,true),())),bad) -evaluated(add,(val(int,2),(val(bool,true),())),val(none,none)) -evaluated(add,(val(int,2),(val(bool,true),())),val(int,2)) -evaluated(add,(val(int,2),(val(bool,false),())),bad) -evaluated(add,(val(int,2),(val(bool,false),())),val(none,none)) -evaluated(add,(val(int,2),(val(bool,false),())),val(int,3)) -evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),bad) -evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),val(none,none)) -evaluated(add,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,-1)) -evaluated(add,(val(int,2),(val(none,none),())),val(none,none)) -evaluated(add,(val(int,2),(val(none,none),())),val(int,2)) -evaluated(add,(val(int,2),(bad,())),val(none,none)) -evaluated(add,(val(int,2),(bad,())),val(int,2)) diff --git a/tests/correctness/unit/int_add.expected.stats b/tests/correctness/unit/int_add.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/int_add.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/int_mult.expected.all b/tests/correctness/unit/int_mult.expected.all deleted file mode 100644 index 1eb130c2..00000000 --- a/tests/correctness/unit/int_mult.expected.all +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,-6)) -evaluated(mult,(val(int,2),(val(bool,false),())),val(int,0)) -evaluated(mult,(val(int,0),(bad,())),bad) -evaluated(mult,(val(int,2),(val(none,none),())),bad) -evaluated(mult,(val(int,2),(bad,())),bad) diff --git a/tests/correctness/unit/int_mult.expected.any b/tests/correctness/unit/int_mult.expected.any deleted file mode 100644 index e4c5a067..00000000 --- a/tests/correctness/unit/int_mult.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(mult,(variable(x),(val(int,3),())),val(int,6)) -evaluated(mult,(variable(x),(val(int,3),())),bad) -evaluated(mult,(variable(x),(val(none,none),())),bad) -evaluated(mult,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/int_mult.expected.none b/tests/correctness/unit/int_mult.expected.none deleted file mode 100644 index f59cb1c6..00000000 --- a/tests/correctness/unit/int_mult.expected.none +++ /dev/null @@ -1,13 +0,0 @@ -evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),bad) -evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),val(none,none)) -evaluated(mult,(val(int,-3),(val(int,2),(val(bool,true),()))),val(int,6)) -evaluated(mult,(val(int,2),(val(bool,false),())),bad) -evaluated(mult,(val(int,2),(val(bool,false),())),val(none,none)) -evaluated(mult,(val(int,2),(val(bool,false),())),val(int,2)) -evaluated(mult,(val(int,0),(bad,())),val(none,none)) -evaluated(mult,(val(int,0),(bad,())),val(int,0)) -evaluated(mult,(val(int,0),(bad,())),val(int,1)) -evaluated(mult,(val(int,2),(val(none,none),())),val(none,none)) -evaluated(mult,(val(int,2),(val(none,none),())),val(int,2)) -evaluated(mult,(val(int,2),(bad,())),val(none,none)) -evaluated(mult,(val(int,2),(bad,())),val(int,2)) diff --git a/tests/correctness/unit/int_mult.expected.stats b/tests/correctness/unit/int_mult.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/int_mult.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/int_mult.lp b/tests/correctness/unit/int_mult.lp deleted file mode 100644 index 9ed32b5e..00000000 --- a/tests/correctness/unit/int_mult.lp +++ /dev/null @@ -1,16 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(mult,(val(int,-3),(val(int,2),(val(bool,true),())))). -evaluate(mult,(val(int,2),(val(bool,false),()))). -evaluate(mult,(val(int,0),(bad,()))). -evaluate(mult,(val(int,2),(val(none,none),()))). -evaluate(mult,(val(int,2),(bad,()))). - - -variable_declare(x,fromFacts). -variable_domain(x,val(int,2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(mult,(variable(x),(val(int,3),()))). -evaluate(mult,(variable(x),(val(none,none),()))). -evaluate(mult,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/int_pow.expected.all b/tests/correctness/unit/int_pow.expected.all deleted file mode 100644 index 6073e84f..00000000 --- a/tests/correctness/unit/int_pow.expected.all +++ /dev/null @@ -1,7 +0,0 @@ -evaluated(pow,(val(int,2),(val(int,3),())),val(int,8)) -evaluated(pow,(val(int,-3),(val(int,2),())),val(int,9)) -evaluated(pow,(val(none,none),(val(int,0),())),val(int,1)) -evaluated(pow,(bad,(val(int,0),())),val(int,1)) -evaluated(pow,(val(int,2),(val(none,none),())),bad) -evaluated(pow,(val(int,2),(bad,())),bad) -evaluated(pow,(bad,(val(int,3),())),bad) diff --git a/tests/correctness/unit/int_pow.expected.none b/tests/correctness/unit/int_pow.expected.none deleted file mode 100644 index e45e083e..00000000 --- a/tests/correctness/unit/int_pow.expected.none +++ /dev/null @@ -1,18 +0,0 @@ -evaluated(pow,(val(int,2),(val(int,3),())),bad) -evaluated(pow,(val(int,2),(val(int,3),())),val(none,none)) -evaluated(pow,(val(int,2),(val(int,3),())),val(int,6)) -evaluated(pow,(val(int,-3),(val(int,2),())),bad) -evaluated(pow,(val(int,-3),(val(int,2),())),val(none,none)) -evaluated(pow,(val(int,-3),(val(int,2),())),val(int,-9)) -evaluated(pow,(val(none,none),(val(int,0),())),bad) -evaluated(pow,(val(none,none),(val(int,0),())),val(none,none)) -evaluated(pow,(val(none,none),(val(int,0),())),val(int,0)) -evaluated(pow,(bad,(val(int,0),())),bad) -evaluated(pow,(bad,(val(int,0),())),val(none,none)) -evaluated(pow,(bad,(val(int,0),())),val(int,0)) -evaluated(pow,(val(int,2),(val(none,none),())),val(none,none)) -evaluated(pow,(val(int,2),(val(none,none),())),val(int,1)) -evaluated(pow,(val(int,2),(bad,())),val(none,none)) -evaluated(pow,(val(int,2),(bad,())),val(int,1)) -evaluated(pow,(bad,(val(int,3),())),val(none,none)) -evaluated(pow,(bad,(val(int,3),())),val(int,1)) diff --git a/tests/correctness/unit/int_pow.expected.stats b/tests/correctness/unit/int_pow.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/int_pow.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/int_pow.lp b/tests/correctness/unit/int_pow.lp deleted file mode 100644 index b30d526f..00000000 --- a/tests/correctness/unit/int_pow.lp +++ /dev/null @@ -1,18 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(pow,(val(int,2),(val(int,3),()))). -evaluate(pow,(val(int,-3),(val(int,2),()))). -evaluate(pow,(val(none,none),(val(int,0),()))). -evaluate(pow,(bad,(val(int,0),()))). -evaluate(pow,(val(int,2),(val(none,none),()))). -evaluate(pow,(val(int,2),(bad,()))). -evaluate(pow,(bad,(val(int,3),()))). - - -variable_declare(x,fromFacts). -variable_domain(x,val(int,2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(pow,(variable(x),(val(int,3),()))). -evaluate(pow,(variable(x),(val(none,none),()))). -evaluate(pow,(variable(x),(bad,()))). diff --git a/tests/correctness/unit/int_sub.expected.all b/tests/correctness/unit/int_sub.expected.all deleted file mode 100644 index 1be1f6e3..00000000 --- a/tests/correctness/unit/int_sub.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(sub,(val(int,2),(val(int,-3),())),val(int,5)) -evaluated(sub,(val(int,-3),(val(int,2),())),val(int,-5)) -evaluated(sub,(val(none,none),(val(int,2),())),bad) -evaluated(sub,(val(int,2),(bad,())),bad) diff --git a/tests/correctness/unit/int_sub.expected.stats b/tests/correctness/unit/int_sub.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/int_sub.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/nullary/boolean_conj.expected.all b/tests/correctness/unit/nullary/boolean_conj.expected.all deleted file mode 100644 index 689fd29e..00000000 --- a/tests/correctness/unit/nullary/boolean_conj.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(conj,(),val(bool,true)) diff --git a/tests/correctness/unit/nullary/boolean_conj.expected.none b/tests/correctness/unit/nullary/boolean_conj.expected.none deleted file mode 100644 index d84192e8..00000000 --- a/tests/correctness/unit/nullary/boolean_conj.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(conj,(),val(bool,false)) -evaluated(conj,(),val(none,none)) -evaluated(conj,(),bad) diff --git a/tests/correctness/unit/nullary/boolean_conj.lp b/tests/correctness/unit/nullary/boolean_conj.lp deleted file mode 100644 index d2777ed1..00000000 --- a/tests/correctness/unit/nullary/boolean_conj.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(conj,()). diff --git a/tests/correctness/unit/nullary/boolean_disj.expected.all b/tests/correctness/unit/nullary/boolean_disj.expected.all deleted file mode 100644 index 3554bdba..00000000 --- a/tests/correctness/unit/nullary/boolean_disj.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(disj,(),val(bool,false)) diff --git a/tests/correctness/unit/nullary/boolean_disj.expected.none b/tests/correctness/unit/nullary/boolean_disj.expected.none deleted file mode 100644 index 5d318673..00000000 --- a/tests/correctness/unit/nullary/boolean_disj.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(disj,(),val(bool,true)) -evaluated(disj,(),val(none,none)) -evaluated(disj,(),bad) diff --git a/tests/correctness/unit/nullary/boolean_disj.lp b/tests/correctness/unit/nullary/boolean_disj.lp deleted file mode 100644 index 0682c15f..00000000 --- a/tests/correctness/unit/nullary/boolean_disj.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(disj,()). diff --git a/tests/correctness/unit/nullary/boolean_leqv.expected.all b/tests/correctness/unit/nullary/boolean_leqv.expected.all deleted file mode 100644 index 20934474..00000000 --- a/tests/correctness/unit/nullary/boolean_leqv.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(leqv,(),val(bool,true)) diff --git a/tests/correctness/unit/nullary/boolean_leqv.expected.none b/tests/correctness/unit/nullary/boolean_leqv.expected.none deleted file mode 100644 index 5f8c6129..00000000 --- a/tests/correctness/unit/nullary/boolean_leqv.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(leqv,(),val(bool,false)) -evaluated(leqv,(),val(none,none)) -evaluated(leqv,(),bad) diff --git a/tests/correctness/unit/nullary/boolean_leqv.lp b/tests/correctness/unit/nullary/boolean_leqv.lp deleted file mode 100644 index f0edee61..00000000 --- a/tests/correctness/unit/nullary/boolean_leqv.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(leqv,()). diff --git a/tests/correctness/unit/nullary/boolean_lxor.expected.all b/tests/correctness/unit/nullary/boolean_lxor.expected.all deleted file mode 100644 index c6b5f996..00000000 --- a/tests/correctness/unit/nullary/boolean_lxor.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(lxor,(),val(bool,false)) diff --git a/tests/correctness/unit/nullary/boolean_lxor.expected.none b/tests/correctness/unit/nullary/boolean_lxor.expected.none deleted file mode 100644 index d9b150b6..00000000 --- a/tests/correctness/unit/nullary/boolean_lxor.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(lxor,(),val(bool,true)) -evaluated(lxor,(),val(none,none)) -evaluated(lxor,(),bad) diff --git a/tests/correctness/unit/nullary/boolean_lxor.lp b/tests/correctness/unit/nullary/boolean_lxor.lp deleted file mode 100644 index b1785445..00000000 --- a/tests/correctness/unit/nullary/boolean_lxor.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(lxor,()). diff --git a/tests/correctness/unit/nullary/float_add.expected.all b/tests/correctness/unit/nullary/float_add.expected.all deleted file mode 100644 index 130919af..00000000 --- a/tests/correctness/unit/nullary/float_add.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(add,(),val(int,0)) diff --git a/tests/correctness/unit/nullary/float_add.expected.none b/tests/correctness/unit/nullary/float_add.expected.none deleted file mode 100644 index 9d32da3e..00000000 --- a/tests/correctness/unit/nullary/float_add.expected.none +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(add,(),bad) -evaluated(add,(),val(float,float("0.0"))) diff --git a/tests/correctness/unit/nullary/float_add.lp b/tests/correctness/unit/nullary/float_add.lp deleted file mode 100644 index 430e20de..00000000 --- a/tests/correctness/unit/nullary/float_add.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(add,()). diff --git a/tests/correctness/unit/nullary/float_mult.expected.all b/tests/correctness/unit/nullary/float_mult.expected.all deleted file mode 100644 index 9a40686a..00000000 --- a/tests/correctness/unit/nullary/float_mult.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(mult,(),val(int,1)) diff --git a/tests/correctness/unit/nullary/float_mult.expected.none b/tests/correctness/unit/nullary/float_mult.expected.none deleted file mode 100644 index e616b541..00000000 --- a/tests/correctness/unit/nullary/float_mult.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(mult,(),bad) -evaluated(mult,(),val(none,none)) -evaluated(mult,(),val(int,0)) diff --git a/tests/correctness/unit/nullary/float_mult.lp b/tests/correctness/unit/nullary/float_mult.lp deleted file mode 100644 index ba47a5be..00000000 --- a/tests/correctness/unit/nullary/float_mult.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(mult,()). diff --git a/tests/correctness/unit/nullary/int_add.expected.all b/tests/correctness/unit/nullary/int_add.expected.all deleted file mode 100644 index 130919af..00000000 --- a/tests/correctness/unit/nullary/int_add.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(add,(),val(int,0)) diff --git a/tests/correctness/unit/nullary/int_add.expected.none b/tests/correctness/unit/nullary/int_add.expected.none deleted file mode 100644 index 7cebb9b1..00000000 --- a/tests/correctness/unit/nullary/int_add.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(add,(),bad) -evaluated(add,(),val(none,none)) -evaluated(add,(),val(int,1)) diff --git a/tests/correctness/unit/nullary/int_add.lp b/tests/correctness/unit/nullary/int_add.lp deleted file mode 100644 index 430e20de..00000000 --- a/tests/correctness/unit/nullary/int_add.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(add,()). diff --git a/tests/correctness/unit/nullary/int_mult.expected.all b/tests/correctness/unit/nullary/int_mult.expected.all deleted file mode 100644 index 9a40686a..00000000 --- a/tests/correctness/unit/nullary/int_mult.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(mult,(),val(int,1)) diff --git a/tests/correctness/unit/nullary/int_mult.expected.none b/tests/correctness/unit/nullary/int_mult.expected.none deleted file mode 100644 index e616b541..00000000 --- a/tests/correctness/unit/nullary/int_mult.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(mult,(),bad) -evaluated(mult,(),val(none,none)) -evaluated(mult,(),val(int,0)) diff --git a/tests/correctness/unit/nullary/int_mult.lp b/tests/correctness/unit/nullary/int_mult.lp deleted file mode 100644 index ba47a5be..00000000 --- a/tests/correctness/unit/nullary/int_mult.lp +++ /dev/null @@ -1,2 +0,0 @@ - -evaluate(mult,()). diff --git a/tests/correctness/unit/set_diff.expected.all b/tests/correctness/unit/set/set_diff.expected.all similarity index 100% rename from tests/correctness/unit/set_diff.expected.all rename to tests/correctness/unit/set/set_diff.expected.all diff --git a/tests/correctness/unit/set_diff.expected.any b/tests/correctness/unit/set/set_diff.expected.any similarity index 100% rename from tests/correctness/unit/set_diff.expected.any rename to tests/correctness/unit/set/set_diff.expected.any diff --git a/tests/correctness/unit/set_diff.expected.none b/tests/correctness/unit/set/set_diff.expected.none similarity index 100% rename from tests/correctness/unit/set_diff.expected.none rename to tests/correctness/unit/set/set_diff.expected.none diff --git a/tests/correctness/unit/set_diff.expected.stats b/tests/correctness/unit/set/set_diff.expected.stats similarity index 100% rename from tests/correctness/unit/set_diff.expected.stats rename to tests/correctness/unit/set/set_diff.expected.stats diff --git a/tests/correctness/unit/set_diff.lp b/tests/correctness/unit/set/set_diff.lp similarity index 100% rename from tests/correctness/unit/set_diff.lp rename to tests/correctness/unit/set/set_diff.lp diff --git a/tests/correctness/unit/set_eq.expected.all b/tests/correctness/unit/set/set_eq.expected.all similarity index 100% rename from tests/correctness/unit/set_eq.expected.all rename to tests/correctness/unit/set/set_eq.expected.all diff --git a/tests/correctness/unit/set_eq.expected.any b/tests/correctness/unit/set/set_eq.expected.any similarity index 100% rename from tests/correctness/unit/set_eq.expected.any rename to tests/correctness/unit/set/set_eq.expected.any diff --git a/tests/correctness/unit/set_eq.expected.none b/tests/correctness/unit/set/set_eq.expected.none similarity index 100% rename from tests/correctness/unit/set_eq.expected.none rename to tests/correctness/unit/set/set_eq.expected.none diff --git a/tests/correctness/unit/set_eq.expected.stats b/tests/correctness/unit/set/set_eq.expected.stats similarity index 100% rename from tests/correctness/unit/set_eq.expected.stats rename to tests/correctness/unit/set/set_eq.expected.stats diff --git a/tests/correctness/unit/set_eq.lp b/tests/correctness/unit/set/set_eq.lp similarity index 100% rename from tests/correctness/unit/set_eq.lp rename to tests/correctness/unit/set/set_eq.lp diff --git a/tests/correctness/unit/set_inter.expected.all b/tests/correctness/unit/set/set_inter.expected.all similarity index 100% rename from tests/correctness/unit/set_inter.expected.all rename to tests/correctness/unit/set/set_inter.expected.all diff --git a/tests/correctness/unit/set_inter.expected.any b/tests/correctness/unit/set/set_inter.expected.any similarity index 100% rename from tests/correctness/unit/set_inter.expected.any rename to tests/correctness/unit/set/set_inter.expected.any diff --git a/tests/correctness/unit/set_inter.expected.none b/tests/correctness/unit/set/set_inter.expected.none similarity index 100% rename from tests/correctness/unit/set_inter.expected.none rename to tests/correctness/unit/set/set_inter.expected.none diff --git a/tests/correctness/unit/set_inter.expected.stats b/tests/correctness/unit/set/set_inter.expected.stats similarity index 100% rename from tests/correctness/unit/set_inter.expected.stats rename to tests/correctness/unit/set/set_inter.expected.stats diff --git a/tests/correctness/unit/set_inter.lp b/tests/correctness/unit/set/set_inter.lp similarity index 100% rename from tests/correctness/unit/set_inter.lp rename to tests/correctness/unit/set/set_inter.lp diff --git a/tests/correctness/unit/set_neq.expected.all b/tests/correctness/unit/set/set_neq.expected.all similarity index 100% rename from tests/correctness/unit/set_neq.expected.all rename to tests/correctness/unit/set/set_neq.expected.all diff --git a/tests/correctness/unit/set_neq.expected.any b/tests/correctness/unit/set/set_neq.expected.any similarity index 100% rename from tests/correctness/unit/set_neq.expected.any rename to tests/correctness/unit/set/set_neq.expected.any diff --git a/tests/correctness/unit/set_neq.expected.none b/tests/correctness/unit/set/set_neq.expected.none similarity index 100% rename from tests/correctness/unit/set_neq.expected.none rename to tests/correctness/unit/set/set_neq.expected.none diff --git a/tests/correctness/unit/set_neq.expected.stats b/tests/correctness/unit/set/set_neq.expected.stats similarity index 100% rename from tests/correctness/unit/set_neq.expected.stats rename to tests/correctness/unit/set/set_neq.expected.stats diff --git a/tests/correctness/unit/set_neq.lp b/tests/correctness/unit/set/set_neq.lp similarity index 100% rename from tests/correctness/unit/set_neq.lp rename to tests/correctness/unit/set/set_neq.lp diff --git a/tests/correctness/unit/set_set_isin.expected.all b/tests/correctness/unit/set/set_set_isin.expected.all similarity index 100% rename from tests/correctness/unit/set_set_isin.expected.all rename to tests/correctness/unit/set/set_set_isin.expected.all diff --git a/tests/correctness/unit/set_set_isin.expected.any b/tests/correctness/unit/set/set_set_isin.expected.any similarity index 100% rename from tests/correctness/unit/set_set_isin.expected.any rename to tests/correctness/unit/set/set_set_isin.expected.any diff --git a/tests/correctness/unit/set_set_isin.expected.none b/tests/correctness/unit/set/set_set_isin.expected.none similarity index 100% rename from tests/correctness/unit/set_set_isin.expected.none rename to tests/correctness/unit/set/set_set_isin.expected.none diff --git a/tests/correctness/unit/set_set_isin.expected.stats b/tests/correctness/unit/set/set_set_isin.expected.stats similarity index 100% rename from tests/correctness/unit/set_set_isin.expected.stats rename to tests/correctness/unit/set/set_set_isin.expected.stats diff --git a/tests/correctness/unit/set_set_isin.lp b/tests/correctness/unit/set/set_set_isin.lp similarity index 100% rename from tests/correctness/unit/set_set_isin.lp rename to tests/correctness/unit/set/set_set_isin.lp diff --git a/tests/correctness/unit/set_set_make.expected.all b/tests/correctness/unit/set/set_set_make.expected.all similarity index 100% rename from tests/correctness/unit/set_set_make.expected.all rename to tests/correctness/unit/set/set_set_make.expected.all diff --git a/tests/correctness/unit/set_set_make.expected.any b/tests/correctness/unit/set/set_set_make.expected.any similarity index 100% rename from tests/correctness/unit/set_set_make.expected.any rename to tests/correctness/unit/set/set_set_make.expected.any diff --git a/tests/correctness/unit/set_set_make.expected.none b/tests/correctness/unit/set/set_set_make.expected.none similarity index 100% rename from tests/correctness/unit/set_set_make.expected.none rename to tests/correctness/unit/set/set_set_make.expected.none diff --git a/tests/correctness/unit/set_set_make.expected.stats b/tests/correctness/unit/set/set_set_make.expected.stats similarity index 100% rename from tests/correctness/unit/set_set_make.expected.stats rename to tests/correctness/unit/set/set_set_make.expected.stats diff --git a/tests/correctness/unit/set_set_make.lp b/tests/correctness/unit/set/set_set_make.lp similarity index 100% rename from tests/correctness/unit/set_set_make.lp rename to tests/correctness/unit/set/set_set_make.lp diff --git a/tests/correctness/unit/set_set_notin.expected.all b/tests/correctness/unit/set/set_set_notin.expected.all similarity index 100% rename from tests/correctness/unit/set_set_notin.expected.all rename to tests/correctness/unit/set/set_set_notin.expected.all diff --git a/tests/correctness/unit/set_set_notin.expected.any b/tests/correctness/unit/set/set_set_notin.expected.any similarity index 100% rename from tests/correctness/unit/set_set_notin.expected.any rename to tests/correctness/unit/set/set_set_notin.expected.any diff --git a/tests/correctness/unit/set_set_notin.expected.none b/tests/correctness/unit/set/set_set_notin.expected.none similarity index 100% rename from tests/correctness/unit/set_set_notin.expected.none rename to tests/correctness/unit/set/set_set_notin.expected.none diff --git a/tests/correctness/unit/set_set_notin.expected.stats b/tests/correctness/unit/set/set_set_notin.expected.stats similarity index 100% rename from tests/correctness/unit/set_set_notin.expected.stats rename to tests/correctness/unit/set/set_set_notin.expected.stats diff --git a/tests/correctness/unit/set_set_notin.lp b/tests/correctness/unit/set/set_set_notin.lp similarity index 100% rename from tests/correctness/unit/set_set_notin.lp rename to tests/correctness/unit/set/set_set_notin.lp diff --git a/tests/correctness/unit/set_subset.expected.all b/tests/correctness/unit/set/set_subset.expected.all similarity index 100% rename from tests/correctness/unit/set_subset.expected.all rename to tests/correctness/unit/set/set_subset.expected.all diff --git a/tests/correctness/unit/set_subset.expected.any b/tests/correctness/unit/set/set_subset.expected.any similarity index 100% rename from tests/correctness/unit/set_subset.expected.any rename to tests/correctness/unit/set/set_subset.expected.any diff --git a/tests/correctness/unit/set_subset.expected.none b/tests/correctness/unit/set/set_subset.expected.none similarity index 100% rename from tests/correctness/unit/set_subset.expected.none rename to tests/correctness/unit/set/set_subset.expected.none diff --git a/tests/correctness/unit/set_subset.expected.stats b/tests/correctness/unit/set/set_subset.expected.stats similarity index 100% rename from tests/correctness/unit/set_subset.expected.stats rename to tests/correctness/unit/set/set_subset.expected.stats diff --git a/tests/correctness/unit/set_subset.lp b/tests/correctness/unit/set/set_subset.lp similarity index 100% rename from tests/correctness/unit/set_subset.lp rename to tests/correctness/unit/set/set_subset.lp diff --git a/tests/correctness/unit/set_union.expected.all b/tests/correctness/unit/set/set_union.expected.all similarity index 100% rename from tests/correctness/unit/set_union.expected.all rename to tests/correctness/unit/set/set_union.expected.all diff --git a/tests/correctness/unit/set_union.expected.any b/tests/correctness/unit/set/set_union.expected.any similarity index 100% rename from tests/correctness/unit/set_union.expected.any rename to tests/correctness/unit/set/set_union.expected.any diff --git a/tests/correctness/unit/set_union.expected.none b/tests/correctness/unit/set/set_union.expected.none similarity index 100% rename from tests/correctness/unit/set_union.expected.none rename to tests/correctness/unit/set/set_union.expected.none diff --git a/tests/correctness/unit/set_union.expected.stats b/tests/correctness/unit/set/set_union.expected.stats similarity index 100% rename from tests/correctness/unit/set_union.expected.stats rename to tests/correctness/unit/set/set_union.expected.stats diff --git a/tests/correctness/unit/set_union.lp b/tests/correctness/unit/set/set_union.lp similarity index 100% rename from tests/correctness/unit/set_union.lp rename to tests/correctness/unit/set/set_union.lp diff --git a/tests/correctness/unit/string_concat.expected.any b/tests/correctness/unit/string_concat.expected.any deleted file mode 100644 index c02d16c2..00000000 --- a/tests/correctness/unit/string_concat.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(concat,(variable(x),(val(string,"c"),())),val(string,"abc")) -evaluated(concat,(variable(x),(val(string,"c"),())),bad) -evaluated(concat,(variable(x),(val(none,none),())),bad) -evaluated(concat,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/string_concat.expected.stats b/tests/correctness/unit/string_concat.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/string_concat.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/string_concat.lp b/tests/correctness/unit/string_concat.lp deleted file mode 100644 index 5fd542be..00000000 --- a/tests/correctness/unit/string_concat.lp +++ /dev/null @@ -1,17 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(string,"ab")). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(concat,(variable(x),(val(string,"c"),()))). -evaluate(concat,(variable(x),(val(none,none),()))). -evaluate(concat,(variable(x),(bad,()))). - - -evaluate(concat,(val(string,"ab"),(val(string,"c"),()))). -evaluate(concat,(val(string,""),(val(string,"c"),()))). -evaluate(concat,(val(string,"ab"),(val(string,""),()))). -evaluate(concat,(val(none,none),(val(string,"c"),()))). -evaluate(concat,(val(string,"ab"),(val(none,none),()))). -evaluate(concat,(bad,(val(string,"c"),()))). diff --git a/tests/correctness/unit/string_geq.expected.any b/tests/correctness/unit/string_geq.expected.any deleted file mode 100644 index 7a57cf2e..00000000 --- a/tests/correctness/unit/string_geq.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(geq,(variable(x),(val(string,"aa"),())),val(bool,true)) -evaluated(geq,(variable(x),(val(string,"aa"),())),bad) -evaluated(geq,(variable(x),(val(none,none),())),bad) -evaluated(geq,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/string_geq.expected.stats b/tests/correctness/unit/string_geq.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/string_geq.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/string_geq.lp b/tests/correctness/unit/string_geq.lp deleted file mode 100644 index c157f868..00000000 --- a/tests/correctness/unit/string_geq.lp +++ /dev/null @@ -1,17 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(string,"ab")). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(geq,(variable(x),(val(string,"aa"),()))). -evaluate(geq,(variable(x),(val(none,none),()))). -evaluate(geq,(variable(x),(bad,()))). - - -evaluate(geq,(val(string,"ab"),(val(string,"aa"),()))). -evaluate(geq,(val(string,"aa"),(val(string,"ab"),()))). -evaluate(geq,(val(string,"aa"),(val(string,"aa"),()))). -evaluate(geq,(val(none,none),(val(string,"ab"),()))). -evaluate(geq,(val(string,"aa"),(val(none,none),()))). -evaluate(geq,(val(string,"aa"),(bad,()))). diff --git a/tests/correctness/unit/string_gt.expected.any b/tests/correctness/unit/string_gt.expected.any deleted file mode 100644 index 12629e40..00000000 --- a/tests/correctness/unit/string_gt.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(gt,(variable(x),(val(string,"aa"),())),val(bool,true)) -evaluated(gt,(variable(x),(val(string,"aa"),())),bad) -evaluated(gt,(variable(x),(val(none,none),())),bad) -evaluated(gt,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/string_gt.expected.stats b/tests/correctness/unit/string_gt.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/string_gt.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/string_gt.lp b/tests/correctness/unit/string_gt.lp deleted file mode 100644 index b6de0387..00000000 --- a/tests/correctness/unit/string_gt.lp +++ /dev/null @@ -1,17 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(string,"ab")). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(gt,(variable(x),(val(string,"aa"),()))). -evaluate(gt,(variable(x),(val(none,none),()))). -evaluate(gt,(variable(x),(bad,()))). - - -evaluate(gt,(val(string,"ab"),(val(string,"aa"),()))). -evaluate(gt,(val(string,"aa"),(val(string,"ab"),()))). -evaluate(gt,(val(string,"aa"),(val(string,"aa"),()))). -evaluate(gt,(val(none,none),(val(string,"ab"),()))). -evaluate(gt,(val(string,"aa"),(val(none,none),()))). -evaluate(gt,(val(string,"aa"),(bad,()))). diff --git a/tests/correctness/unit/string_leq.expected.any b/tests/correctness/unit/string_leq.expected.any deleted file mode 100644 index 04500ae5..00000000 --- a/tests/correctness/unit/string_leq.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(leq,(variable(x),(val(string,"aa"),())),val(bool,false)) -evaluated(leq,(variable(x),(val(string,"aa"),())),bad) -evaluated(leq,(variable(x),(val(none,none),())),bad) -evaluated(leq,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/string_leq.expected.stats b/tests/correctness/unit/string_leq.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/string_leq.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/string_leq.lp b/tests/correctness/unit/string_leq.lp deleted file mode 100644 index b5584a7a..00000000 --- a/tests/correctness/unit/string_leq.lp +++ /dev/null @@ -1,17 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(string,"ab")). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(leq,(variable(x),(val(string,"aa"),()))). -evaluate(leq,(variable(x),(val(none,none),()))). -evaluate(leq,(variable(x),(bad,()))). - - -evaluate(leq,(val(string,"aa"),(val(string,"ab"),()))). -evaluate(leq,(val(string,"ab"),(val(string,"aa"),()))). -evaluate(leq,(val(string,"aa"),(val(string,"aa"),()))). -evaluate(leq,(val(none,none),(val(string,"ab"),()))). -evaluate(leq,(val(string,"aa"),(val(none,none),()))). -evaluate(leq,(val(string,"aa"),(bad,()))). diff --git a/tests/correctness/unit/string_lt.expected.any b/tests/correctness/unit/string_lt.expected.any deleted file mode 100644 index ff114a3f..00000000 --- a/tests/correctness/unit/string_lt.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lt,(variable(x),(val(string,"aa"),())),val(bool,false)) -evaluated(lt,(variable(x),(val(string,"aa"),())),bad) -evaluated(lt,(variable(x),(val(none,none),())),bad) -evaluated(lt,(variable(x),(bad,())),bad) diff --git a/tests/correctness/unit/string_lt.expected.stats b/tests/correctness/unit/string_lt.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/string_lt.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/string_lt.lp b/tests/correctness/unit/string_lt.lp deleted file mode 100644 index 34583d05..00000000 --- a/tests/correctness/unit/string_lt.lp +++ /dev/null @@ -1,17 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(string,"ab")). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(lt,(variable(x),(val(string,"aa"),()))). -evaluate(lt,(variable(x),(val(none,none),()))). -evaluate(lt,(variable(x),(bad,()))). - - -evaluate(lt,(val(string,"aa"),(val(string,"ab"),()))). -evaluate(lt,(val(string,"ab"),(val(string,"aa"),()))). -evaluate(lt,(val(string,"aa"),(val(string,"aa"),()))). -evaluate(lt,(val(none,none),(val(string,"ab"),()))). -evaluate(lt,(val(string,"aa"),(val(none,none),()))). -evaluate(lt,(val(string,"aa"),(bad,()))). diff --git a/tests/correctness/unit/symbol_geq.expected.all b/tests/correctness/unit/symbol/symbol_geq.expected.all similarity index 100% rename from tests/correctness/unit/symbol_geq.expected.all rename to tests/correctness/unit/symbol/symbol_geq.expected.all diff --git a/tests/correctness/unit/symbol_geq.expected.any b/tests/correctness/unit/symbol/symbol_geq.expected.any similarity index 100% rename from tests/correctness/unit/symbol_geq.expected.any rename to tests/correctness/unit/symbol/symbol_geq.expected.any diff --git a/tests/correctness/unit/symbol_geq.expected.none b/tests/correctness/unit/symbol/symbol_geq.expected.none similarity index 100% rename from tests/correctness/unit/symbol_geq.expected.none rename to tests/correctness/unit/symbol/symbol_geq.expected.none diff --git a/tests/correctness/unit/symbol_geq.expected.stats b/tests/correctness/unit/symbol/symbol_geq.expected.stats similarity index 100% rename from tests/correctness/unit/symbol_geq.expected.stats rename to tests/correctness/unit/symbol/symbol_geq.expected.stats diff --git a/tests/correctness/unit/symbol_geq.lp b/tests/correctness/unit/symbol/symbol_geq.lp similarity index 100% rename from tests/correctness/unit/symbol_geq.lp rename to tests/correctness/unit/symbol/symbol_geq.lp diff --git a/tests/correctness/unit/symbol_gt.expected.all b/tests/correctness/unit/symbol/symbol_gt.expected.all similarity index 100% rename from tests/correctness/unit/symbol_gt.expected.all rename to tests/correctness/unit/symbol/symbol_gt.expected.all diff --git a/tests/correctness/unit/symbol_gt.expected.any b/tests/correctness/unit/symbol/symbol_gt.expected.any similarity index 100% rename from tests/correctness/unit/symbol_gt.expected.any rename to tests/correctness/unit/symbol/symbol_gt.expected.any diff --git a/tests/correctness/unit/symbol_gt.expected.none b/tests/correctness/unit/symbol/symbol_gt.expected.none similarity index 100% rename from tests/correctness/unit/symbol_gt.expected.none rename to tests/correctness/unit/symbol/symbol_gt.expected.none diff --git a/tests/correctness/unit/symbol_gt.expected.stats b/tests/correctness/unit/symbol/symbol_gt.expected.stats similarity index 100% rename from tests/correctness/unit/symbol_gt.expected.stats rename to tests/correctness/unit/symbol/symbol_gt.expected.stats diff --git a/tests/correctness/unit/symbol_gt.lp b/tests/correctness/unit/symbol/symbol_gt.lp similarity index 100% rename from tests/correctness/unit/symbol_gt.lp rename to tests/correctness/unit/symbol/symbol_gt.lp diff --git a/tests/correctness/unit/symbol_leq.expected.all b/tests/correctness/unit/symbol/symbol_leq.expected.all similarity index 100% rename from tests/correctness/unit/symbol_leq.expected.all rename to tests/correctness/unit/symbol/symbol_leq.expected.all diff --git a/tests/correctness/unit/symbol_leq.expected.any b/tests/correctness/unit/symbol/symbol_leq.expected.any similarity index 100% rename from tests/correctness/unit/symbol_leq.expected.any rename to tests/correctness/unit/symbol/symbol_leq.expected.any diff --git a/tests/correctness/unit/symbol_leq.expected.none b/tests/correctness/unit/symbol/symbol_leq.expected.none similarity index 100% rename from tests/correctness/unit/symbol_leq.expected.none rename to tests/correctness/unit/symbol/symbol_leq.expected.none diff --git a/tests/correctness/unit/symbol_leq.expected.stats b/tests/correctness/unit/symbol/symbol_leq.expected.stats similarity index 100% rename from tests/correctness/unit/symbol_leq.expected.stats rename to tests/correctness/unit/symbol/symbol_leq.expected.stats diff --git a/tests/correctness/unit/symbol_leq.lp b/tests/correctness/unit/symbol/symbol_leq.lp similarity index 100% rename from tests/correctness/unit/symbol_leq.lp rename to tests/correctness/unit/symbol/symbol_leq.lp diff --git a/tests/correctness/unit/symbol_lt.expected.all b/tests/correctness/unit/symbol/symbol_lt.expected.all similarity index 100% rename from tests/correctness/unit/symbol_lt.expected.all rename to tests/correctness/unit/symbol/symbol_lt.expected.all diff --git a/tests/correctness/unit/symbol_lt.expected.any b/tests/correctness/unit/symbol/symbol_lt.expected.any similarity index 100% rename from tests/correctness/unit/symbol_lt.expected.any rename to tests/correctness/unit/symbol/symbol_lt.expected.any diff --git a/tests/correctness/unit/symbol_lt.expected.none b/tests/correctness/unit/symbol/symbol_lt.expected.none similarity index 100% rename from tests/correctness/unit/symbol_lt.expected.none rename to tests/correctness/unit/symbol/symbol_lt.expected.none diff --git a/tests/correctness/unit/symbol_lt.expected.stats b/tests/correctness/unit/symbol/symbol_lt.expected.stats similarity index 100% rename from tests/correctness/unit/symbol_lt.expected.stats rename to tests/correctness/unit/symbol/symbol_lt.expected.stats diff --git a/tests/correctness/unit/symbol_lt.lp b/tests/correctness/unit/symbol/symbol_lt.lp similarity index 100% rename from tests/correctness/unit/symbol_lt.lp rename to tests/correctness/unit/symbol/symbol_lt.lp diff --git a/tests/correctness/unit/unary/bad_abs.expected.all b/tests/correctness/unit/unary/bad_abs.expected.all deleted file mode 100644 index 97fcb690..00000000 --- a/tests/correctness/unit/unary/bad_abs.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(abs,(val(int,-2),()),val(int,2)) -evaluated(abs,(val(none,none),()),bad) -evaluated(abs,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_abs.expected.any b/tests/correctness/unit/unary/bad_abs.expected.any deleted file mode 100644 index d20cb45a..00000000 --- a/tests/correctness/unit/unary/bad_abs.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(abs,(variable(x),()),val(int,2)) -evaluated(abs,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_abs.expected.none b/tests/correctness/unit/unary/bad_abs.expected.none deleted file mode 100644 index 4745a199..00000000 --- a/tests/correctness/unit/unary/bad_abs.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(abs,(val(int,-2),()),bad) -evaluated(abs,(val(int,-2),()),val(none,none)) -evaluated(abs,(val(none,none),()),val(int,2)) -evaluated(abs,(val(none,none),()),val(none,none)) -evaluated(abs,(bad,()),val(int,2)) -evaluated(abs,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_abs.expected.stats b/tests/correctness/unit/unary/bad_abs.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/bad_abs.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/bad_abs.lp b/tests/correctness/unit/unary/bad_abs.lp deleted file mode 100644 index 92924e20..00000000 --- a/tests/correctness/unit/unary/bad_abs.lp +++ /dev/null @@ -1,11 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(abs,(val(int,-2),())). -evaluate(abs,(val(none,none),())). -evaluate(abs,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(int,-2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(abs,(variable(x),())). diff --git a/tests/correctness/unit/unary/bad_add.expected.all b/tests/correctness/unit/unary/bad_add.expected.all deleted file mode 100644 index d15fd395..00000000 --- a/tests/correctness/unit/unary/bad_add.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(add,(val(int,-2),()),val(int,-2)) -evaluated(add,(val(none,none),()),bad) -evaluated(add,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_add.expected.any b/tests/correctness/unit/unary/bad_add.expected.any deleted file mode 100644 index 898b7c4f..00000000 --- a/tests/correctness/unit/unary/bad_add.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(add,(variable(x),()),val(int,-2)) -evaluated(add,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_add.expected.none b/tests/correctness/unit/unary/bad_add.expected.none deleted file mode 100644 index dab372e5..00000000 --- a/tests/correctness/unit/unary/bad_add.expected.none +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(add,(val(none,none),()),val(none,none)) -evaluated(add,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_add.expected.stats b/tests/correctness/unit/unary/bad_add.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/bad_add.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/bad_add.lp b/tests/correctness/unit/unary/bad_add.lp deleted file mode 100644 index 8f3af7e7..00000000 --- a/tests/correctness/unit/unary/bad_add.lp +++ /dev/null @@ -1,11 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(add,(val(int,-2),())). -evaluate(add,(val(none,none),())). -evaluate(add,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(int,-2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(add,(variable(x),())). diff --git a/tests/correctness/unit/unary/bad_ceil.expected.all b/tests/correctness/unit/unary/bad_ceil.expected.all deleted file mode 100644 index ebda0bb8..00000000 --- a/tests/correctness/unit/unary/bad_ceil.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(ceil,(val(int,2),()),val(int,2)) -evaluated(ceil,(val(none,none),()),bad) -evaluated(ceil,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_ceil.expected.any b/tests/correctness/unit/unary/bad_ceil.expected.any deleted file mode 100644 index da67541b..00000000 --- a/tests/correctness/unit/unary/bad_ceil.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(ceil,(variable(x),()),val(int,2)) -evaluated(ceil,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_ceil.expected.none b/tests/correctness/unit/unary/bad_ceil.expected.none deleted file mode 100644 index 40ad0c30..00000000 --- a/tests/correctness/unit/unary/bad_ceil.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(ceil,(val(int,2),()),bad) -evaluated(ceil,(val(int,2),()),val(none,none)) -evaluated(ceil,(val(none,none),()),val(int,2)) -evaluated(ceil,(val(none,none),()),val(none,none)) -evaluated(ceil,(bad,()),val(int,2)) -evaluated(ceil,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_ceil.expected.stats b/tests/correctness/unit/unary/bad_ceil.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/bad_ceil.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/bad_ceil.lp b/tests/correctness/unit/unary/bad_ceil.lp deleted file mode 100644 index 33beeefd..00000000 --- a/tests/correctness/unit/unary/bad_ceil.lp +++ /dev/null @@ -1,11 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(ceil,(val(int,2),())). -evaluate(ceil,(val(none,none),())). -evaluate(ceil,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(int,2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(ceil,(variable(x),())). diff --git a/tests/correctness/unit/unary/bad_floor.expected.all b/tests/correctness/unit/unary/bad_floor.expected.all deleted file mode 100644 index ca59a158..00000000 --- a/tests/correctness/unit/unary/bad_floor.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(floor,(val(int,2),()),val(int,2)) -evaluated(floor,(val(none,none),()),bad) -evaluated(floor,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_floor.expected.any b/tests/correctness/unit/unary/bad_floor.expected.any deleted file mode 100644 index 146bc9ba..00000000 --- a/tests/correctness/unit/unary/bad_floor.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(floor,(variable(x),()),val(int,2)) -evaluated(floor,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_floor.expected.none b/tests/correctness/unit/unary/bad_floor.expected.none deleted file mode 100644 index 4476651e..00000000 --- a/tests/correctness/unit/unary/bad_floor.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(floor,(val(int,2),()),bad) -evaluated(floor,(val(int,2),()),val(none,none)) -evaluated(floor,(val(none,none),()),val(int,2)) -evaluated(floor,(val(none,none),()),val(none,none)) -evaluated(floor,(bad,()),val(int,2)) -evaluated(floor,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_floor.expected.stats b/tests/correctness/unit/unary/bad_floor.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/bad_floor.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/bad_length.expected.all b/tests/correctness/unit/unary/bad_length.expected.all deleted file mode 100644 index 73834262..00000000 --- a/tests/correctness/unit/unary/bad_length.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(length,(val(string,"ab"),()),val(int,2)) -evaluated(length,(val(none,none),()),bad) -evaluated(length,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_length.expected.none b/tests/correctness/unit/unary/bad_length.expected.none deleted file mode 100644 index 72daa068..00000000 --- a/tests/correctness/unit/unary/bad_length.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(length,(val(string,"ab"),()),bad) -evaluated(length,(val(string,"ab"),()),val(none,none)) -evaluated(length,(val(none,none),()),val(int,2)) -evaluated(length,(val(none,none),()),val(none,none)) -evaluated(length,(bad,()),val(int,2)) -evaluated(length,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_length.expected.stats b/tests/correctness/unit/unary/bad_length.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/bad_length.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/bad_leqv.expected.all b/tests/correctness/unit/unary/bad_leqv.expected.all deleted file mode 100644 index 79c160c6..00000000 --- a/tests/correctness/unit/unary/bad_leqv.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(leqv,(val(bool,true),()),val(bool,true)) -evaluated(leqv,(val(none,none),()),bad) -evaluated(leqv,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_leqv.expected.any b/tests/correctness/unit/unary/bad_leqv.expected.any deleted file mode 100644 index 0690668b..00000000 --- a/tests/correctness/unit/unary/bad_leqv.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(leqv,(variable(x),()),val(bool,true)) -evaluated(leqv,(variable(x),()),val(bool,false)) -evaluated(leqv,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_leqv.expected.none b/tests/correctness/unit/unary/bad_leqv.expected.none deleted file mode 100644 index e4415756..00000000 --- a/tests/correctness/unit/unary/bad_leqv.expected.none +++ /dev/null @@ -1,9 +0,0 @@ -evaluated(leqv,(val(bool,true),()),val(bool,false)) -evaluated(leqv,(val(bool,true),()),val(none,none)) -evaluated(leqv,(val(bool,true),()),bad) -evaluated(leqv,(val(none,none),()),val(bool,false)) -evaluated(leqv,(val(none,none),()),val(none,none)) -evaluated(leqv,(val(none,none),()),val(bool,true)) -evaluated(leqv,(bad,()),val(bool,true)) -evaluated(leqv,(bad,()),val(bool,false)) -evaluated(leqv,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_leqv.lp b/tests/correctness/unit/unary/bad_leqv.lp deleted file mode 100644 index 39177de0..00000000 --- a/tests/correctness/unit/unary/bad_leqv.lp +++ /dev/null @@ -1,12 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(leqv,(val(bool,true),())). -evaluate(leqv,(val(none,none),())). -evaluate(leqv,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(bool,false)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(leqv,(variable(x),())). diff --git a/tests/correctness/unit/unary/bad_lnot.expected.all b/tests/correctness/unit/unary/bad_lnot.expected.all deleted file mode 100644 index 418aeb01..00000000 --- a/tests/correctness/unit/unary/bad_lnot.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lnot,(val(bool,false),()),val(bool,true)) -evaluated(lnot,(val(bool,true),()),val(bool,false)) -evaluated(lnot,(val(none,none),()),val(none,none)) -evaluated(lnot,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_lnot.expected.any b/tests/correctness/unit/unary/bad_lnot.expected.any deleted file mode 100644 index 4564b401..00000000 --- a/tests/correctness/unit/unary/bad_lnot.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lnot,(variable(x),()),val(bool,true)) -evaluated(lnot,(variable(x),()),val(bool,false)) -evaluated(lnot,(variable(x),()),val(none,none)) -evaluated(lnot,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_lnot.expected.none b/tests/correctness/unit/unary/bad_lnot.expected.none deleted file mode 100644 index 0d563855..00000000 --- a/tests/correctness/unit/unary/bad_lnot.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(lnot,(val(bool,false),()),val(bool,false)) -evaluated(lnot,(val(bool,false),()),val(none,none)) -evaluated(lnot,(val(bool,false),()),bad) -evaluated(lnot,(val(bool,true),()),val(bool,true)) -evaluated(lnot,(val(bool,true),()),val(none,none)) -evaluated(lnot,(val(bool,true),()),bad) -evaluated(lnot,(val(none,none),()),val(bool,true)) -evaluated(lnot,(val(none,none),()),val(bool,false)) -evaluated(lnot,(val(none,none),()),bad) -evaluated(lnot,(bad,()),val(bool,true)) -evaluated(lnot,(bad,()),val(bool,false)) -evaluated(lnot,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_lnot.lp b/tests/correctness/unit/unary/bad_lnot.lp deleted file mode 100644 index 0ed54deb..00000000 --- a/tests/correctness/unit/unary/bad_lnot.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(lnot,(val(bool,false),())). -evaluate(lnot,(val(bool,true),())). -evaluate(lnot,(val(none,none),())). -evaluate(lnot,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(lnot,(variable(x),())). diff --git a/tests/correctness/unit/unary/bad_lxor.expected.all b/tests/correctness/unit/unary/bad_lxor.expected.all deleted file mode 100644 index 8f0571a3..00000000 --- a/tests/correctness/unit/unary/bad_lxor.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(lxor,(val(bool,true),()),val(bool,true)) -evaluated(lxor,(val(none,none),()),bad) -evaluated(lxor,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_lxor.expected.any b/tests/correctness/unit/unary/bad_lxor.expected.any deleted file mode 100644 index 842ac7db..00000000 --- a/tests/correctness/unit/unary/bad_lxor.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(lxor,(variable(x),()),val(bool,true)) -evaluated(lxor,(variable(x),()),val(bool,false)) -evaluated(lxor,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_lxor.expected.none b/tests/correctness/unit/unary/bad_lxor.expected.none deleted file mode 100644 index bb1c9047..00000000 --- a/tests/correctness/unit/unary/bad_lxor.expected.none +++ /dev/null @@ -1,9 +0,0 @@ -evaluated(lxor,(val(bool,true),()),val(bool,false)) -evaluated(lxor,(val(bool,true),()),val(none,none)) -evaluated(lxor,(val(bool,true),()),bad) -evaluated(lxor,(val(none,none),()),val(bool,true)) -evaluated(lxor,(val(none,none),()),val(bool,false)) -evaluated(lxor,(val(none,none),()),val(none,none)) -evaluated(lxor,(bad,()),val(bool,true)) -evaluated(lxor,(bad,()),val(bool,false)) -evaluated(lxor,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_lxor.expected.stats b/tests/correctness/unit/unary/bad_lxor.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/bad_lxor.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/bad_lxor.lp b/tests/correctness/unit/unary/bad_lxor.lp deleted file mode 100644 index 72bab6b9..00000000 --- a/tests/correctness/unit/unary/bad_lxor.lp +++ /dev/null @@ -1,12 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(lxor,(val(bool,true),())). -evaluate(lxor,(val(none,none),())). -evaluate(lxor,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,true)). -variable_domain(x,val(bool,false)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(lxor,(variable(x),())). diff --git a/tests/correctness/unit/unary/bad_minus.expected.all b/tests/correctness/unit/unary/bad_minus.expected.all deleted file mode 100644 index 7204ce85..00000000 --- a/tests/correctness/unit/unary/bad_minus.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(minus,(val(int,2),()),val(int,-2)) -evaluated(minus,(val(none,none),()),bad) -evaluated(minus,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_minus.expected.any b/tests/correctness/unit/unary/bad_minus.expected.any deleted file mode 100644 index 334f8a62..00000000 --- a/tests/correctness/unit/unary/bad_minus.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(minus,(variable(x),()),val(int,-2)) -evaluated(minus,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_minus.expected.none b/tests/correctness/unit/unary/bad_minus.expected.none deleted file mode 100644 index 4bd0e993..00000000 --- a/tests/correctness/unit/unary/bad_minus.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(minus,(val(int,2),()),bad) -evaluated(minus,(val(int,2),()),val(none,none)) -evaluated(minus,(val(none,none),()),val(int,-2)) -evaluated(minus,(val(none,none),()),val(none,none)) -evaluated(minus,(bad,()),val(int,-2)) -evaluated(minus,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_minus.expected.stats b/tests/correctness/unit/unary/bad_minus.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/bad_minus.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/bad_snot.expected.all b/tests/correctness/unit/unary/bad_snot.expected.all deleted file mode 100644 index d7c0b5c8..00000000 --- a/tests/correctness/unit/unary/bad_snot.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(snot,(val(bool,false),()),val(bool,true)) -evaluated(snot,(val(bool,true),()),val(bool,false)) -evaluated(snot,(val(none,none),()),val(bool,false)) -evaluated(snot,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_snot.expected.any b/tests/correctness/unit/unary/bad_snot.expected.any deleted file mode 100644 index 8df5fec0..00000000 --- a/tests/correctness/unit/unary/bad_snot.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(snot,(variable(x),()),val(bool,true)) -evaluated(snot,(variable(x),()),val(bool,false)) -evaluated(snot,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_snot.expected.none b/tests/correctness/unit/unary/bad_snot.expected.none deleted file mode 100644 index 6ec08b07..00000000 --- a/tests/correctness/unit/unary/bad_snot.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(snot,(val(bool,false),()),val(bool,false)) -evaluated(snot,(val(bool,false),()),val(none,none)) -evaluated(snot,(val(bool,false),()),bad) -evaluated(snot,(val(bool,true),()),val(bool,true)) -evaluated(snot,(val(bool,true),()),val(none,none)) -evaluated(snot,(val(bool,true),()),bad) -evaluated(snot,(val(none,none),()),val(bool,true)) -evaluated(snot,(val(none,none),()),val(none,none)) -evaluated(snot,(val(none,none),()),bad) -evaluated(snot,(bad,()),val(bool,true)) -evaluated(snot,(bad,()),val(bool,false)) -evaluated(snot,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_snot.expected.stats b/tests/correctness/unit/unary/bad_snot.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/bad_snot.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/bad_snot.lp b/tests/correctness/unit/unary/bad_snot.lp deleted file mode 100644 index a91ea85c..00000000 --- a/tests/correctness/unit/unary/bad_snot.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(snot,(val(bool,false),())). -evaluate(snot,(val(bool,true),())). -evaluate(snot,(val(none,none),())). -evaluate(snot,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(snot,(variable(x),())). diff --git a/tests/correctness/unit/unary/bad_wnot.expected.all b/tests/correctness/unit/unary/bad_wnot.expected.all deleted file mode 100644 index b222c335..00000000 --- a/tests/correctness/unit/unary/bad_wnot.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(wnot,(val(bool,false),()),val(bool,true)) -evaluated(wnot,(val(bool,true),()),val(bool,false)) -evaluated(wnot,(val(none,none),()),val(bool,true)) -evaluated(wnot,(bad,()),bad) diff --git a/tests/correctness/unit/unary/bad_wnot.expected.any b/tests/correctness/unit/unary/bad_wnot.expected.any deleted file mode 100644 index 08ca91fc..00000000 --- a/tests/correctness/unit/unary/bad_wnot.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(wnot,(variable(x),()),val(bool,true)) -evaluated(wnot,(variable(x),()),val(bool,false)) -evaluated(wnot,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/bad_wnot.expected.none b/tests/correctness/unit/unary/bad_wnot.expected.none deleted file mode 100644 index 0c01cea1..00000000 --- a/tests/correctness/unit/unary/bad_wnot.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(wnot,(val(bool,false),()),val(bool,false)) -evaluated(wnot,(val(bool,false),()),val(none,none)) -evaluated(wnot,(val(bool,false),()),bad) -evaluated(wnot,(val(bool,true),()),val(bool,true)) -evaluated(wnot,(val(bool,true),()),val(none,none)) -evaluated(wnot,(val(bool,true),()),bad) -evaluated(wnot,(val(none,none),()),val(bool,false)) -evaluated(wnot,(val(none,none),()),val(none,none)) -evaluated(wnot,(val(none,none),()),bad) -evaluated(wnot,(bad,()),val(bool,true)) -evaluated(wnot,(bad,()),val(bool,false)) -evaluated(wnot,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/bad_wnot.expected.stats b/tests/correctness/unit/unary/bad_wnot.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/bad_wnot.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/bad_wnot.lp b/tests/correctness/unit/unary/bad_wnot.lp deleted file mode 100644 index 098460fb..00000000 --- a/tests/correctness/unit/unary/bad_wnot.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(wnot,(val(bool,false),())). -evaluate(wnot,(val(bool,true),())). -evaluate(wnot,(val(none,none),())). -evaluate(wnot,(bad,())). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(wnot,(variable(x),())). diff --git a/tests/correctness/unit/unary/boolean_leqv.expected.all b/tests/correctness/unit/unary/boolean_leqv.expected.all deleted file mode 100644 index 4c15ebdc..00000000 --- a/tests/correctness/unit/unary/boolean_leqv.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(leqv,(val(bool,true),()),val(bool,true)) -evaluated(leqv,(val(bool,false),()),val(bool,false)) -evaluated(leqv,(val(none,none),()),bad) diff --git a/tests/correctness/unit/unary/boolean_leqv.expected.none b/tests/correctness/unit/unary/boolean_leqv.expected.none deleted file mode 100644 index 7e272a1d..00000000 --- a/tests/correctness/unit/unary/boolean_leqv.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(leqv,(val(bool,true),()),val(bool,false)) -evaluated(leqv,(val(bool,true),()),val(none,none)) -evaluated(leqv,(val(bool,true),()),bad) -evaluated(leqv,(val(bool,false),()),val(bool,true)) -evaluated(leqv,(val(bool,false),()),val(none,none)) -evaluated(leqv,(val(bool,false),()),bad) diff --git a/tests/correctness/unit/unary/boolean_leqv.lp b/tests/correctness/unit/unary/boolean_leqv.lp deleted file mode 100644 index c93da8a4..00000000 --- a/tests/correctness/unit/unary/boolean_leqv.lp +++ /dev/null @@ -1,3 +0,0 @@ -evaluate(leqv,(val(bool,true),())). -evaluate(leqv,(val(bool,false),())). -evaluate(leqv,(val(none,none),())). diff --git a/tests/correctness/unit/unary/boolean_lnot.expected.all b/tests/correctness/unit/unary/boolean_lnot.expected.all deleted file mode 100644 index 418aeb01..00000000 --- a/tests/correctness/unit/unary/boolean_lnot.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lnot,(val(bool,false),()),val(bool,true)) -evaluated(lnot,(val(bool,true),()),val(bool,false)) -evaluated(lnot,(val(none,none),()),val(none,none)) -evaluated(lnot,(bad,()),bad) diff --git a/tests/correctness/unit/unary/boolean_lnot.expected.any b/tests/correctness/unit/unary/boolean_lnot.expected.any deleted file mode 100644 index 4564b401..00000000 --- a/tests/correctness/unit/unary/boolean_lnot.expected.any +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(lnot,(variable(x),()),val(bool,true)) -evaluated(lnot,(variable(x),()),val(bool,false)) -evaluated(lnot,(variable(x),()),val(none,none)) -evaluated(lnot,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/boolean_lnot.expected.none b/tests/correctness/unit/unary/boolean_lnot.expected.none deleted file mode 100644 index 0d563855..00000000 --- a/tests/correctness/unit/unary/boolean_lnot.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(lnot,(val(bool,false),()),val(bool,false)) -evaluated(lnot,(val(bool,false),()),val(none,none)) -evaluated(lnot,(val(bool,false),()),bad) -evaluated(lnot,(val(bool,true),()),val(bool,true)) -evaluated(lnot,(val(bool,true),()),val(none,none)) -evaluated(lnot,(val(bool,true),()),bad) -evaluated(lnot,(val(none,none),()),val(bool,true)) -evaluated(lnot,(val(none,none),()),val(bool,false)) -evaluated(lnot,(val(none,none),()),bad) -evaluated(lnot,(bad,()),val(bool,true)) -evaluated(lnot,(bad,()),val(bool,false)) -evaluated(lnot,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/boolean_lnot.expected.stats b/tests/correctness/unit/unary/boolean_lnot.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/boolean_lnot.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/boolean_lnot.lp b/tests/correctness/unit/unary/boolean_lnot.lp deleted file mode 100644 index 2d8922ba..00000000 --- a/tests/correctness/unit/unary/boolean_lnot.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(lnot,(variable(x),())). - -evaluate(lnot,(val(bool,false),())). -evaluate(lnot,(val(bool,true),())). -evaluate(lnot,(val(none,none),())). -evaluate(lnot,(bad,())). diff --git a/tests/correctness/unit/unary/boolean_lxor.expected.all b/tests/correctness/unit/unary/boolean_lxor.expected.all deleted file mode 100644 index dac5418e..00000000 --- a/tests/correctness/unit/unary/boolean_lxor.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(lxor,(val(bool,true),()),val(bool,true)) -evaluated(lxor,(val(bool,false),()),val(bool,false)) -evaluated(lxor,(val(none,none),()),bad) diff --git a/tests/correctness/unit/unary/boolean_lxor.expected.none b/tests/correctness/unit/unary/boolean_lxor.expected.none deleted file mode 100644 index 46977c27..00000000 --- a/tests/correctness/unit/unary/boolean_lxor.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(lxor,(val(bool,true),()),val(bool,false)) -evaluated(lxor,(val(bool,true),()),val(none,none)) -evaluated(lxor,(val(bool,true),()),bad) -evaluated(lxor,(val(bool,false),()),val(bool,true)) -evaluated(lxor,(val(bool,false),()),val(none,none)) -evaluated(lxor,(val(bool,false),()),bad) diff --git a/tests/correctness/unit/unary/boolean_lxor.lp b/tests/correctness/unit/unary/boolean_lxor.lp deleted file mode 100644 index 3d361344..00000000 --- a/tests/correctness/unit/unary/boolean_lxor.lp +++ /dev/null @@ -1,3 +0,0 @@ -evaluate(lxor,(val(bool,true),())). -evaluate(lxor,(val(bool,false),())). -evaluate(lxor,(val(none,none),())). diff --git a/tests/correctness/unit/unary/boolean_snot.expected.all b/tests/correctness/unit/unary/boolean_snot.expected.all deleted file mode 100644 index d7c0b5c8..00000000 --- a/tests/correctness/unit/unary/boolean_snot.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(snot,(val(bool,false),()),val(bool,true)) -evaluated(snot,(val(bool,true),()),val(bool,false)) -evaluated(snot,(val(none,none),()),val(bool,false)) -evaluated(snot,(bad,()),bad) diff --git a/tests/correctness/unit/unary/boolean_snot.expected.any b/tests/correctness/unit/unary/boolean_snot.expected.any deleted file mode 100644 index 8df5fec0..00000000 --- a/tests/correctness/unit/unary/boolean_snot.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(snot,(variable(x),()),val(bool,true)) -evaluated(snot,(variable(x),()),val(bool,false)) -evaluated(snot,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/boolean_snot.expected.none b/tests/correctness/unit/unary/boolean_snot.expected.none deleted file mode 100644 index 6ec08b07..00000000 --- a/tests/correctness/unit/unary/boolean_snot.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(snot,(val(bool,false),()),val(bool,false)) -evaluated(snot,(val(bool,false),()),val(none,none)) -evaluated(snot,(val(bool,false),()),bad) -evaluated(snot,(val(bool,true),()),val(bool,true)) -evaluated(snot,(val(bool,true),()),val(none,none)) -evaluated(snot,(val(bool,true),()),bad) -evaluated(snot,(val(none,none),()),val(bool,true)) -evaluated(snot,(val(none,none),()),val(none,none)) -evaluated(snot,(val(none,none),()),bad) -evaluated(snot,(bad,()),val(bool,true)) -evaluated(snot,(bad,()),val(bool,false)) -evaluated(snot,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/boolean_snot.expected.stats b/tests/correctness/unit/unary/boolean_snot.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/boolean_snot.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/boolean_snot.lp b/tests/correctness/unit/unary/boolean_snot.lp deleted file mode 100644 index 0e3a9867..00000000 --- a/tests/correctness/unit/unary/boolean_snot.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(snot,(variable(x),())). - -evaluate(snot,(val(bool,false),())). -evaluate(snot,(val(bool,true),())). -evaluate(snot,(val(none,none),())). -evaluate(snot,(bad,())). diff --git a/tests/correctness/unit/unary/boolean_wnot.expected.all b/tests/correctness/unit/unary/boolean_wnot.expected.all deleted file mode 100644 index b222c335..00000000 --- a/tests/correctness/unit/unary/boolean_wnot.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(wnot,(val(bool,false),()),val(bool,true)) -evaluated(wnot,(val(bool,true),()),val(bool,false)) -evaluated(wnot,(val(none,none),()),val(bool,true)) -evaluated(wnot,(bad,()),bad) diff --git a/tests/correctness/unit/unary/boolean_wnot.expected.any b/tests/correctness/unit/unary/boolean_wnot.expected.any deleted file mode 100644 index 08ca91fc..00000000 --- a/tests/correctness/unit/unary/boolean_wnot.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(wnot,(variable(x),()),val(bool,true)) -evaluated(wnot,(variable(x),()),val(bool,false)) -evaluated(wnot,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/boolean_wnot.expected.none b/tests/correctness/unit/unary/boolean_wnot.expected.none deleted file mode 100644 index 0c01cea1..00000000 --- a/tests/correctness/unit/unary/boolean_wnot.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(wnot,(val(bool,false),()),val(bool,false)) -evaluated(wnot,(val(bool,false),()),val(none,none)) -evaluated(wnot,(val(bool,false),()),bad) -evaluated(wnot,(val(bool,true),()),val(bool,true)) -evaluated(wnot,(val(bool,true),()),val(none,none)) -evaluated(wnot,(val(bool,true),()),bad) -evaluated(wnot,(val(none,none),()),val(bool,false)) -evaluated(wnot,(val(none,none),()),val(none,none)) -evaluated(wnot,(val(none,none),()),bad) -evaluated(wnot,(bad,()),val(bool,true)) -evaluated(wnot,(bad,()),val(bool,false)) -evaluated(wnot,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/boolean_wnot.expected.stats b/tests/correctness/unit/unary/boolean_wnot.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/boolean_wnot.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/boolean_wnot.lp b/tests/correctness/unit/unary/boolean_wnot.lp deleted file mode 100644 index ae5fef13..00000000 --- a/tests/correctness/unit/unary/boolean_wnot.lp +++ /dev/null @@ -1,13 +0,0 @@ -phase_request(constantFolding,false). - -variable_declare(x,fromFacts). -variable_domain(x,val(bool,false)). -variable_domain(x,val(bool,true)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(wnot,(variable(x),())). - -evaluate(wnot,(val(bool,false),())). -evaluate(wnot,(val(bool,true),())). -evaluate(wnot,(val(none,none),())). -evaluate(wnot,(bad,())). diff --git a/tests/correctness/unit/unary/float_abs.expected.all b/tests/correctness/unit/unary/float_abs.expected.all deleted file mode 100644 index b4688a34..00000000 --- a/tests/correctness/unit/unary/float_abs.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(abs,(val(float,float("-1.5")),()),val(float,float("1.5"))) -evaluated(abs,(val(none,none),()),bad) -evaluated(abs,(bad,()),bad) diff --git a/tests/correctness/unit/unary/float_abs.expected.any b/tests/correctness/unit/unary/float_abs.expected.any deleted file mode 100644 index e5541c89..00000000 --- a/tests/correctness/unit/unary/float_abs.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(abs,(variable(x),()),val(float,float("1.5"))) -evaluated(abs,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/float_abs.expected.none b/tests/correctness/unit/unary/float_abs.expected.none deleted file mode 100644 index 76f2b493..00000000 --- a/tests/correctness/unit/unary/float_abs.expected.none +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(abs,(val(float,float("-1.5")),()),bad) -evaluated(abs,(val(float,float("-1.5")),()),val(none,none)) -evaluated(abs,(val(float,float("-1.5")),()),val(float,float("0.0"))) -evaluated(abs,(val(none,none),()),val(none,none)) -evaluated(abs,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/float_abs.expected.stats b/tests/correctness/unit/unary/float_abs.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/float_abs.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/float_add.expected.all b/tests/correctness/unit/unary/float_add.expected.all deleted file mode 100644 index 34c3df09..00000000 --- a/tests/correctness/unit/unary/float_add.expected.all +++ /dev/null @@ -1 +0,0 @@ -evaluated(add,(val(float,float("1.5")),()),val(float,float("1.5"))) diff --git a/tests/correctness/unit/unary/float_add.lp b/tests/correctness/unit/unary/float_add.lp deleted file mode 100644 index 912f2e8b..00000000 --- a/tests/correctness/unit/unary/float_add.lp +++ /dev/null @@ -1 +0,0 @@ -evaluate(add,(val(float,float("1.5")),())). diff --git a/tests/correctness/unit/unary/float_ceil.expected.all b/tests/correctness/unit/unary/float_ceil.expected.all deleted file mode 100644 index 642160b4..00000000 --- a/tests/correctness/unit/unary/float_ceil.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(ceil,(val(float,float("1.5")),()),val(int,2)) -evaluated(ceil,(val(none,none),()),bad) -evaluated(ceil,(bad,()),bad) diff --git a/tests/correctness/unit/unary/float_ceil.expected.any b/tests/correctness/unit/unary/float_ceil.expected.any deleted file mode 100644 index da67541b..00000000 --- a/tests/correctness/unit/unary/float_ceil.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(ceil,(variable(x),()),val(int,2)) -evaluated(ceil,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/float_ceil.expected.none b/tests/correctness/unit/unary/float_ceil.expected.none deleted file mode 100644 index 7134f37d..00000000 --- a/tests/correctness/unit/unary/float_ceil.expected.none +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(ceil,(val(float,float("1.5")),()),bad) -evaluated(ceil,(val(float,float("1.5")),()),val(none,none)) -evaluated(ceil,(val(float,float("1.5")),()),val(int,0)) -evaluated(ceil,(val(none,none),()),val(none,none)) -evaluated(ceil,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/float_ceil.expected.stats b/tests/correctness/unit/unary/float_ceil.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/float_ceil.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/float_floor.expected.all b/tests/correctness/unit/unary/float_floor.expected.all deleted file mode 100644 index 612bf8de..00000000 --- a/tests/correctness/unit/unary/float_floor.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(floor,(val(float,float("2.5")),()),val(int,2)) -evaluated(floor,(val(none,none),()),bad) -evaluated(floor,(bad,()),bad) diff --git a/tests/correctness/unit/unary/float_floor.expected.any b/tests/correctness/unit/unary/float_floor.expected.any deleted file mode 100644 index 146bc9ba..00000000 --- a/tests/correctness/unit/unary/float_floor.expected.any +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(floor,(variable(x),()),val(int,2)) -evaluated(floor,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/float_floor.expected.none b/tests/correctness/unit/unary/float_floor.expected.none deleted file mode 100644 index 14a8e8a4..00000000 --- a/tests/correctness/unit/unary/float_floor.expected.none +++ /dev/null @@ -1,5 +0,0 @@ -evaluated(floor,(val(float,float("2.5")),()),bad) -evaluated(floor,(val(float,float("2.5")),()),val(none,none)) -evaluated(floor,(val(float,float("2.5")),()),val(int,0)) -evaluated(floor,(val(none,none),()),val(none,none)) -evaluated(floor,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/float_floor.expected.stats b/tests/correctness/unit/unary/float_floor.expected.stats deleted file mode 100644 index 1390a335..00000000 --- a/tests/correctness/unit/unary/float_floor.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=3 diff --git a/tests/correctness/unit/unary/float_floor.lp b/tests/correctness/unit/unary/float_floor.lp deleted file mode 100644 index 1e23d56d..00000000 --- a/tests/correctness/unit/unary/float_floor.lp +++ /dev/null @@ -1,12 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(floor,(val(float,float("2.5")),())). -evaluate(floor,(val(none,none),())). -evaluate(floor,(bad,())). - - -variable_declare(x,fromFacts). -variable_domain(x,val(float,float("2.5"))). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(floor,(variable(x),())). diff --git a/tests/correctness/unit/unary/float_mult.expected.none b/tests/correctness/unit/unary/float_mult.expected.none deleted file mode 100644 index 1c66cca2..00000000 --- a/tests/correctness/unit/unary/float_mult.expected.none +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(mult,(val(float,float("2.5")),()),bad) -evaluated(mult,(val(float,float("2.5")),()),val(none,none)) -evaluated(mult,(val(float,float("2.5")),()),val(float,float("0.0"))) diff --git a/tests/correctness/unit/unary/float_mult.lp b/tests/correctness/unit/unary/float_mult.lp deleted file mode 100644 index 5aeff492..00000000 --- a/tests/correctness/unit/unary/float_mult.lp +++ /dev/null @@ -1 +0,0 @@ -evaluate(mult,(val(float,float("2.5")),())). diff --git a/tests/correctness/unit/unary/int_abs.expected.stats b/tests/correctness/unit/unary/int_abs.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/int_abs.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/int_add.expected.all b/tests/correctness/unit/unary/int_add.expected.all deleted file mode 100644 index 42b0d336..00000000 --- a/tests/correctness/unit/unary/int_add.expected.all +++ /dev/null @@ -1,2 +0,0 @@ -evaluated(add,(val(int,-3),()),val(int,-3)) -evaluated(add,(val(bool,true),()),val(int,1)) diff --git a/tests/correctness/unit/unary/int_add.expected.none b/tests/correctness/unit/unary/int_add.expected.none deleted file mode 100644 index cdd9a4fd..00000000 --- a/tests/correctness/unit/unary/int_add.expected.none +++ /dev/null @@ -1,6 +0,0 @@ -evaluated(add,(val(int,-3),()),bad) -evaluated(add,(val(int,-3),()),val(none,none)) -evaluated(add,(val(int,-3),()),val(int,3)) -evaluated(add,(val(bool,true),()),bad) -evaluated(add,(val(bool,true),()),val(none,none)) -evaluated(add,(val(bool,true),()),val(int,0)) diff --git a/tests/correctness/unit/unary/int_add.lp b/tests/correctness/unit/unary/int_add.lp deleted file mode 100644 index 28345faf..00000000 --- a/tests/correctness/unit/unary/int_add.lp +++ /dev/null @@ -1,2 +0,0 @@ -evaluate(add,(val(int,-3),())). -evaluate(add,(val(bool,true),())). diff --git a/tests/correctness/unit/unary/int_ceil.expected.all b/tests/correctness/unit/unary/int_ceil.expected.all deleted file mode 100644 index 935f4e1a..00000000 --- a/tests/correctness/unit/unary/int_ceil.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(ceil,(val(int,-3),()),val(int,-3)) -evaluated(ceil,(val(int,2),()),val(int,2)) -evaluated(ceil,(val(none,none),()),bad) -evaluated(ceil,(bad,()),bad) diff --git a/tests/correctness/unit/unary/int_ceil.expected.any b/tests/correctness/unit/unary/int_ceil.expected.any deleted file mode 100644 index 18e78030..00000000 --- a/tests/correctness/unit/unary/int_ceil.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(ceil,(variable(x),()),val(int,-3)) -evaluated(ceil,(variable(x),()),val(int,2)) -evaluated(ceil,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/int_ceil.expected.none b/tests/correctness/unit/unary/int_ceil.expected.none deleted file mode 100644 index da75ba86..00000000 --- a/tests/correctness/unit/unary/int_ceil.expected.none +++ /dev/null @@ -1,10 +0,0 @@ -evaluated(ceil,(val(int,-3),()),bad) -evaluated(ceil,(val(int,-3),()),val(none,none)) -evaluated(ceil,(val(int,-3),()),val(int,3)) -evaluated(ceil,(val(int,2),()),bad) -evaluated(ceil,(val(int,2),()),val(none,none)) -evaluated(ceil,(val(int,2),()),val(int,-2)) -evaluated(ceil,(val(none,none),()),val(none,none)) -evaluated(ceil,(val(none,none),()),val(int,0)) -evaluated(ceil,(bad,()),val(none,none)) -evaluated(ceil,(bad,()),val(int,0)) diff --git a/tests/correctness/unit/unary/int_ceil.expected.stats b/tests/correctness/unit/unary/int_ceil.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/int_ceil.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/int_ceil.lp b/tests/correctness/unit/unary/int_ceil.lp deleted file mode 100644 index 5413bc55..00000000 --- a/tests/correctness/unit/unary/int_ceil.lp +++ /dev/null @@ -1,14 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(ceil,(val(int,-3),())). -evaluate(ceil,(val(int,2),())). -evaluate(ceil,(val(none,none),())). -evaluate(ceil,(bad,())). - - -variable_declare(x,fromFacts). -variable_domain(x,val(int,-3)). -variable_domain(x,val(int,2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(ceil,(variable(x),())). diff --git a/tests/correctness/unit/unary/int_floor.expected.all b/tests/correctness/unit/unary/int_floor.expected.all deleted file mode 100644 index a3c0c811..00000000 --- a/tests/correctness/unit/unary/int_floor.expected.all +++ /dev/null @@ -1,4 +0,0 @@ -evaluated(floor,(val(int,-3),()),val(int,-3)) -evaluated(floor,(val(int,2),()),val(int,2)) -evaluated(floor,(val(none,none),()),bad) -evaluated(floor,(bad,()),bad) diff --git a/tests/correctness/unit/unary/int_floor.expected.any b/tests/correctness/unit/unary/int_floor.expected.any deleted file mode 100644 index ce4237ed..00000000 --- a/tests/correctness/unit/unary/int_floor.expected.any +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(floor,(variable(x),()),val(int,-3)) -evaluated(floor,(variable(x),()),val(int,2)) -evaluated(floor,(variable(x),()),bad) diff --git a/tests/correctness/unit/unary/int_floor.expected.none b/tests/correctness/unit/unary/int_floor.expected.none deleted file mode 100644 index fb147e4f..00000000 --- a/tests/correctness/unit/unary/int_floor.expected.none +++ /dev/null @@ -1,10 +0,0 @@ -evaluated(floor,(val(int,-3),()),bad) -evaluated(floor,(val(int,-3),()),val(none,none)) -evaluated(floor,(val(int,-3),()),val(int,3)) -evaluated(floor,(val(int,2),()),bad) -evaluated(floor,(val(int,2),()),val(none,none)) -evaluated(floor,(val(int,2),()),val(int,-2)) -evaluated(floor,(val(none,none),()),val(none,none)) -evaluated(floor,(val(none,none),()),val(int,0)) -evaluated(floor,(bad,()),val(none,none)) -evaluated(floor,(bad,()),val(int,0)) diff --git a/tests/correctness/unit/unary/int_floor.expected.stats b/tests/correctness/unit/unary/int_floor.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/int_floor.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/int_floor.lp b/tests/correctness/unit/unary/int_floor.lp deleted file mode 100644 index e53bef98..00000000 --- a/tests/correctness/unit/unary/int_floor.lp +++ /dev/null @@ -1,14 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(floor,(val(int,-3),())). -evaluate(floor,(val(int,2),())). -evaluate(floor,(val(none,none),())). -evaluate(floor,(bad,())). - - -variable_declare(x,fromFacts). -variable_domain(x,val(int,-3)). -variable_domain(x,val(int,2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(floor,(variable(x),())). diff --git a/tests/correctness/unit/unary/int_minus.expected.none b/tests/correctness/unit/unary/int_minus.expected.none deleted file mode 100644 index 825c14c7..00000000 --- a/tests/correctness/unit/unary/int_minus.expected.none +++ /dev/null @@ -1,10 +0,0 @@ -evaluated(minus,(val(int,-3),()),bad) -evaluated(minus,(val(int,-3),()),val(none,none)) -evaluated(minus,(val(int,-3),()),val(int,-3)) -evaluated(minus,(val(int,2),()),bad) -evaluated(minus,(val(int,2),()),val(none,none)) -evaluated(minus,(val(int,2),()),val(int,2)) -evaluated(minus,(val(none,none),()),val(none,none)) -evaluated(minus,(val(none,none),()),val(int,0)) -evaluated(minus,(bad,()),val(none,none)) -evaluated(minus,(bad,()),val(int,0)) diff --git a/tests/correctness/unit/unary/int_minus.expected.stats b/tests/correctness/unit/unary/int_minus.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/int_minus.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/correctness/unit/unary/int_minus.lp b/tests/correctness/unit/unary/int_minus.lp deleted file mode 100644 index 33ef1be7..00000000 --- a/tests/correctness/unit/unary/int_minus.lp +++ /dev/null @@ -1,14 +0,0 @@ -phase_request(constantFolding,false). - -evaluate(minus,(val(int,-3),())). -evaluate(minus,(val(int,2),())). -evaluate(minus,(val(none,none),())). -evaluate(minus,(bad,())). - - -variable_declare(x,fromFacts). -variable_domain(x,val(int,-3)). -variable_domain(x,val(int,2)). -variable_domain(x,val(none,none)). -variable_domain(x,bad). -evaluate(minus,(variable(x),())). diff --git a/tests/correctness/unit/unary/int_mult.expected.all b/tests/correctness/unit/unary/int_mult.expected.all deleted file mode 100644 index 505456f1..00000000 --- a/tests/correctness/unit/unary/int_mult.expected.all +++ /dev/null @@ -1,3 +0,0 @@ -evaluated(mult,(val(int,-3),()),val(int,-3)) -evaluated(mult,(val(bool,true),()),val(int,1)) -evaluated(mult,(val(bool,false),()),val(int,0)) diff --git a/tests/correctness/unit/unary/int_mult.expected.none b/tests/correctness/unit/unary/int_mult.expected.none deleted file mode 100644 index 481b2c8d..00000000 --- a/tests/correctness/unit/unary/int_mult.expected.none +++ /dev/null @@ -1,9 +0,0 @@ -evaluated(mult,(val(int,-3),()),bad) -evaluated(mult,(val(int,-3),()),val(none,none)) -evaluated(mult,(val(int,-3),()),val(int,3)) -evaluated(mult,(val(bool,true),()),bad) -evaluated(mult,(val(bool,true),()),val(none,none)) -evaluated(mult,(val(bool,true),()),val(int,0)) -evaluated(mult,(val(bool,false),()),bad) -evaluated(mult,(val(bool,false),()),val(none,none)) -evaluated(mult,(val(bool,false),()),val(int,1)) diff --git a/tests/correctness/unit/unary/int_mult.lp b/tests/correctness/unit/unary/int_mult.lp deleted file mode 100644 index 2778cc43..00000000 --- a/tests/correctness/unit/unary/int_mult.lp +++ /dev/null @@ -1,3 +0,0 @@ -evaluate(mult,(val(int,-3),())). -evaluate(mult,(val(bool,true),())). -evaluate(mult,(val(bool,false),())). diff --git a/tests/correctness/unit/unary/string_length.expected.none b/tests/correctness/unit/unary/string_length.expected.none deleted file mode 100644 index 54e1b889..00000000 --- a/tests/correctness/unit/unary/string_length.expected.none +++ /dev/null @@ -1,12 +0,0 @@ -evaluated(length,(val(string,"ab"),()),val(int,0)) -evaluated(length,(val(string,"ab"),()),bad) -evaluated(length,(val(string,"ab"),()),val(none,none)) -evaluated(length,(val(string,""),()),val(int,2)) -evaluated(length,(val(string,""),()),bad) -evaluated(length,(val(string,""),()),val(none,none)) -evaluated(length,(val(none,none),()),val(int,2)) -evaluated(length,(val(none,none),()),val(int,0)) -evaluated(length,(val(none,none),()),val(none,none)) -evaluated(length,(bad,()),val(int,2)) -evaluated(length,(bad,()),val(int,0)) -evaluated(length,(bad,()),val(none,none)) diff --git a/tests/correctness/unit/unary/string_length.expected.stats b/tests/correctness/unit/unary/string_length.expected.stats deleted file mode 100644 index 1c974a68..00000000 --- a/tests/correctness/unit/unary/string_length.expected.stats +++ /dev/null @@ -1 +0,0 @@ -models=4 diff --git a/tests/test_encoding.py b/tests/test_encoding.py index 4211a824..8a1dcb65 100644 --- a/tests/test_encoding.py +++ b/tests/test_encoding.py @@ -60,45 +60,129 @@ def run_test(name: str, engine: Literal["compile", "compile2", "ground", "propag datatype_tests = [ "datatype/casting", - "datatype/bool/conj_disj", - "datatype/bool/conj_disj_bad", - "datatype/bool/conj_disj_mixed", - "datatype/bool/conj_disj_none", - "datatype/bool/conj_disj_variadic", + "datatype/bool/conj_disj/basic", + "datatype/bool/conj_disj/bad", + "datatype/bool/conj_disj/mixed", + "datatype/bool/conj_disj/none", + "datatype/bool/conj_disj/variadic", + "datatype/bool/conj_disj/variable", + "datatype/bool/leqv_lxor/bad", + "datatype/bool/leqv_lxor/leqv_basic", + "datatype/bool/leqv_lxor/lxor_basic", + "datatype/bool/leqv_lxor/none", + "datatype/bool/leqv_lxor/variable", + "datatype/bool/leqv_lxor/variadic", "datatype/bool/derived_relations", "datatype/bool/equivalence_bad", "datatype/bool/evaluate", "datatype/bool/implication_bad", - "datatype/bool/negation_logical_bad", - "datatype/bool/negation_logical_basic", - "datatype/bool/negation_logical_none", - "datatype/bool/negation_strong_bad", - "datatype/bool/negation_strong_basic", - "datatype/bool/negation_strong_none", - "datatype/bool/negation_weak_bad", - "datatype/bool/negation_weak_basic", - "datatype/bool/negation_weak_none", + "datatype/bool/negation/logical_bad", + "datatype/bool/negation/logical_basic", + "datatype/bool/negation/logical_none", + "datatype/bool/negation/strong_bad", + "datatype/bool/negation/strong_basic", + "datatype/bool/negation/strong_none", + "datatype/bool/negation/weak_bad", + "datatype/bool/negation/weak_basic", + "datatype/bool/negation/weak_none", + "datatype/bool/negation/variable", + "datatype/conditional/if/bad", + "datatype/conditional/if/basic", + "datatype/conditional/if/recovery", + "datatype/conditional/if/variable", + "datatype/conditional/orElse/bad", + "datatype/conditional/orElse/basic", + "datatype/conditional/orElse/recovery", + "datatype/conditional/orElse/variable", + "datatype/float/abs/basic", + "datatype/float/abs/variable", + "datatype/float/add/bad", + "datatype/float/add/basic", + "datatype/float/add/mixed", + "datatype/float/add/none", + "datatype/float/add/variable", + "datatype/float/add/variadic", + "datatype/float/ceil_floor/bad", + "datatype/float/ceil_floor/basic", + "datatype/float/ceil_floor/mixed", + "datatype/float/ceil_floor/none", + "datatype/float/ceil_floor/variable", "datatype/float/division", "datatype/float/division_with_int", "datatype/float/equality_basic", "datatype/float/equality_cross_type", "datatype/float/extrema", - "datatype/float/nary_add", + "datatype/float/mult/bad", + "datatype/float/mult/basic", + "datatype/float/mult/mixed", + "datatype/float/mult/nary", + "datatype/float/mult/none", + "datatype/float/mult/recovery", + "datatype/float/mult/variable", + "datatype/float/mult/variadic", "datatype/float/ordering_cross_type", "datatype/float/ordering_with_int", + "datatype/float/pow/bad", + "datatype/float/pow/basic", + "datatype/float/pow/mixed", + "datatype/float/pow/none", + "datatype/float/pow/variable", "datatype/float/rounding", - "datatype/int/abs", - "datatype/int/arithmetic_add_mul_basic", - "datatype/int/arithmetic_sub_basic", + "datatype/float/sub/bad", + "datatype/float/sub/basic", + "datatype/float/sub/none", + "datatype/float/sub/variable", + "datatype/int/abs/bad", + "datatype/int/abs/basic", + "datatype/int/abs/none", + "datatype/int/abs/variable", + "datatype/int/add/bad", + "datatype/int/add/basic", + "datatype/int/add/nary", + "datatype/int/add/none", + "datatype/int/add/variable", + "datatype/int/add/variadic", "datatype/int/comparison", "datatype/int/division", "datatype/int/equality_compound_basic", "datatype/int/equality_cross_type", "datatype/int/extrema", - "datatype/int/minus", + "datatype/int/minus/bad", + "datatype/int/minus/basic", + "datatype/int/minus/none", + "datatype/int/minus/variable", + "datatype/int/mult/bad", + "datatype/int/mult/basic", + "datatype/int/mult/nary", + "datatype/int/mult/none", + "datatype/int/mult/variable", + "datatype/int/mult/variadic", "datatype/int/ordering_cross_type", - "datatype/int/power", - "datatype/strings", + "datatype/int/pow/bad", + "datatype/int/pow/basic", + "datatype/int/pow/recovery", + "datatype/int/pow/none", + "datatype/int/pow/variable", + "datatype/int/sub/bad", + "datatype/int/sub/basic", + "datatype/int/sub/none", + "datatype/int/sub/variable", + "datatype/string/mixed", + "datatype/string/concat/bad", + "datatype/string/concat/basic", + "datatype/string/concat/none", + "datatype/string/concat/variable", + "datatype/string/length/bad", + "datatype/string/length/basic", + "datatype/string/length/none", + "datatype/string/length/variable", + "datatype/string/order/bad", + "datatype/string/order/geq", + "datatype/string/order/gt", + "datatype/string/order/leq", + "datatype/string/order/lt", + "datatype/string/order/none", + "datatype/string/order/variable", ] default_tests = [ @@ -275,125 +359,61 @@ def run_test(name: str, engine: Literal["compile", "compile2", "ground", "propag ] unit_tests = [ - "unit/bad_add", - "unit/bad_concat", - "unit/bad_eq", - "unit/bad_float_div", - "unit/bad_geq", - "unit/bad_gt", - "unit/bad_int_div", - "unit/bad_leq", - "unit/bad_leqv", - "unit/bad_lt", - "unit/bad_lxor", - "unit/bad_max", - "unit/bad_min", - "unit/bad_mult", - "unit/bad_neq", - "unit/bad_sub", - "unit/boolean_conj", - "unit/boolean_default", - "unit/boolean_disj", - "unit/boolean_disj_none_bug", - "unit/boolean_if", - "unit/boolean_ite", - "unit/boolean_leqv", - "unit/boolean_leqv_none_bug", - "unit/boolean_limp", - "unit/boolean_limp_none_bug", - "unit/boolean_lxor", - "unit/boolean_lxor_none_bug", + "unit/bad/bad_eq", + "unit/bad/bad_float_div", + "unit/bad/bad_geq", + "unit/bad/bad_gt", + "unit/bad/bad_int_div", + "unit/bad/bad_leq", + "unit/bad/bad_lt", + "unit/bad/bad_max", + "unit/bad/bad_min", + "unit/bad/bad_neq", + "unit/boolean/boolean_ite", + "unit/boolean/boolean_limp", + "unit/boolean/boolean_limp_none_bug", "unit/equality_eq", "unit/equality_neq", - "unit/float_add", - "unit/float_eq", - "unit/float_float_div", - "unit/float_geq", - "unit/float_gt", - "unit/float_int_div", - "unit/float_leq", - "unit/float_lt", - "unit/float_max", - "unit/float_min", - "unit/float_mult", - "unit/float_neq", - "unit/float_pow", - "unit/float_sub", - "unit/int_add", - "unit/int_geq", - "unit/int_gt", - "unit/int_int_div", - "unit/int_leq", - "unit/int_lt", - "unit/int_max", - "unit/int_min", - "unit/int_mult", - "unit/int_pow", - "unit/int_sub", - "unit/nullary/boolean_conj", - "unit/nullary/boolean_disj", - "unit/nullary/boolean_leqv", - "unit/nullary/boolean_lxor", - "unit/nullary/float_add", - "unit/nullary/float_mult", - "unit/nullary/int_add", - "unit/nullary/int_mult", + "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_int_div", + "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_diff", - "unit/set_eq", - "unit/set_inter", - "unit/set_neq", - "unit/set_set_isin", - "unit/set_set_make", - "unit/set_set_notin", - "unit/set_subset", - "unit/set_union", - "unit/string_concat", - "unit/string_geq", - "unit/string_gt", - "unit/string_leq", - "unit/string_lt", - "unit/symbol_geq", - "unit/symbol_gt", - "unit/symbol_leq", - "unit/symbol_lt", + "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_abs", - "unit/unary/bad_add", - "unit/unary/bad_ceil", - "unit/unary/bad_floor", "unit/unary/bad_hasValue", - "unit/unary/bad_length", - "unit/unary/bad_leqv", - "unit/unary/bad_lnot", - "unit/unary/bad_lxor", - "unit/unary/bad_minus", - "unit/unary/bad_snot", - "unit/unary/bad_wnot", "unit/unary/boolean_hasValue", - "unit/unary/boolean_leqv", - "unit/unary/boolean_lnot", - "unit/unary/boolean_lxor", - "unit/unary/boolean_snot", - "unit/unary/boolean_wnot", - "unit/unary/float_abs", - "unit/unary/float_add", - "unit/unary/float_ceil", - "unit/unary/float_floor", "unit/unary/float_minus", - "unit/unary/float_mult", - "unit/unary/int_abs", - "unit/unary/int_add", - "unit/unary/int_ceil", - "unit/unary/int_floor", - "unit/unary/int_minus", - "unit/unary/int_mult", "unit/unary/set_length", - "unit/unary/string_length", ] variable_tests = [ @@ -454,20 +474,15 @@ def run_test(name: str, engine: Literal["compile", "compile2", "ground", "propag compile_skip: set[str] = set() compile_xfail: set[str] = { - "datatype/bool/conj_disj_mixed", - "datatype/bool/conj_disj_none", + "datatype/bool/conj_disj/mixed", + "datatype/bool/conj_disj/none", + "datatype/float/mult/recovery", + "datatype/float/pow/mixed", "default/depends/single", "default/depends/with_domain_bydepends", "engine/request", "type/bool/with_none_binary", "type/bool/with_none_unary", - "unit/boolean_conj", - "unit/boolean_disj", - "unit/boolean_disj_none_bug", - "unit/string_geq", - "unit/string_gt", - "unit/string_leq", - "unit/string_lt", "unit/tuple_eq", "unit/tuple_neq", } @@ -482,6 +497,9 @@ def run_test(name: str, engine: Literal["compile", "compile2", "ground", "propag "core/reasoning_modes", # multimap "core/reasoning_modes_with_show", "datatype/bool/conj_disj_mixed", + "datatype/float/mult/recovery", + "datatype/float/pow/mixed", + "datatype/int/mult/variable", "default/define/condition", "default/define/with_domain", "default/depends/condition", @@ -516,9 +534,8 @@ def run_test(name: str, engine: Literal["compile", "compile2", "ground", "propag "type/bool/with_none_unary", "type/checking/numeric", "type/multimap/operations", - "unit/float_max", - "unit/float_min", - "unit/int_mult", + "unit/float/float_max", + "unit/float/float_min", } ground_skip: set[str] = { "core/python_set_bool_brave", @@ -531,6 +548,7 @@ def run_test(name: str, engine: Literal["compile", "compile2", "ground", "propag "core/reasoning_modes_with_show", "core/set_execution_input_alias", "datatype/bool/conj_disj_mixed", + "datatype/float/mult/recovery", "default/depends/single", "default/depends/with_domain_bydepends", "engine/request", @@ -564,6 +582,7 @@ def run_test(name: str, engine: Literal["compile", "compile2", "ground", "propag propagator_xfail: set[str] = { "core/reasoning_modes_with_show", "datatype/bool/conj_disj_mixed", + "datatype/float/mult/recovery", "default/basic_true", "default/define/condition", "default/define/disabled", @@ -642,6 +661,32 @@ def test_engine(name: str, engine: Literal["compile", "compile2", "ground", "pro "core/set_interface_value_marker", "core/shared_optional_output_domains", "core/unprojected_optional_equality", + "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/mult/variable", + "datatype/float/pow/variable", + "datatype/float/sub/variable", + "datatype/int/abs/variable", + "datatype/int/add/nary", + "datatype/int/add/variable", + "datatype/int/minus/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", @@ -661,125 +706,70 @@ def test_engine(name: str, engine: Literal["compile", "compile2", "ground", "pro "python/dynamic", "warning/forbid_labeled_match", "warning/python_extract/statement_error", - "unit/bad_add", - "unit/bad_concat", - "unit/bad_eq", - "unit/bad_float_div", - "unit/bad_geq", - "unit/bad_gt", - "unit/bad_int_div", - "unit/bad_leq", - "unit/bad_leqv", - "unit/bad_lt", - "unit/bad_lxor", - "unit/bad_max", - "unit/bad_min", - "unit/bad_mult", - "unit/bad_neq", - "unit/bad_sub", - "unit/boolean_conj", - "unit/boolean_default", - "unit/boolean_disj", - "unit/boolean_disj_none_bug", - "unit/boolean_if", - "unit/boolean_ite", - "unit/boolean_leqv", - "unit/boolean_leqv_none_bug", - "unit/boolean_limp", - "unit/boolean_limp_none_bug", - "unit/boolean_lxor", - "unit/boolean_lxor_none_bug", + "unit/bad/bad_eq", + "unit/bad/bad_float_div", + "unit/bad/bad_geq", + "unit/bad/bad_gt", + "unit/bad/bad_int_div", + "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_add", - "unit/float_eq", - "unit/float_float_div", - "unit/float_geq", - "unit/float_gt", - "unit/float_int_div", - "unit/float_leq", - "unit/float_lt", - "unit/float_max", - "unit/float_min", - "unit/float_mult", - "unit/float_neq", - "unit/float_pow", - "unit/float_sub", - "unit/int_add", - "unit/int_geq", - "unit/int_gt", - "unit/int_int_div", - "unit/int_leq", - "unit/int_lt", - "unit/int_max", - "unit/int_min", - "unit/int_mult", - "unit/int_pow", - "unit/int_sub", - "unit/nullary/boolean_conj", - "unit/nullary/boolean_disj", - "unit/nullary/boolean_leqv", - "unit/nullary/boolean_lxor", - "unit/nullary/float_add", - "unit/nullary/float_mult", - "unit/nullary/int_add", - "unit/nullary/int_mult", + "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_int_div", + "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_diff", - "unit/set_eq", - "unit/set_inter", - "unit/set_neq", - "unit/set_set_isin", - "unit/set_set_make", - "unit/set_set_notin", - "unit/set_subset", - "unit/set_union", - "unit/string_concat", - "unit/string_geq", - "unit/string_gt", - "unit/string_leq", - "unit/string_lt", - "unit/symbol_geq", - "unit/symbol_gt", - "unit/symbol_leq", - "unit/symbol_lt", + "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_abs", - "unit/unary/bad_add", - "unit/unary/bad_ceil", - "unit/unary/bad_floor", "unit/unary/bad_hasValue", "unit/unary/bad_length", - "unit/unary/bad_leqv", "unit/unary/bad_lnot", - "unit/unary/bad_lxor", - "unit/unary/bad_minus", "unit/unary/bad_snot", "unit/unary/bad_wnot", "unit/unary/boolean_hasValue", - "unit/unary/boolean_leqv", "unit/unary/boolean_lnot", - "unit/unary/boolean_lxor", "unit/unary/boolean_snot", "unit/unary/boolean_wnot", - "unit/unary/float_abs", - "unit/unary/float_add", - "unit/unary/float_ceil", - "unit/unary/float_floor", "unit/unary/float_minus", - "unit/unary/float_mult", - "unit/unary/int_abs", - "unit/unary/int_add", - "unit/unary/int_ceil", - "unit/unary/int_floor", - "unit/unary/int_minus", - "unit/unary/int_mult", "unit/unary/set_length", - "unit/unary/string_length", } choice_statistics_xfail: set[str] = { "core/conditional_assign", @@ -791,7 +781,6 @@ def test_engine(name: str, engine: Literal["compile", "compile2", "ground", "pro "datatype/bool/equivalence_bad", "datatype/bool/evaluate", "datatype/bool/implication_bad", - "datatype/strings", "error/recovery_ensure", "execution/assert", "execution/change",