fix merging issue

5 files changed, 55 insertions, 0 deletions

diff --git a/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
new file mode 100644
index 00000000..7050a7e3
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/.gitignore
@@ -0,0 +1 @@
+/queries/
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
new file mode 100644
index 00000000..b000501e
--- /dev/null
+++ 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
new file mode 100644
index 00000000..aaf4d0c2
--- /dev/null
+++ 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
new file mode 100644
index 00000000..19bc3cc8
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/.gitignore
@@ -0,0 +1,13 @@
+/.FamilyTreeConstraints.java._trace
+/.MemberIsItsOwnParent.java._trace
+/FamilyTreeConstraints.java
+/MemberIsItsOwnParent.java
+/.ParentTooYoung.java._trace
+/.MemberHasNoParent.java._trace
+/.MemberHasParent.java._trace
+/.TwoMembersHaveNoParent.java._trace
+/.NegativeAge.java._trace
+/MemberHasParent.java
+/NegativeAge.java
+/ParentTooYoung.java
+/TwoMembersHaveNoParent.java
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
new file mode 100644
index 00000000..fdbac640
--- /dev/null
+++ b/Tests/MODELS2020-CaseStudies/case.study.familyTree.run/bin/queries/familyTreeConstraints.vql
@@ -0,0 +1,41 @@
+package queries

+ 

+import "http://www.example.org/familytree"

+

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

+pattern memberIsItsOwnParent(m: Member) = {

+        FamilyTree.members(_, m);

+        Member.parents(m, p);

+        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="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));

+}

+

+

+

+

+