From c7bd519d3b62b063fb374b051e552b7bf28d3b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?O=CC=88zgu=CC=88r=20Akgu=CC=88n?= Date: Tue, 25 Jun 2019 14:37:52 +0300 Subject: [PATCH] ref #395 - solve example 1 and 3, 2 hits an SR bug --- tests/custom/issues/395/m_is_3.param | 1 + tests/custom/issues/395/run.sh | 8 +++++++- tests/custom/issues/395/stdout.expected | 20 ++++++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 tests/custom/issues/395/m_is_3.param diff --git a/tests/custom/issues/395/m_is_3.param b/tests/custom/issues/395/m_is_3.param new file mode 100644 index 0000000000..82271011c0 --- /dev/null +++ b/tests/custom/issues/395/m_is_3.param @@ -0,0 +1 @@ +letting m be 3 diff --git a/tests/custom/issues/395/run.sh b/tests/custom/issues/395/run.sh index d8ed8277eb..db2d708e52 100755 --- a/tests/custom/issues/395/run.sh +++ b/tests/custom/issues/395/run.sh @@ -1,5 +1,11 @@ rm -rf conjure-output + conjure modelling 1.essence ; head -n30 conjure-output/model000001.eprime conjure modelling 2.essence ; head -n30 conjure-output/model000001.eprime conjure modelling 3.essence ; head -n30 conjure-output/model000001.eprime -rm -rf conjure-output + +conjure solve 1.essence m_is_3.param ; cat *.solution ; rm -f *.solution +# conjure solve 2.essence m_is_3.param ; cat *.solution ; rm -f *.solution +conjure solve 3.essence m_is_3.param ; cat *.solution ; rm -f *.solution + +rm -rf conjure-output *.solution diff --git a/tests/custom/issues/395/stdout.expected b/tests/custom/issues/395/stdout.expected index 15590b4673..f869c73339 100644 --- a/tests/custom/issues/395/stdout.expected +++ b/tests/custom/issues/395/stdout.expected @@ -88,3 +88,23 @@ $ "lettings": [], $ "unnameds": [], $ "strategyQ": {"PickFirst": []}, $ "strategyA": {"Auto": {"Interactive": []}}, +Generating models for 1.essence +Generated models: model000001.eprime +Saved under: conjure-output +Savile Row: model000001.eprime m_is_3.param +Running minion for domain filtering. +Running solver: minion +Copying solution to: 1-m_is_3.solution +language Essence 1.3 + +letting Cs be sequence(0, 0, 0) +letting Cz be sequence(0, 0, 0) +Using cached models. +Savile Row: model000001.eprime m_is_3.param +Running minion for domain filtering. +Running solver: minion +Copying solution to: 3-m_is_3.solution +language Essence 1.3 + +letting Cs be sequence(0, 0, 0) +letting Cz be sequence(0, 0, 0)