20 files changed, 78 insertions, 383 deletions

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath
index f03a6d83..3f0838b6 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/.classpath
@@ -5,6 +5,5 @@
         <classpathentry kind="src" path="src"/>

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

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

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

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

 </classpath>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
index 8b69d9a8..2ea274a4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/META-INF/MANIFEST.MF
@@ -3,11 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: Test
 Bundle-SymbolicName: ca.mcgill.ecse.dslreasoner.vampire.test;singleton:=true
 Bundle-Version: 1.0.0.qualifier
-Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries,
-  ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore,
-  ca.mcgill.ecse.dslreasoner.vampire.test.queries.fam,
-  ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem,
-  ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu
+Export-Package: ca.mcgill.ecse.dslreasoner.vampire.queries
 Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
   org.eclipse.emf.ecore,
   org.eclipse.viatra.query.runtime.rete,
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/build.properties b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/build.properties
index efae4b07..aed85a48 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/build.properties
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/build.properties
@@ -1,6 +1,5 @@
 bin.includes = META-INF/,\

                .

 source.. = src/,\

-           src-gen/,\

            src-gen/

 output.. = bin/

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
index 33dc7485..b0735f37 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
@@ -1,238 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?><plugin>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.EcorePatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.EcorePatterns" id="ca.mcgill.ecse.dslreasoner.vampire.queries.EcorePatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.directSupertype"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.loopInInheritence"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.opposite"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.nonSymmetricOpposite"/>

-    </group>

-  </extension>

   <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns">

       <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.terminatorAndInformation"/>

     </group>

   </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.patternContent"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.live"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.contentInNotLive"/>

-    </group>

-  </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.YakinduMutatedPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.YakinduMutatedPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.queries.YakinduMutatedPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.entryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.entryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.entryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noEntryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noEntryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noEntryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noEntryInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noEntryInRegion_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noEntryInRegion_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleEntryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleEntryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleEntryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleEntryInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleEntryInRegion_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleEntryInRegion_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.transition_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.transition_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.transition_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.transition_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.transition_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.incomingToEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.incomingToEntry_1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.incomingToEntry_2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.incomingToEntry_3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.incomingToEntry_4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.incomingToEntry_5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noOutgoingTransitionFromEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noOutgoingTransitionFromEntry_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noOutgoingTransitionFromEntry_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noOutgoingTransitionFromEntry_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noOutgoingTransitionFromEntry_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noOutgoingTransitionFromEntry_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleTransitionFromEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleTransitionFromEntry_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleTransitionFromEntry_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleTransitionFromEntry_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleTransitionFromEntry_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromExit_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromExit_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromExit_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromFinal_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromFinal_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromFinal_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noStateInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noStateInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noStateInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noStateInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.StateInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.StateInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.StateInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing_M6"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming_M6"/>

-    </group>

-  </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.queries.YakinduPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.queries.YakinduPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.queries.YakinduPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.entryInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noEntryInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleEntryInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.transition"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.incomingToEntry"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noOutgoingTransitionFromEntry"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.multipleTransitionFromEntry"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromExit"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.outgoingFromFinal"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.noStateInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.StateInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoOutgoing"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.choiceHasNoIncoming"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.synchHasNoOutgoing"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.synchHasNoIncoming"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.SynchronizedIncomingInSameRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.notSynchronizingStates"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.hasMultipleOutgoingTrainsition"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.hasMultipleIncomingTrainsition"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.SynchronizedRegionsAreNotSiblings"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.child"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.SynchronizedRegionDoesNotHaveMultipleRegions"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.hasMultipleRegions"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.synchThree"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.queries.twoSynch"/>

-    </group>

-  </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.EcorePatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.EcorePatterns" id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.EcorePatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.directSupertype"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.loopInInheritence"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.opposite"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.ecore.nonSymmetricOpposite"/>

-    </group>

-  </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.fam.FamPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.test.queries.fam.FamPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.fam.FamPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.fam.terminatorAndInformation"/>

-    </group>

-  </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.FileSystemPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.FileSystemPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.FileSystemPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.patternContent"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.live"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.filesystem.contentInNotLive"/>

-    </group>

