From 2fd7b130fe5d05137e162ede499d5cc661d83424 Mon Sep 17 00:00:00 2001 From: Aren Babikian Date: Thu, 7 Jan 2021 23:23:37 -0500 Subject: fix dup decl bug + adjust famTree case study --- .../case.study.familyTree.run/inputs/familytreeGen.vsconfig | 7 ++++--- .../queries/familyTreeConstraints.vql | 10 +++++----- 2 files changed, 9 insertions(+), 8 deletions(-) (limited to 'Tests') diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/inputs/familytreeGen.vsconfig b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/inputs/familytreeGen.vsconfig index 01b7f040..7ead54af 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/inputs/familytreeGen.vsconfig +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/inputs/familytreeGen.vsconfig @@ -6,7 +6,7 @@ generate { constraints = { package queries} solver = ViatraSolver scope = { - #node = 6..15, + #node = 10..30, #int = {} } @@ -20,6 +20,7 @@ generate { runs = 1 debug = "outputs/debug" - log = "outputs/log.txt" - output = "outputs/models" + log = "outputs/debug/log.txt" + output = "outputs/models" + statistics = "outputs/statistics.csv" } \ No newline at end of file diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/queries/familyTreeConstraints.vql b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/queries/familyTreeConstraints.vql index f8650073..450107d4 100644 --- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/queries/familyTreeConstraints.vql +++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/queries/familyTreeConstraints.vql @@ -26,11 +26,11 @@ pattern negativeAge(m: Member) { check(mage<0); } -@Constraint(message="realisticAge", severity="error",key={m}) -pattern realisticAge(m: Member) { - Member.age(m,mage); - check(mage>120); -} +//@Constraint(message="realisticAge", severity="error",key={m}) +//pattern realisticAge(m: Member) { +// Member.age(m,mage); +// check(mage>120); +//} @Constraint(message="parentTooYoung", severity="error", key={c, p}) pattern parentTooYoung(c: Member, p: Member) = { -- cgit v1.2.3-54-g00ecf