fix merging issue

5 files changed, 106 insertions, 2 deletions

diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore
deleted file mode 100644
index 25056e9e..00000000
--- a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/ca/
-/queries/
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/.gitignore
new file mode 100644
index 00000000..f2558cf5
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/.gitignore
@@ -0,0 +1,10 @@
+/.Friendship.java._trace
+/.NoFriend.java._trace
+/.Queries.java._trace
+/.SelfFriend.java._trace
+/.SingleFriendship.java._trace
+/Friendship.java
+/NoFriend.java
+/Queries.java
+/SelfFriend.java
+/SingleFriendship.java
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/Queries.vql b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/Queries.vql
new file mode 100644
index 00000000..3e7fc68c
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/ca/mcgill/ecse/socialnetwork/plugin/Queries.vql
@@ -0,0 +1,54 @@
+package ca.mcgill.ecse.socialnetwork.plugin
+
+import epackage "http://ecse.mcgill.ca/socialnetwork"
+
+//@Constraint(message="terminatorAndInformation", severity="error", key={T})
+//pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {
+//      FunctionalOutput.outgoingLinks(Out,I);
+//      FunctionalOutput.terminator(Out,T);
+//} or {
+//      InformationLink.to(I,In);
+//      FunctionalInput.terminator(In,T);
+//}
+
+@Constraint(message="singleFriendship", severity="error", key={p1})
+pattern singleFriendship(p1: Person) {
+        find friendship(p1, p);
+        neg find friendship(p, p1);
+}
+
+//@Constraint(message="cycle", severity="error", key={p})
+//pattern cycleInParenthood(p: Person) {
+//      find isAncestor(p, p);
+//}
+
+@Constraint(message="noFriend", severity="error", key={p})
+pattern noFriend(p: Person){
+        neg find friendship(p, _);
+}
+
+//@Constraint(message="brothhoodParent", severity="error", key={p1,p2})
+//pattern brothhoodParent(p1: Person, p2: Person){
+//      Person.parents(p1, parent1);
+//      Person.parents(p2, parent2);
+//      parent1 == parent2;
+//      find isAncestor(p1, p2);
+//}
+@Constraint(message="selfFriend", severity="error", key={p})
+pattern selfFriend(p: Person){
+        Person.friends(p,p);
+}
+
+pattern friendship(p1: Person, p2: Person){
+        Person.friends(p1,p2);
+}
+
+//pattern isAncestor(person : Person, ancestor : Person){
+//      Person.parents(person, ancestor);
+//} or {
+//      Person.parents(person, parent);
+//      find isAncestor(parent, ancestor);
+//}
+
+
+
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/.gitignore b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/.gitignore
new file mode 100644
index 00000000..e9d711d4
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/.gitignore
@@ -0,0 +1,9 @@
+/.Ecore_pattern.java._trace
+/.MoreThenFiveSuperTypes.java._trace
+/.DirectSupertype.java._trace
+/.Ecore.java._trace
+/.LoopInInheritence.java._trace
+/.NonSymmetricOpposite.java._trace
+/.Opposite.java._trace
+/.OppositeDifferentClass.java._trace
+/.SuperTypes.java._trace
diff --git a/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/Ecore.vql b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/Ecore.vql
new file mode 100644
index 00000000..9ddb64c9
--- /dev/null
+++ b/Metrics/Metrics-Calculation/SocialNetwork_plugin/bin/queries/Ecore.vql
@@ -0,0 +1,33 @@
+package queries
+
+import epackage "http://www.eclipse.org/emf/2002/Ecore"
+
+pattern directSupertype(a: EClass, b:EClass) {
+        EClass.eSuperTypes(a,b);
+}
+
+@Constraint(key={a}, severity="error", message="error")
+pattern loopInInheritence(a: EClass) {
+        find directSupertype+(a,a);
+}
+
+pattern opposite(a:EReference, b: EReference) {
+        EReference.eOpposite(a,b);
+}
+@Constraint(key={a}, severity="error", message="error")
+pattern oppositeDifferentClass(a:EReference) {
+        EReference.eOpposite(a,b);
+        EReference.eContainingClass(a,aContaining);
+        EReference.eType(b,bTarget);
+        aContaining != bTarget;
+}
+
+@Constraint(key={a}, severity="error", message="error")
+pattern nonSymmetricOpposite(a:EReference, b:EReference) {
+        find opposite(a,b);
+        neg find opposite(b,a);
+}
+
+pattern superTypes(c1:EClass, c2:EClass){
+        EClass.eSuperTypes(c1,c2);
+}