-  </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.YakinduMutatedPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.YakinduMutatedPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.YakinduMutatedPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.entryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.entryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.entryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noEntryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noEntryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noEntryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noEntryInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noEntryInRegion_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noEntryInRegion_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleEntryInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleEntryInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleEntryInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleEntryInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleEntryInRegion_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleEntryInRegion_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.transition_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.transition_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.transition_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.transition_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.transition_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.incomingToEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.incomingToEntry_1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.incomingToEntry_2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.incomingToEntry_3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.incomingToEntry_4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.incomingToEntry_5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noOutgoingTransitionFromEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noOutgoingTransitionFromEntry_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noOutgoingTransitionFromEntry_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noOutgoingTransitionFromEntry_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noOutgoingTransitionFromEntry_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noOutgoingTransitionFromEntry_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleTransitionFromEntry_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleTransitionFromEntry_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleTransitionFromEntry_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleTransitionFromEntry_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleTransitionFromEntry_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromExit_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromExit_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromExit_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromFinal_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromFinal_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromFinal_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noStateInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noStateInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noStateInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noStateInRegion_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.StateInRegion_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.StateInRegion_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.StateInRegion_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing_M6"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming_M0"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming_M1"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming_M2"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming_M3"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming_M4"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming_M5"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming_M6"/>

-    </group>

-  </extension>

-  <extension id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.YakinduPatterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.YakinduPatterns" id="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.YakinduPatterns">

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.entryInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noEntryInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleEntryInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.transition"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.incomingToEntry"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noOutgoingTransitionFromEntry"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.multipleTransitionFromEntry"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromExit"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.outgoingFromFinal"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.noStateInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.StateInRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoOutgoing"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.choiceHasNoIncoming"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.synchHasNoOutgoing"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.synchHasNoIncoming"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.SynchronizedIncomingInSameRegion"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.notSynchronizingStates"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.hasMultipleOutgoingTrainsition"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.hasMultipleIncomingTrainsition"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.SynchronizedRegionsAreNotSiblings"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.child"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.SynchronizedRegionDoesNotHaveMultipleRegions"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.hasMultipleRegions"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.synchThree"/>

-      <query-specification fqn="ca.mcgill.ecse.dslreasoner.vampire.test.queries.yakindu.twoSynch"/>

-    </group>

-  </extension>

   <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.vampire.queries.live" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

     <wellbehaving-derived-feature classifier-name="FileSystem" feature-name="live" package-nsUri="FileSystemMetamodel"/>

   </extension>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
index 35b76350..70ded02d 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.xtend
@@ -50,7 +50,7 @@ class EcoreTest {
                         it.documentationLevel = DocumentationLevel::FULL

                 ]

 

-                solution = reasoner.solve(logicProblem, vampireConfig, workspace)

