Objective POC implementation

8 files changed, 103 insertions, 33 deletions

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath
index 1c96fe2f..4a3597ed 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.classpath
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>

-        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-        <classpathentry kind="src" path="src"/>

-        <classpathentry kind="src" path="xtend-gen"/>

-        <classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+        <classpathentry kind="src" path="src"/>
+        <classpathentry kind="src" path="xtend-gen"/>
+        <classpathentry kind="src" path="src-gen"/>
+        <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.project b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.project
index 86c19a90..2917d28f 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.project
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/.project
@@ -11,6 +11,11 @@
                         </arguments>

                 </buildCommand>

                 <buildCommand>

+                        <name>org.eclipse.viatra.query.tooling.ui.projectbuilder</name>

+                        <arguments>

+                        </arguments>

+                </buildCommand>

+                <buildCommand>

                         <name>org.eclipse.jdt.core.javabuilder</name>

                         <arguments>

                         </arguments>

@@ -29,6 +34,7 @@
         <natures>

                 <nature>org.eclipse.pde.PluginNature</nature>

                 <nature>org.eclipse.jdt.core.javanature</nature>

+                <nature>org.eclipse.viatra.query.projectnature</nature>

                 <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>

         </natures>

 </projectDescription>

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF
index dc9f3788..290b5a22 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/META-INF/MANIFEST.MF
@@ -1,15 +1,19 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: FAMTest

-Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.application.FAMTest;singleton:=true

-Bundle-Version: 1.0.0.qualifier

-Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.application.FAMTest

-Bundle-RequiredExecutionEnvironment: JavaSE-1.8

-Require-Bundle: com.google.guava,

- org.eclipse.xtext.xbase.lib,

- org.eclipse.xtend.lib,

- org.eclipse.xtend.lib.macro,

- hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0";visibility:=reexport

-Import-Package: org.apache.log4j;version="1.2.15",

- org.junit;version="4.12.0"

-Export-Package: hu.bme.mit.inf.dslreasoner.application.FAMTest

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: FAMTest
+Bundle-SymbolicName: hu.bme.mit.inf.dslreasoner.application.FAMTest;singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Export-Package: hu.bme.mit.inf.dslreasoner.application.FAMTest
+Require-Bundle: org.eclipse.emf.ecore,
+ org.eclipse.viatra.query.runtime,
+ org.eclipse.viatra.query.runtime.rete,
+ org.eclipse.viatra.query.runtime.localsearch,
+ com.google.guava,
+ org.eclipse.xtext.xbase.lib,
+ org.eclipse.xtend.lib,
+ org.eclipse.xtend.lib.macro,
+ hu.bme.mit.inf.dslreasoner.application;bundle-version="1.0.0";visibility:=reexport
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Import-Package: org.apache.log4j;version="1.2.15",
+ org.junit;version="4.12.0"
+Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.application.FAMTest
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties
index 466224af..ce900fd9 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/build.properties
@@ -1,7 +1,8 @@
-source.. = src/,\

-           xtend-gen/

-output.. = bin/

-bin.includes = META-INF/,\

-               .

-additional.bundles = org.apache.log4j,\

-                     org.junit

+bin.includes = META-INF/,\
+               .
+additional.bundles = org.apache.log4j,\
+                     org.junit
+source.. = src/,\
+           xtend-gen/,\
+           src-gen/
+output.. = bin/
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/configs/generation.vsconfig b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/configs/generation.vsconfig
index 490d6942..c29d234a 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/configs/generation.vsconfig
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/configs/generation.vsconfig
@@ -7,7 +7,12 @@ generate {
         partial-model = { "inputs/FamInstance.xmi"}

         solver = ViatraSolver

         scope = {

-                #node = 500

+                #node = 5

+        }

+        objectives = {

+                minimize cost {

+                        hu.bme.mit.inf.dslreasoner.domains.fam::informationLink = 1

+                }

         }

         

         config = {

diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/generator.vqgen b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/generator.vqgen
new file mode 100644
index 00000000..daba017b
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/generator.vqgen
@@ -0,0 +1 @@
+genmodel "platform:/resource/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamMetamodel.genmodel"
\ No newline at end of file
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamMetamodel.genmodel b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamMetamodel.genmodel
new file mode 100644
index 00000000..b325a20c
--- /dev/null
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamMetamodel.genmodel
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/hu.bme.mit.inf.dslreasoner.application.FAMTest/src"
+    modelPluginID="hu.bme.mit.inf.dslreasoner.application.FAMTest" modelName="FamMetamodel"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" importerID="org.eclipse.emf.importer.ecore"
+    complianceLevel="8.0" copyrightFields="false" operationReflection="true" importOrganizing="true">
+  <foreignModel>FamMetamodel.ecore</foreignModel>
+  <genPackages prefix="Functionalarchitecture" disposableProviderFactory="true" ecorePackage="FamMetamodel.ecore#/">
+    <genEnums typeSafeEnumCompatible="false" ecoreEnum="FamMetamodel.ecore#//FunctionType">
+      <genEnumLiterals ecoreEnumLiteral="FamMetamodel.ecore#//FunctionType/Root"/>
+      <genEnumLiterals ecoreEnumLiteral="FamMetamodel.ecore#//FunctionType/Intermediate"/>
+      <genEnumLiterals ecoreEnumLiteral="FamMetamodel.ecore#//FunctionType/Leaf"/>
+    </genEnums>
+    <genClasses image="false" ecoreClass="FamMetamodel.ecore#//FunctionalElement">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalElement/interface"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalElement/model"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalElement/parent"/>
+    </genClasses>
+    <genClasses ecoreClass="FamMetamodel.ecore#//FunctionalArchitectureModel">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalArchitectureModel/rootElements"/>
+    </genClasses>
+    <genClasses ecoreClass="FamMetamodel.ecore#//Function">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//Function/subElements"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute FamMetamodel.ecore#//Function/type"/>
+    </genClasses>
+    <genClasses ecoreClass="FamMetamodel.ecore#//FAMTerminator">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FAMTerminator/data"/>
+    </genClasses>
+    <genClasses ecoreClass="FamMetamodel.ecore#//InformationLink">
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FamMetamodel.ecore#//InformationLink/from"/>
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//InformationLink/to"/>
+    </genClasses>
+    <genClasses ecoreClass="FamMetamodel.ecore#//FunctionalInterface">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalInterface/data"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalInterface/element"/>
+    </genClasses>
+    <genClasses ecoreClass="FamMetamodel.ecore#//FunctionalInput">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalInput/IncomingLinks"/>
+    </genClasses>
+    <genClasses ecoreClass="FamMetamodel.ecore#//FunctionalOutput">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalOutput/outgoingLinks"/>
+    </genClasses>
+    <genClasses image="false" ecoreClass="FamMetamodel.ecore#//FunctionalData">
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalData/terminator"/>
+      <genFeatures property="None" notify="false" createChild="false" ecoreFeature="ecore:EReference FamMetamodel.ecore#//FunctionalData/interface"/>
+    </genClasses>
+  </genPackages>
+</genmodel:GenModel>
diff --git a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamPatterns.vql b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamPatterns.vql
index 013d0419..31b9286e 100644
--- a/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamPatterns.vql
+++ b/Tests/hu.bme.mit.inf.dslreasoner.application.FAMTest/inputs/FamPatterns.vql
@@ -5,8 +5,12 @@ import epackage "http://www.inf.mit.bme.hu/viatrasolver/example/fam"
 @Constraint(message="terminatorAndInformation", severity="error", key={T})

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

         FunctionalOutput.outgoingLinks(Out,I);

-        FunctionalOutput.terminator(Out,T); 

+        FunctionalOutput.terminator(Out,T);

 } or {

         InformationLink.to(I,In);

         FunctionalInput.terminator(In,T);

-}
\ No newline at end of file
+}

+

+pattern informationLink(I : InformationLink) {

+        InformationLink(I);

+}