Config language WIP

4 files changed, 26 insertions, 19 deletions

diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.FamilyTreeConstraints.java._trace b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.FamilyTreeConstraints.java._trace
index 364eae66..b000501e 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.FamilyTreeConstraints.java._trace
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.FamilyTreeConstraints.java._trace
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.MemberIsItsOwnParent.java._trace b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.MemberIsItsOwnParent.java._trace
index 1b0dca98..aaf4d0c2 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.MemberIsItsOwnParent.java._trace
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.MemberIsItsOwnParent.java._trace
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
index 3be531f5..3b9ccef7 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
@@ -6,3 +6,4 @@
 /.MemberHasNoParent.java._trace
 /.MemberHasParent.java._trace
 /.TwoMembersHaveNoParent.java._trace
+/.NegativeAge.java._trace
diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql
index e7b44f0b..fdbac640 100644
--- a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql
@@ -9,25 +9,31 @@ pattern memberIsItsOwnParent(m: Member) = {
         m == p;

 }

 

-//@Constraint(message="twoMembersHaveNoParent", severity="error", key={m1, m2})

-//pattern twoMembersHaveNoParent(m1:Member, m2:Member) = {

-//      neg find memberHasParent(m1);

-//      neg find memberHasParent(m2);

-//      m1 != m2;

-//}

-//

-//pattern memberHasParent(m: Member) = {

-//      Member.parents(m, _);

-//}

-//

-//@Constraint(message="parentTooYoung", severity="error", key={m, p})

-//pattern parentTooYoung(m: Member, p: Member) = {

-//      FamilyTree.members(_, m);

-//      Member.parents(m, p);

-//      Member.age(m, mAge);

-//      Member.age(p, pAge);

-//      check (mAge <= (pAge + 12));

-//}

+@Constraint(message="twoMembersHaveNoParent", severity="error", key={m1, m2})

+pattern twoMembersHaveNoParent(m1:Member, m2:Member) = {

+        neg find memberHasParent(m1);

+        neg find memberHasParent(m2);

+        m1 != m2;

+}

+

+pattern memberHasParent(m: Member) = {

+        Member.parents(m, _);

+}

+

+@Constraint(message="negativeAge", severity="error",key={m})

+pattern negativeAge(m: Member) {

+        Member.age(m,mage);

+        check(mage<0);

+}

+

+@Constraint(message="parentTooYoung", severity="error", key={c, p})

+pattern parentTooYoung(c: Member, p: Member) = {

+        FamilyTree.members(_, c);

+        Member.parents(c, p);

+        Member.age(c, cAge);

+        Member.age(p, pAge);

+        check (pAge <= (cAge + 12));

+}