+                solution = reasoner.solve(logicProblem, vampireConfig, workspace, "ECO")

 

                 println("Problem solved")

 

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
index 3c24abf9..4625bfbf 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.xtend
@@ -56,7 +56,7 @@ class FAMTest {
                 //Start Time

                 var startTime = System.currentTimeMillis

 

-                var LogicReasoner reasoner

+                var VampireSolver reasoner

                 // *

                 reasoner = new VampireSolver

 

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
index ba7ff028..2495ab77 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.xtend
@@ -1,13 +1,13 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.Dir

+import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.File

 import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage

-import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic

@@ -15,7 +15,6 @@ import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace
 import java.util.HashMap

 import org.eclipse.emf.ecore.resource.Resource

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl

-import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.*

 

 class FileSystemTest {

         def static void main(String[] args) {

@@ -38,7 +37,7 @@ class FileSystemTest {
 

                 val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE)

                 val partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi")

-                val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance)

+//              val queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance)

 

                 println("DSL loaded")

 

@@ -53,7 +52,7 @@ class FileSystemTest {
                 // Start Time

                 var startTime = System.currentTimeMillis

 

-                var LogicReasoner reasoner

+                var VampireSolver reasoner

                 // *

                 reasoner = new VampireSolver

 

@@ -87,7 +86,7 @@ class FileSystemTest {
                         it.uniquenessDuplicates = false

                 ]

 

-                var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace)

+                var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace, "FS")

 

                 /*/

                  * 

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
index 76ac727a..fb1bdb59 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.xtend
@@ -53,7 +53,7 @@ class YakinduTest {
                 // Start Time

                 var startTime = System.currentTimeMillis

 

-                var LogicReasoner reasoner

+                var VampireSolver reasoner

                 // *

                 reasoner = new VampireSolver

 

@@ -85,7 +85,7 @@ class YakinduTest {
                         it.uniquenessDuplicates = false

                 ]

 

-                var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace)

+                var LogicResult solution = reasoner.solve(problem, vampireConfig, workspace, "YAK")

 

                 /*/

                  * 

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/vampire.exe b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/vampire.exe
new file mode 100644
index 00000000..51b44f82
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/vampire.exe
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
index 890872ea..1bf1d5cb 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.EcoreTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
index 8d7947e1..43e916e8 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FAMTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
index 91741fb2..8da3064a 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.FileSystemTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
index e1fba1c4..241e8efd 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.GeneralTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
index 22b54964..e6e6bbf4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/.YakinduTest.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
index 7019f162..01503783 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/EcoreTest.java
@@ -1,68 +1,9 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

-import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

-import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

-import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

-import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

-import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;

-import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

-import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

-import hu.bme.mit.inf.dslreasoner.logic2ecore.Logic2Ecore;

-import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

-import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

-import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

-import org.eclipse.emf.common.util.EList;

-import org.eclipse.emf.ecore.EObject;

-import org.eclipse.xtend2.lib.StringConcatenation;

-import org.eclipse.xtext.xbase.lib.Exceptions;

-import org.eclipse.xtext.xbase.lib.InputOutput;

-import org.eclipse.xtext.xbase.lib.ObjectExtensions;

-import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

-

 @SuppressWarnings("all")

 public class EcoreTest {

   public static void main(final String[] args) {

-    try {

-      StringConcatenation _builder = new StringConcatenation();

-      _builder.append("initialModels/");

-      final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

-      StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/FEcoreTest/");

-      final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

-      workspace.initAndClear();

-      InputOutput.<String>println("Input and output workspaces are created");

-      final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

-      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

-      final Object queries = null;

-      InputOutput.<String>println("DSL loaded");

-      final Ecore2Logic ecore2Logic = new Ecore2Logic();

-      final Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic);

-      final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);

-      final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();

-      Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

-      final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

-      final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelExtensionProblem = instanceModel2Logic.transform(modelGenerationProblem, partialModel);

-      final LogicProblem logicProblem = modelGenerationProblem.getOutput();

-      InputOutput.<String>println("Problem created");

-      LogicResult solution = null;

-      LogicReasoner reasoner = null;

-      VampireSolver _vampireSolver = new VampireSolver();

-      reasoner = _vampireSolver;

-      VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

-      final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

-        it.documentationLevel = DocumentationLevel.FULL;

-      };

-      final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

-      solution = reasoner.solve(logicProblem, vampireConfig, workspace);

-      InputOutput.<String>println("Problem solved");

-    } catch (Throwable _e) {

-      throw Exceptions.sneakyThrow(_e);

-    }

+    throw new Error("Unresolved compilation problems:"

+      + "\nInvalid number of arguments. The method solve(LogicProblem, LogicSolverConfiguration, ReasonerWorkspace) is not applicable for the arguments (LogicProblem,VampireSolverConfiguration,FileSystemWorkspace,String)");

   }

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
index ddbe05d7..ac49a9aa 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
@@ -12,7 +12,6 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

