diff options
author | 2021-01-07 23:23:37 -0500 | |
---|---|---|
committer | 2021-01-07 23:23:37 -0500 | |
commit | 2fd7b130fe5d05137e162ede499d5cc661d83424 (patch) | |
tree | 8242c120c51dc4030e43959336e17ed65b38b204 /Tests/MODELS2020-CaseStudies/case.study.familyTree.run | |
parent | crlf fix (diff) | |
download | VIATRA-Generator-2fd7b130fe5d05137e162ede499d5cc661d83424.tar.gz VIATRA-Generator-2fd7b130fe5d05137e162ede499d5cc661d83424.tar.zst VIATRA-Generator-2fd7b130fe5d05137e162ede499d5cc661d83424.zip |
fix dup decl bug + adjust famTree case study
Diffstat (limited to 'Tests/MODELS2020-CaseStudies/case.study.familyTree.run')
-rw-r--r-- | Tests/MODELS2020-CaseStudies/case.study.familyTree.run/inputs/familytreeGen.vsconfig | 7 | ||||
-rw-r--r-- | Tests/MODELS2020-CaseStudies/case.study.familyTree.run/queries/familyTreeConstraints.vql | 10 |
2 files changed, 9 insertions, 8 deletions
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 { | |||
6 | constraints = { package queries} | 6 | constraints = { package queries} |
7 | solver = ViatraSolver | 7 | solver = ViatraSolver |
8 | scope = { | 8 | scope = { |
9 | #node = 6..15, | 9 | #node = 10..30, |
10 | #int = {} | 10 | #int = {} |
11 | } | 11 | } |
12 | 12 | ||
@@ -20,6 +20,7 @@ generate { | |||
20 | runs = 1 | 20 | runs = 1 |
21 | 21 | ||
22 | debug = "outputs/debug" | 22 | debug = "outputs/debug" |
23 | log = "outputs/log.txt" | 23 | log = "outputs/debug/log.txt" |
24 | output = "outputs/models" | 24 | output = "outputs/models" |
25 | statistics = "outputs/statistics.csv" | ||
25 | } \ No newline at end of file | 26 | } \ 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) { | |||
26 | check(mage<0); | 26 | check(mage<0); |
27 | } | 27 | } |
28 | 28 | ||
29 | @Constraint(message="realisticAge", severity="error",key={m}) | 29 | //@Constraint(message="realisticAge", severity="error",key={m}) |
30 | pattern realisticAge(m: Member) { | 30 | //pattern realisticAge(m: Member) { |
31 | Member.age(m,mage); | 31 | // Member.age(m,mage); |
32 | check(mage>120); | 32 | // check(mage>120); |
33 | } | 33 | //} |
34 | 34 | ||
35 | @Constraint(message="parentTooYoung", severity="error", key={c, p}) | 35 | @Constraint(message="parentTooYoung", severity="error", key={c, p}) |
36 | pattern parentTooYoung(c: Member, p: Member) = { | 36 | pattern parentTooYoung(c: Member, p: Member) = { |