4 files changed, 4 insertions, 107 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/Function.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/Function.java
index 1fed3a2d..b2e5af29 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/Function.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/Function.java
@@ -53,7 +53,7 @@ public interface Function extends FunctionalElement {
          * @see ca.mcgill.ecse.dslreasoner.standalone.test.fam.FunctionType

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.fam.famPackage#getFunction_Type()

          * @model required="true" transient="true" changeable="false" volatile="true" derived="true"

-         *        annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='ca.mcgill.ecse.dslreasoner.standalone.test.xyz.type'"

+         *        annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.type'"

          * @generated

          */

         FunctionType getType();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/FunctionalElement.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/FunctionalElement.java
index c3ed76d6..acfffbc0 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/FunctionalElement.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/FunctionalElement.java
@@ -63,7 +63,7 @@ public interface FunctionalElement extends EObject {
          * @see #setModel(FunctionalArchitectureModel)

          * @see ca.mcgill.ecse.dslreasoner.standalone.test.fam.famPackage#getFunctionalElement_Model()

          * @model required="true" transient="true" volatile="true" derived="true"

-         *        annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='ca.mcgill.ecse.dslreasoner.standalone.test.xyz.model'"

+         *        annotation="org.eclipse.viatra.query.querybasedfeature patternFQN='ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.model'"

          * @generated

          */

         FunctionalArchitectureModel getModel();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/impl/famPackageImpl.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/impl/famPackageImpl.java
index 74efeeeb..e928e04e 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/impl/famPackageImpl.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/impl/famPackageImpl.java
@@ -561,13 +561,13 @@ public class famPackageImpl extends EPackageImpl implements famPackage {
                   (getFunctionalElement_Model(), 

                    source, 

                    new String[] {

-                         "patternFQN", "ca.mcgill.ecse.dslreasoner.standalone.test.xyz.model"

+                         "patternFQN", "ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.model"

                    });  

                 addAnnotation

                   (getFunction_Type(), 

                    source, 

                    new String[] {

-                         "patternFQN", "ca.mcgill.ecse.dslreasoner.standalone.test.xyz.type"

+                         "patternFQN", "ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.type"

                    });

         }

 

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql
deleted file mode 100644
index 02d34dcd..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src/ca/mcgill/ecse/dslreasoner/standalone/test/fam/queries/famPatterns.vql
+++ /dev/null
@@ -1,103 +0,0 @@
-package ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries

-

-import "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);

-}

-

-@QueryBasedFeature 

-pattern type(This : Function, Target : FunctionType) = {

-        find rootElements(_Model, This);

-        Target == FunctionType::Root;

-} or {

-        neg find parent(_Child, This);

-        neg find rootElements(_Model, This);

-        Target == FunctionType::Leaf;

-} or  {

-        find parent(This, _Par);

-        find parent(_Child, This);

-        Target == FunctionType::Intermediate;

-}

-

-pattern rootElements(Model: FunctionalArchitectureModel, Root : Function) = {

-        FunctionalArchitectureModel.rootElements(Model, Root);

-}

-

-pattern parent(Func : Function, Par : Function) = {

-        Function.parent(Func, Par);

-}

-

-@QueryBasedFeature 

-pattern model(This:FunctionalElement, Target: FunctionalArchitectureModel) {

-        FunctionalElement(This);

-        FunctionalArchitectureModel(Target);

-}

-

-/*

-@Constraint(message="noRoot", severity="error", key={fam})

-pattern noRoot(fam: FunctionalArchitectureModel) {

-        FunctionalArchitectureModel(fam);

-        neg find hasRoot(_);

-}

-@Constraint(message="noIntermediate", severity="error", key={fam})

-pattern noInt(fam: FunctionalArchitectureModel) {

-        FunctionalArchitectureModel(fam);

-        neg find hasInt(_);

-}

-@Constraint(message="noLeaf", severity="error", key={fam})

-pattern noLeaf(fam: FunctionalArchitectureModel) {

-        FunctionalArchitectureModel(fam);

-        neg find hasLeaf(_);

-}

-*/

-

-/*

-@QueryBasedFeature

-pattern model(This : FunctionalElement, Target : FunctionalArchitectureModel) = {

-        find parent+(This, Parent);

-        find rootElements(Target, Parent);

-} or {

-        find rootElements(Target, This);

-}

-

-pattern interfaceData(FI : FunctionalInterface, FD : FunctionalData) = {

-        FunctionalInterface.data(FI, FD);

-}

-

-@QueryBasedFeature

-pattern inputs(This : FunctionalInterface, Target : FunctionalInput) = {

-        find interfaceData(This, Target);

-}

-

-@QueryBasedFeature

-pattern outputs(This : FunctionalInterface, Target : FunctionalOutput) = {

-        find interfaceData(This, Target);

-}

-

-@QueryBasedFeature

-pattern outgoingLinks(This : FunctionalElement, Target : InformationLink) = {

-        FunctionalElement.interface.outputs(This, Output);

-        InformationLink.from(Target, Output);

-}

-

-@QueryBasedFeature

-pattern incomingLinks(This : FunctionalElement, Target : InformationLink) = {

-        FunctionalElement.interface.inputs(This, Input);

-        InformationLink.to(Target, Input);

-}

-

-@QueryBasedFeature

-pattern connects(This : FunctionalElement, Target : FunctionalElement) = {

-        FunctionalElement.outgoingLinks(This,Link);

-        FunctionalElement.incomingLinks(Target,Link);

-}*/

-

-/*pattern frequency(a: Function, b : EInt) {

-        Function.minimumFrequency(a,b);

-}*/