@@ -62,7 +61,7 @@ public class FAMTest {
       workspace.writeModel(problem, "Fam.logicproblem");

       InputOutput.<String>println("Problem created");

       long startTime = System.currentTimeMillis();

-      LogicReasoner reasoner = null;

+      VampireSolver reasoner = null;

       VampireSolver _vampireSolver = new VampireSolver();

       reasoner = _vampireSolver;

       final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
index 4a971fd6..7579bd98 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FileSystemTest.java
@@ -4,7 +4,6 @@ import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.Dir;
 import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.File;

 import ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.filesystemPackage;

 import ca.mcgill.ecse.dslreasoner.vampire.icse.GeneralTest;

-import ca.mcgill.ecse.dslreasoner.vampire.queries.FileSystemPatterns;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolver;

 import ca.mcgill.ecse.dslreasoner.vampire.reasoner.VampireSolverConfiguration;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic;

@@ -12,13 +11,11 @@ import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2LogicConfiguration;
 import hu.bme.mit.inf.dslreasoner.ecore2logic.Ecore2Logic_Trace;

 import hu.bme.mit.inf.dslreasoner.ecore2logic.EcoreMetamodelDescriptor;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.DocumentationLevel;

-import hu.bme.mit.inf.dslreasoner.logic.model.builder.LogicReasoner;

 import hu.bme.mit.inf.dslreasoner.logic.model.builder.TracedOutput;

 import hu.bme.mit.inf.dslreasoner.logic.model.logiclanguage.Type;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicproblem.LogicProblem;

 import hu.bme.mit.inf.dslreasoner.logic.model.logicresult.LogicResult;

 import hu.bme.mit.inf.dslreasoner.viatra2logic.Viatra2Logic;

-import hu.bme.mit.inf.dslreasoner.viatra2logic.ViatraQuerySetDescriptor;

 import hu.bme.mit.inf.dslreasoner.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

 import hu.bme.mit.inf.dslreasoner.workspace.FileSystemWorkspace;

 import java.util.HashMap;

@@ -28,7 +25,6 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;

 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;

 import org.eclipse.xtend2.lib.StringConcatenation;

-import org.eclipse.xtext.xbase.lib.Exceptions;

 import org.eclipse.xtext.xbase.lib.InputOutput;

 import org.eclipse.xtext.xbase.lib.ObjectExtensions;

 import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;

@@ -36,75 +32,70 @@ import org.eclipse.xtext.xbase.lib.Procedures.Procedure1;
 @SuppressWarnings("all")

 public class FileSystemTest {

   public static void main(final String[] args) {

-    try {

-      final Ecore2Logic ecore2Logic = new Ecore2Logic();

-      final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);

-      final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();

-      StringConcatenation _builder = new StringConcatenation();

-      _builder.append("initialModels/");

-      final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

-      StringConcatenation _builder_1 = new StringConcatenation();

-      _builder_1.append("output/FileSystemTest/");

-      final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

-      workspace.initAndClear();

-      final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;

-      final Map<String, Object> map = reg.getExtensionToFactoryMap();

-      XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

-      map.put("logicproblem", _xMIResourceFactoryImpl);

-      InputOutput.<String>println("Input and output workspaces are created");

-      final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

-      final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

-      final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FileSystemPatterns.instance());

-      InputOutput.<String>println("DSL loaded");

-      Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

-      final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

-      LogicProblem problem = modelGenerationProblem.getOutput();

-      problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

-      workspace.writeModel(problem, "FileSystem.logicproblem");

-      InputOutput.<String>println("Problem created");

-      long startTime = System.currentTimeMillis();

-      LogicReasoner reasoner = null;

-      VampireSolver _vampireSolver = new VampireSolver();

-      reasoner = _vampireSolver;

-      final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();

-      classMapMin.put(Dir.class, Integer.valueOf(10));

-      classMapMin.put(File.class, Integer.valueOf(5));

-      final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

-      final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();

-      classMapMax.put(File.class, Integer.valueOf(15));

-      classMapMax.put(Dir.class, Integer.valueOf(15));

-      final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

-      VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

-      final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

-        it.documentationLevel = DocumentationLevel.FULL;

-        it.typeScopes.minNewElements = 10;

-        it.typeScopes.maxNewElements = 25;

-        int _size = typeMapMin.size();

-        boolean _notEquals = (_size != 0);

-        if (_notEquals) {

-          it.typeScopes.minNewElementsByType = typeMapMin;

-        }

-        int _size_1 = typeMapMin.size();

-        boolean _notEquals_1 = (_size_1 != 0);

-        if (_notEquals_1) {

-          it.typeScopes.maxNewElementsByType = typeMapMax;

-        }

-        it.contCycleLevel = 5;

-        it.uniquenessDuplicates = false;

-      };

-      final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

-      LogicResult solution = reasoner.solve(problem, vampireConfig, workspace);

-      long _currentTimeMillis = System.currentTimeMillis();

-      long _minus = (_currentTimeMillis - startTime);

-      long totalTimeMin = (_minus / 60000);

-      long _currentTimeMillis_1 = System.currentTimeMillis();

-      long _minus_1 = (_currentTimeMillis_1 - startTime);

-      long _divide = (_minus_1 / 1000);

-      long totalTimeSec = (_divide % 60);

-      InputOutput.<String>println("Problem solved");

-      InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));

