Commit before merge

3 files changed, 21 insertions, 8 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/ecore/queries/ecorePatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/ecore/queries/ecorePatterns.vql
index 9af35b50..a4718150 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/ecore/queries/ecorePatterns.vql
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/ecore/queries/ecorePatterns.vql
@@ -14,13 +14,13 @@ pattern loopInInheritence(a: EClass) {
 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 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) {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famSPatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famSPatterns.vql
new file mode 100644
index 00000000..307b0f9c
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famSPatterns.vql
@@ -0,0 +1,13 @@
+package ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries

+

+//import epackage "http://www.inf.mit.bme.hu/viatrasolver/example/fam"

+import epackage "FamMetamodel"

+

+@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);

+}
\ No newline at end of file
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famXPatterns.vql
index 02d34dcd..153fec91 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famXPatterns.vql
@@ -1,6 +1,6 @@
 package ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries

 

-import "FamMetamodel"

+import epackage "http://www.inf.mit.bme.hu/viatrasolver/example/fam"

 

 @Constraint(message="terminatorAndInformation", severity="error", key={T})

 pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {