fix dup decl bug + adjust famTree case study

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 {
         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) = {