-    } catch (Throwable _e) {

-      throw Exceptions.sneakyThrow(_e);

-    }

+    final Ecore2Logic ecore2Logic = new Ecore2Logic();

+    final Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic);

+    final InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic();

+    StringConcatenation _builder = new StringConcatenation();

+    _builder.append("initialModels/");

+    final FileSystemWorkspace inputs = new FileSystemWorkspace(_builder.toString(), "");

+    StringConcatenation _builder_1 = new StringConcatenation();

+    _builder_1.append("output/FileSystemTest/");

+    final FileSystemWorkspace workspace = new FileSystemWorkspace(_builder_1.toString(), "");

+    workspace.initAndClear();

+    final Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;

+    final Map<String, Object> map = reg.getExtensionToFactoryMap();

+    XMIResourceFactoryImpl _xMIResourceFactoryImpl = new XMIResourceFactoryImpl();

+    map.put("logicproblem", _xMIResourceFactoryImpl);

+    InputOutput.<String>println("Input and output workspaces are created");

+    final EcoreMetamodelDescriptor metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE);

+    final EList<EObject> partialModel = GeneralTest.loadPartialModel(inputs, "fs/filesystemInstance.xmi");

+    InputOutput.<String>println("DSL loaded");

+    Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

+    final TracedOutput<LogicProblem, Ecore2Logic_Trace> modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, _ecore2LogicConfiguration);

+    LogicProblem problem = modelGenerationProblem.getOutput();

+    problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).getOutput();

+    workspace.writeModel(problem, "FileSystem.logicproblem");

+    InputOutput.<String>println("Problem created");

+    long startTime = System.currentTimeMillis();

+    VampireSolver reasoner = null;

+    VampireSolver _vampireSolver = new VampireSolver();

+    reasoner = _vampireSolver;

+    final HashMap<Class, Integer> classMapMin = new HashMap<Class, Integer>();

+    classMapMin.put(Dir.class, Integer.valueOf(10));

+    classMapMin.put(File.class, Integer.valueOf(5));

+    final Map<Type, Integer> typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

+    final HashMap<Class, Integer> classMapMax = new HashMap<Class, Integer>();

+    classMapMax.put(File.class, Integer.valueOf(15));

+    classMapMax.put(Dir.class, Integer.valueOf(15));

+    final Map<Type, Integer> typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.getTrace());

+    VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

+    final Procedure1<VampireSolverConfiguration> _function = (VampireSolverConfiguration it) -> {

+      it.documentationLevel = DocumentationLevel.FULL;

+      it.typeScopes.minNewElements = 10;

+      it.typeScopes.maxNewElements = 25;

+      int _size = typeMapMin.size();

+      boolean _notEquals = (_size != 0);

+      if (_notEquals) {

+        it.typeScopes.minNewElementsByType = typeMapMin;

+      }

+      int _size_1 = typeMapMin.size();

+      boolean _notEquals_1 = (_size_1 != 0);

+      if (_notEquals_1) {

+        it.typeScopes.maxNewElementsByType = typeMapMax;

+      }

+      it.contCycleLevel = 5;

+      it.uniquenessDuplicates = false;

+    };

+    final VampireSolverConfiguration vampireConfig = ObjectExtensions.<VampireSolverConfiguration>operator_doubleArrow(_vampireSolverConfiguration, _function);

+    LogicResult solution = reasoner.solve(problem, vampireConfig, workspace, "FS");

+    long _currentTimeMillis = System.currentTimeMillis();

+    long _minus = (_currentTimeMillis - startTime);

+    long totalTimeMin = (_minus / 60000);

+    long _currentTimeMillis_1 = System.currentTimeMillis();

+    long _minus_1 = (_currentTimeMillis_1 - startTime);

+    long _divide = (_minus_1 / 1000);

+    long totalTimeSec = (_divide % 60);

+    InputOutput.<String>println("Problem solved");

+    InputOutput.<String>println(((("Time was: " + Long.valueOf(totalTimeMin)) + ":") + Long.valueOf(totalTimeSec)));

   }

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
index c33ed958..36edabcd 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.MedicalSystem.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
index 9fecf93f..0d4e05e0 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.SimpleRun.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
index 7b5be981..f93484b4 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/test/.VampireTest.xtendbin