VAMPIRE: #39 Reorganise tests, working yakindu test, need debugging

78 files changed, 1243 insertions, 16316 deletions

diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
index 847f3da5..d6392a0b 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeModule.xtendbin
diff --git a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
index 7d5c3fb3..c97efa0f 100644
--- a/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
+++ b/Application/hu.bme.mit.inf.dslreasoner.application.ide/xtend-gen/hu/bme/mit/inf/dslreasoner/application/ide/.ApplicationConfigurationIdeSetup.xtendbin
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
index 8069f168..9ace526f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/plugin.xml
@@ -3,35 +3,6 @@
     <!-- @generated yakindu_simplified -->

     <package class="hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage" genModel="model/yakindu_simplified.genmodel" uri="hu.bme.mit.inf.yakindumm"/>

   </extension>

-  <extension id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns" point="org.eclipse.viatra.query.runtime.queryspecification">

-    <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns" id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.Patterns">

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.entryInRegion"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.noEntryInRegion"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.multipleEntryInRegion"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transition"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.incomingToEntry"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.noOutgoingTransitionFromEntry"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.multipleTransitionFromEntry"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.outgoingFromExit"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.outgoingFromFinal"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.noStateInRegion"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.StateInRegion"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.choiceHasNoOutgoing"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.choiceHasNoIncoming"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.synchHasNoOutgoing"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.synchHasNoIncoming"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedIncomingInSameRegion"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.notSynchronizingStates"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.hasMultipleOutgoingTrainsition"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.hasMultipleIncomingTrainsition"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedRegionsAreNotSiblings"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.child"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedRegionDoesNotHaveMultipleRegions"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.hasMultipleRegions"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.synchThree"/>

-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.twoSynch"/>

-    </group>

-  </extension>

   <extension id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" point="org.eclipse.viatra.query.runtime.queryspecification">

     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated" id="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.Mutated">

       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M0"/>

diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
index d2b35248..024dcab9 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
index f42023dc..7e128ad1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ide/xtend-gen/ca/mcgill/ecse/dslreasoner/ide/.VampireLanguageIdeSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
index 6a306754..0bf8ccc6 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/.VampireLanguageUiModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
index 48a792a0..58a18bbb 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/contentassist/.VampireLanguageProposalProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
index 0e052102..205afcc4 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageDescriptionLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
index 4865470e..b388bd43 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/labeling/.VampireLanguageLabelProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
index 3c9c2bbf..3092be97 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/outline/.VampireLanguageOutlineTreeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
index d38b36ff..8b23f34d 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language.ui/xtend-gen/ca/mcgill/ecse/dslreasoner/ui/quickfix/.VampireLanguageQuickfixProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
index 0886858b..84682c47 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageRuntimeModule.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
index fb078be1..e3f67a0c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/.VampireLanguageStandaloneSetup.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
index 7febb8b9..bf354098 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/formatting2/.VampireLanguageFormatter.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
index a790245e..da62f4c1 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/generator/.VampireLanguageGenerator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
index 19d74808..482b884e 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/scoping/.VampireLanguageScopeProvider.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
index ab5c8cfa..81c1f803 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.language/xtend-gen/ca/mcgill/ecse/dslreasoner/validation/.VampireLanguageValidator.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
index 7394b24e..43e1e477 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireAnalyzerConfiguration.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
index d328dcf2..4e6f6ca0 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/.VampireSolver.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
index 968a2df8..707a6089 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
index 346daf52..3171324f 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapperTrace.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
index 48756fcc..301df7fa 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ConstantMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
index 44b06208..5e53ea26 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ContainmentMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
index 4cab8309..b378ed09 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_RelationMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
index ccddb430..605ac88c 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_ScopeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
index a069a62f..0c289e29 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_Support.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
index 46cd58fb..cb72fd90 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Logic2VampireLanguageMapper_TypeMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
index 8725e6b1..cfe1e8cd 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.Vampire2LogicMapper.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
index 1b5e4d0b..c2079147 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireHandler.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
index ca749be9..3c70bc14 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation.xtendbin
diff --git a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
index 1c910cc9..9ef20b23 100644
--- a/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
+++ b/Solvers/Vampire-Solver/ca.mcgill.ecse.dslreasoner.vampire.reasoner/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/reasoner/builder/.VampireModelInterpretation_TypeInterpretation_FilteredTypes.xtendbin
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/filesystem.ecore b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/filesystem.ecore
index 8952cfb5..bbd4af35 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/filesystem.ecore
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/filesystem.ecore
@@ -10,7 +10,7 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="live" upperBound="-1" eType="#//FSObject"

         changeable="false" volatile="true" transient="true" derived="true">

       <eAnnotations source="org.eclipse.viatra.query.querybasedfeature">

-        <details key="patternFQN" value="ca.mcgill.ecse.dslreasoner.standalone.test.filesystem.queries.live"/>

+        <details key="patternFQN" value="ca.mcgill.ecse.dslreasoner.vampire.queries.live"/>

       </eAnnotations>

     </eStructuralFeatures>

   </eClassifiers>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
new file mode 100644
index 00000000..ef3746fa
--- /dev/null
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/metamodels/yakindu.aird
@@ -0,0 +1,675 @@
+<?xml version="1.0" encoding="UTF-8"?>

+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:description="http://www.eclipse.org/sirius/description/1.1.0" xmlns:description_1="http://www.eclipse.org/sirius/diagram/description/1.1.0" xmlns:diagram="http://www.eclipse.org/sirius/diagram/1.1.0" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/sirius/diagram/description/style/1.1.0" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" xsi:schemaLocation="http://www.eclipse.org/sirius/description/1.1.0 http://www.eclipse.org/sirius/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description http://www.eclipse.org/sirius/diagram/description/style/1.1.0 http://www.eclipse.org/sirius/diagram/1.1.0#//description/style">

+  <viewpoint:DAnalysis uid="_e7vq8FybEemc87q3iJlCgw" selectedViews="_feFjAFybEemc87q3iJlCgw _feTlcFybEemc87q3iJlCgw _feUzkFybEemc87q3iJlCgw _feWBsFybEemc87q3iJlCgw" version="14.1.0.201810161215">

+    <semanticResources>yakindu.ecore</semanticResources>

+    <semanticResources>yakindu.genmodel</semanticResources>

+    <ownedViews xmi:type="viewpoint:DView" uid="_feFjAFybEemc87q3iJlCgw">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']"/>

+      <ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" uid="_gE_K8FybEemc87q3iJlCgw" name="yakindu class diagram" repPath="#_gDD4UFybEemc87q3iJlCgw">

+        <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

+        <target xmi:type="ecore:EPackage" href="yakindu.ecore#/"/>

+      </ownedRepresentationDescriptors>

+    </ownedViews>

+    <ownedViews xmi:type="viewpoint:DView" uid="_feTlcFybEemc87q3iJlCgw">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Review']"/>

+    </ownedViews>

+    <ownedViews xmi:type="viewpoint:DView" uid="_feUzkFybEemc87q3iJlCgw">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']"/>

+    </ownedViews>

+    <ownedViews xmi:type="viewpoint:DView" uid="_feWBsFybEemc87q3iJlCgw">

+      <viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Generation']"/>

+    </ownedViews>

+  </viewpoint:DAnalysis>

+  <diagram:DSemanticDiagram uid="_gDD4UFybEemc87q3iJlCgw" name="yakindu class diagram">

+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_gE1Z8FybEemc87q3iJlCgw" source="DANNOTATION_CUSTOMIZATION_KEY">

+      <data xmi:type="diagram:ComputedStyleDescriptionRegistry" uid="_gE2oEFybEemc87q3iJlCgw">

+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_g_MwcFybEemc87q3iJlCgw" sourceArrow="FillDiamond" routingStyle="manhattan">

+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          <centerLabelStyleDescription xmi:type="style:CenterLabelStyleDescription" xmi:id="_g_MwcVybEemc87q3iJlCgw" showIcon="false" labelExpression="service:render">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          </centerLabelStyleDescription>

+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_g_MwclybEemc87q3iJlCgw" labelSize="6" showIcon="false" labelExpression="service:eKeysLabel">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='dark_blue']"/>

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

+        <computedStyleDescriptions xmi:type="style:EdgeStyleDescription" xmi:id="_g_g5gVybEemc87q3iJlCgw" sourceArrow="FillDiamond" routingStyle="manhattan">

+          <strokeColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          <beginLabelStyleDescription xmi:type="style:BeginLabelStyleDescription" xmi:id="_g_g5glybEemc87q3iJlCgw" showIcon="false" labelExpression="service:renderEOpposite">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          </beginLabelStyleDescription>

+          <endLabelStyleDescription xmi:type="style:EndLabelStyleDescription" xmi:id="_g_g5g1ybEemc87q3iJlCgw" showIcon="false" labelExpression="service:render">

+            <labelColor xmi:type="description:SystemColor" href="environment:/viewpoint#//@systemColors/@entries[name='black']"/>

+          </endLabelStyleDescription>

+        </computedStyleDescriptions>

+      </data>

+    </ownedAnnotationEntries>

+    <ownedAnnotationEntries xmi:type="description:AnnotationEntry" uid="_gH58EFybEemc87q3iJlCgw" source="GMF_DIAGRAMS">

+      <data xmi:type="notation:Diagram" xmi:id="_gH58EVybEemc87q3iJlCgw" type="Sirius" element="_gDD4UFybEemc87q3iJlCgw" measurementUnit="Pixel">

+        <children xmi:type="notation:Node" xmi:id="_g_kj4FybEemc87q3iJlCgw" type="2003" element="_g-GkQFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_lK8FybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_nnMFybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_nnMVybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_nnMlybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_kj4VybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_kj4lybEemc87q3iJlCgw" x="360" y="324"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_o1UFybEemc87q3iJlCgw" type="2003" element="_g-SKcFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_pcYFybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_pcYVybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_pcYlybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_pcY1ybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_o1UVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_o1UlybEemc87q3iJlCgw" x="648" y="156"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_pcZFybEemc87q3iJlCgw" type="2003" element="_g-T_oFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_pcZ1ybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_pcaFybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_pcaVybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_pcalybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_pcZVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_pcZlybEemc87q3iJlCgw" x="648" y="324"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_qDcFybEemc87q3iJlCgw" type="2003" element="_g-Wb4FybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_qDc1ybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_qDdFybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_qDdVybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_qDdlybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_qDcVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qDclybEemc87q3iJlCgw" x="648"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_qqgFybEemc87q3iJlCgw" type="2003" element="_g-YREFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_qqg1ybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_qqhFybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_qqhVybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_qqhlybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_qqgVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qqglybEemc87q3iJlCgw" x="648" y="636"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_qqh1ybEemc87q3iJlCgw" type="2003" element="_g-aGQFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_rRkFybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_rRkVybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_rRklybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_rRk1ybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_qqiFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_qqiVybEemc87q3iJlCgw" x="180" y="480"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_rRlFybEemc87q3iJlCgw" type="2003" element="_g-b7cFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_r4oFybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_r4oVybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_r4olybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_r4o1ybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_rRlVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_rRllybEemc87q3iJlCgw" y="480"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_sfsFybEemc87q3iJlCgw" type="2003" element="_g-dJkVybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_sfs1ybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_sftFybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_sftVybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_sftlybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_sfsVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_sfslybEemc87q3iJlCgw" x="828" y="636"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_tGwFybEemc87q3iJlCgw" type="2003" element="_g-fl0FybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_uU4FybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_u78FybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_u78VybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_u78lybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_tGwVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_tGwlybEemc87q3iJlCgw" x="828" y="324"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_u781ybEemc87q3iJlCgw" type="2003" element="_g-hbAVybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_vjAFybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_vjAVybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_vjAlybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_vjA1ybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_u79FybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8" italic="true"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_u79VybEemc87q3iJlCgw" x="720" y="480"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_vjBFybEemc87q3iJlCgw" type="2003" element="_g-jQMFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_wKEFybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_wKEVybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_wKElybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_wKE1ybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_vjBVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_vjBlybEemc87q3iJlCgw" x="360" y="480"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_wKFFybEemc87q3iJlCgw" type="2003" element="_g-lscFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_wKF1ybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_wKGFybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_wKGVybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_wKGlybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_wKFVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_wKFlybEemc87q3iJlCgw" x="540" y="480"/>

+        </children>

+        <children xmi:type="notation:Node" xmi:id="_g_wxIFybEemc87q3iJlCgw" type="2003" element="_g-m6kFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_wxI1ybEemc87q3iJlCgw" type="5007"/>

+          <children xmi:type="notation:Node" xmi:id="_g_wxJFybEemc87q3iJlCgw" type="7004">

+            <styles xmi:type="notation:SortingStyle" xmi:id="_g_wxJVybEemc87q3iJlCgw"/>

+            <styles xmi:type="notation:FilteringStyle" xmi:id="_g_wxJlybEemc87q3iJlCgw"/>

+          </children>

+          <styles xmi:type="notation:ShapeStyle" xmi:id="_g_wxIVybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_wxIlybEemc87q3iJlCgw" x="936" y="480"/>

+        </children>

+        <styles xmi:type="notation:DiagramStyle" xmi:id="_gH58ElybEemc87q3iJlCgw"/>

+        <edges xmi:type="notation:Edge" xmi:id="_g_z0cFybEemc87q3iJlCgw" type="4001" element="_g_JtIFybEemc87q3iJlCgw" source="_g_pcZFybEemc87q3iJlCgw" target="_g_o1UFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_g_4s8FybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s8VybEemc87q3iJlCgw" x="19" y="47"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_g_4s8lybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s81ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_g_4s9FybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_g_4s9VybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_g_z0cVybEemc87q3iJlCgw" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_g_z0clybEemc87q3iJlCgw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_g_z0c1ybEemc87q3iJlCgw" points="[25, 0, 25, 70]$[25, -70, 25, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAETIFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAETIVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAETIlybEemc87q3iJlCgw" type="4001" element="_g_MweVybEemc87q3iJlCgw" source="_g_u781ybEemc87q3iJlCgw" target="_g_pcZFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAETJlybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAETJ1ybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAFhQFybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAFhQVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAFhQlybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAFhQ1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAETI1ybEemc87q3iJlCgw" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAETJFybEemc87q3iJlCgw" fontColor="7490599" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAETJVybEemc87q3iJlCgw" points="[0, 0, 75, 60]$[-75, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAFhRFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAFhRVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAFhRlybEemc87q3iJlCgw" type="4001" element="_g_S3EFybEemc87q3iJlCgw" source="_g_tGwFybEemc87q3iJlCgw" target="_g_o1UFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAGIUFybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAGIUVybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAGIUlybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAGIU1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAGIVFybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAGIVVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAFhR1ybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAFhSFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAFhSVybEemc87q3iJlCgw" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAGIVlybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAGIV1ybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAGIWFybEemc87q3iJlCgw" type="4001" element="_g_V6ZlybEemc87q3iJlCgw" source="_g_vjBFybEemc87q3iJlCgw" target="_g_kj4FybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAGvYFybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAGvYVybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAGvYlybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAGvY1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAGvZFybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAGvZVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAGIWVybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAGIWlybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAGIW1ybEemc87q3iJlCgw" points="[0, 0, 0, 60]$[0, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAHWcFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAHWcVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAHWclybEemc87q3iJlCgw" type="4001" element="_g_V6bVybEemc87q3iJlCgw" source="_g_wKFFybEemc87q3iJlCgw" target="_g_kj4FybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAH9gFybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAH9gVybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAH9glybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAH9g1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAH9hFybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAH9hVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAHWc1ybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAHWdFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAHWdVybEemc87q3iJlCgw" points="[0, 0, 180, 60]$[-180, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAH9hlybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAH9h1ybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAIkkFybEemc87q3iJlCgw" type="4001" element="_g_aL0FybEemc87q3iJlCgw" source="_g_wxIFybEemc87q3iJlCgw" target="_g_tGwFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAIklFybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAIklVybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAIkllybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAIkl1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAIkmFybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAIkmVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAIkkVybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAIkklybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAIkk1ybEemc87q3iJlCgw" points="[0, 0, 106, 60]$[-106, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAJLoFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAJLoVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAJLolybEemc87q3iJlCgw" type="4001" element="_g_ay41ybEemc87q3iJlCgw" source="_g_qqh1ybEemc87q3iJlCgw" target="_g_kj4FybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAJLplybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAJLp1ybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAJLqFybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAJLqVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAJLqlybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAJLq1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAJLo1ybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAJLpFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAJLpVybEemc87q3iJlCgw" points="[0, 0, -180, 60]$[180, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAKZwFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAKZwVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAKZwlybEemc87q3iJlCgw" type="4001" element="_g_cBAFybEemc87q3iJlCgw" source="_g_qqgFybEemc87q3iJlCgw" target="_g_u781ybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAKZxlybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAKZx1ybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAKZyFybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAKZyVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAKZylybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAKZy1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAKZw1ybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAKZxFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAKZxVybEemc87q3iJlCgw" points="[0, 0, -75, 60]$[75, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALA0FybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALA0VybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hALA0lybEemc87q3iJlCgw" type="4001" element="_g_coEFybEemc87q3iJlCgw" source="_g_rRlFybEemc87q3iJlCgw" target="_g_kj4FybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hALA1lybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hALA11ybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hALA2FybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hALA2VybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hALA2lybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hALA21ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hALA01ybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hALA1FybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hALA1VybEemc87q3iJlCgw" points="[0, 0, -360, 60]$[360, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALn4FybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hALn4VybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAMO8FybEemc87q3iJlCgw" type="4001" element="_g_dPI1ybEemc87q3iJlCgw" source="_g_sfsFybEemc87q3iJlCgw" target="_g_tGwFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAMO9FybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAMO9VybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAMO9lybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAMO91ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAMO-FybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAMO-VybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAMO8VybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAMO8lybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAMO81ybEemc87q3iJlCgw" points="[0, 0, 0, 220]$[0, -220, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAei0FybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAei0VybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAfJ4FybEemc87q3iJlCgw" type="4001" element="_g_edQFybEemc87q3iJlCgw" source="_g_sfsFybEemc87q3iJlCgw" target="_g_u781ybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAfw8FybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAfw8VybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAfw8lybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAfw81ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAfw9FybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAfw9VybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAfJ4VybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAfJ4lybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAfJ41ybEemc87q3iJlCgw" points="[0, 0, 105, 60]$[-105, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAgYAFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAgYAVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAgYAlybEemc87q3iJlCgw" type="4001" element="_g_fEUFybEemc87q3iJlCgw" source="_g_kj4FybEemc87q3iJlCgw" target="_g_o1UFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAgYBlybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAgYB1ybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAg_EFybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAg_EVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAg_ElybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAg_E1ybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAgYA1ybEemc87q3iJlCgw" routing="Tree"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAgYBFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAgYBVybEemc87q3iJlCgw" points="[0, 0, -285, 60]$[285, -60, 0, 0]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAg_FFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAg_FVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAhmIFybEemc87q3iJlCgw" type="4001" element="_g_frY1ybEemc87q3iJlCgw" source="_g_o1UFybEemc87q3iJlCgw" target="_g_qDcFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAhmJFybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmJVybEemc87q3iJlCgw" x="1" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAhmJlybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmJ1ybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAhmKFybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAhmKVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAhmIVybEemc87q3iJlCgw" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAhmIlybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAhmI1ybEemc87q3iJlCgw" points="[-59, 50, -59, 108]$[-143, 50, -143, 108]$[-143, -106, -143, -48]$[-59, -106, -59, -48]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAiNMFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAiNMVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+        <edges xmi:type="notation:Edge" xmi:id="_hAiNMlybEemc87q3iJlCgw" type="4001" element="_g_g5gFybEemc87q3iJlCgw" source="_g_o1UFybEemc87q3iJlCgw" target="_g_qDcFybEemc87q3iJlCgw">

+          <children xmi:type="notation:Node" xmi:id="_hAiNNlybEemc87q3iJlCgw" type="6001">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAiNN1ybEemc87q3iJlCgw" x="1" y="-10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAi0QFybEemc87q3iJlCgw" type="6002">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAi0QVybEemc87q3iJlCgw" y="10"/>

+          </children>

+          <children xmi:type="notation:Node" xmi:id="_hAi0QlybEemc87q3iJlCgw" type="6003">

+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_hAi0Q1ybEemc87q3iJlCgw" y="-10"/>

+          </children>

+          <styles xmi:type="notation:ConnectorStyle" xmi:id="_hAiNM1ybEemc87q3iJlCgw" routing="Rectilinear"/>

+          <styles xmi:type="notation:FontStyle" xmi:id="_hAiNNFybEemc87q3iJlCgw" fontName="Segoe UI" fontHeight="8"/>

+          <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hAiNNVybEemc87q3iJlCgw" points="[59, 50, 59, 108]$[130, 50, 130, 108]$[130, -106, 130, -48]$[59, -106, 59, -48]"/>

+          <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAi0RFybEemc87q3iJlCgw" id="(0.5,0.0)"/>

+          <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hAi0RVybEemc87q3iJlCgw" id="(0.5,1.0)"/>

+        </edges>

+      </data>

+    </ownedAnnotationEntries>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-GkQFybEemc87q3iJlCgw" name="Pseudostate" tooltipText="" outgoingEdges="_g_fEUFybEemc87q3iJlCgw" incomingEdges="_g_V6ZlybEemc87q3iJlCgw _g_V6bVybEemc87q3iJlCgw _g_ay41ybEemc87q3iJlCgw _g_coEFybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Pseudostate"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Pseudostate"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-NR8FybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

+        <labelFormat>italic</labelFormat>

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-SKcFybEemc87q3iJlCgw" name="Vertex" tooltipText="" outgoingEdges="_g_frY1ybEemc87q3iJlCgw _g_g5gFybEemc87q3iJlCgw" incomingEdges="_g_JtIFybEemc87q3iJlCgw _g_S3EFybEemc87q3iJlCgw _g_fEUFybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Vertex"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Vertex"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-SxgFybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

+        <labelFormat>italic</labelFormat>

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-T_oFybEemc87q3iJlCgw" name="Region" tooltipText="" outgoingEdges="_g_JtIFybEemc87q3iJlCgw" incomingEdges="_g_MweVybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Region"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Region"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-VNwFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-Wb4FybEemc87q3iJlCgw" name="Transition" tooltipText="" incomingEdges="_g_frY1ybEemc87q3iJlCgw _g_g5gFybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Transition"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Transition"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-XC8FybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-YREFybEemc87q3iJlCgw" name="Statechart" tooltipText="" outgoingEdges="_g_cBAFybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Statechart"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Statechart"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-ZfMFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-aGQFybEemc87q3iJlCgw" name="Entry" tooltipText="" outgoingEdges="_g_ay41ybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Entry"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Entry"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-atUFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-b7cFybEemc87q3iJlCgw" name="Synchronization" tooltipText="" outgoingEdges="_g_coEFybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Synchronization"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Synchronization"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-cigFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-dJkVybEemc87q3iJlCgw" name="State" tooltipText="" outgoingEdges="_g_dPI1ybEemc87q3iJlCgw _g_edQFybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-e-wFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-fl0FybEemc87q3iJlCgw" name="RegularState" tooltipText="" outgoingEdges="_g_S3EFybEemc87q3iJlCgw" incomingEdges="_g_aL0FybEemc87q3iJlCgw _g_dPI1ybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//RegularState"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//RegularState"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-gz8FybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

+        <labelFormat>italic</labelFormat>

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-hbAVybEemc87q3iJlCgw" name="CompositeElement" tooltipText="" outgoingEdges="_g_MweVybEemc87q3iJlCgw" incomingEdges="_g_cBAFybEemc87q3iJlCgw _g_edQFybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//CompositeElement"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//CompositeElement"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-iCEFybEemc87q3iJlCgw" iconPath="/org.eclipse.emf.ecoretools.design/icons/full/obj16/EClass_abstract.gif" borderSize="1" borderSizeComputationExpression="1" borderColor="125,125,125" backgroundStyle="Liquid" foregroundColor="228,228,228">

+        <labelFormat>italic</labelFormat>

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@conditionnalStyles.1/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-jQMFybEemc87q3iJlCgw" name="Choice" tooltipText="" outgoingEdges="_g_V6ZlybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Choice"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Choice"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-keUFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-lscFybEemc87q3iJlCgw" name="Exit" tooltipText="" outgoingEdges="_g_V6bVybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Exit"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Exit"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-mTgFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DNodeList" uid="_g-m6kFybEemc87q3iJlCgw" name="FinalState" tooltipText="" outgoingEdges="_g_aL0FybEemc87q3iJlCgw" width="12" height="10">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//FinalState"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//FinalState"/>

+      <ownedStyle xmi:type="diagram:FlatContainerStyle" uid="_g-nhoFybEemc87q3iJlCgw" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,252,216">

+        <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']/@style"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@containerMappings[name='EC%20EClass']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_JtIFybEemc87q3iJlCgw" name="[0..*] vertices" sourceNode="_g-T_oFybEemc87q3iJlCgw" targetNode="_g-SKcFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EReference" href="yakindu.ecore#//Region/vertices"/>

+      <semanticElements xmi:type="ecore:EReference" href="yakindu.ecore#//Region/vertices"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_Mwc1ybEemc87q3iJlCgw" description="_g_MwcFybEemc87q3iJlCgw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_MwdVybEemc87q3iJlCgw" showIcon="false">

+          <customFeatures>labelSize</customFeatures>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_g_MwdFybEemc87q3iJlCgw" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </endLabelStyle>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_MweVybEemc87q3iJlCgw" name="[0..*] regions" sourceNode="_g-hbAVybEemc87q3iJlCgw" targetNode="_g-T_oFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EReference" href="yakindu.ecore#//CompositeElement/regions"/>

+      <semanticElements xmi:type="ecore:EReference" href="yakindu.ecore#//CompositeElement/regions"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_RB4FybEemc87q3iJlCgw" description="_g_MwcFybEemc87q3iJlCgw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_RB4lybEemc87q3iJlCgw" showIcon="false">

+          <customFeatures>labelSize</customFeatures>

+        </centerLabelStyle>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_g_RB4VybEemc87q3iJlCgw" showIcon="false" labelColor="39,76,114">

+          <customFeatures>labelSize</customFeatures>

+        </endLabelStyle>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC_EReference']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_S3EFybEemc87q3iJlCgw" sourceNode="_g-fl0FybEemc87q3iJlCgw" targetNode="_g-SKcFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//RegularState"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//RegularState"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_V6YFybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_V6YVybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_V6YlybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_V6ZlybEemc87q3iJlCgw" sourceNode="_g-jQMFybEemc87q3iJlCgw" targetNode="_g-GkQFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Choice"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Choice"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_V6Z1ybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_V6aFybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_V6aVybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_V6bVybEemc87q3iJlCgw" sourceNode="_g-lscFybEemc87q3iJlCgw" targetNode="_g-GkQFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Exit"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Exit"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_V6blybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_V6b1ybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_V6cFybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_aL0FybEemc87q3iJlCgw" sourceNode="_g-m6kFybEemc87q3iJlCgw" targetNode="_g-fl0FybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//FinalState"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//FinalState"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_aL0VybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_aL0lybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_aL01ybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_ay41ybEemc87q3iJlCgw" sourceNode="_g-aGQFybEemc87q3iJlCgw" targetNode="_g-GkQFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Entry"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Entry"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_ay5FybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_ay5VybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_ay5lybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_cBAFybEemc87q3iJlCgw" sourceNode="_g-YREFybEemc87q3iJlCgw" targetNode="_g-hbAVybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Statechart"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Statechart"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_cBAVybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_cBAlybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_cBA1ybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_coEFybEemc87q3iJlCgw" sourceNode="_g-b7cFybEemc87q3iJlCgw" targetNode="_g-GkQFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Synchronization"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Synchronization"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_coEVybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_coElybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_coE1ybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_dPI1ybEemc87q3iJlCgw" sourceNode="_g-dJkVybEemc87q3iJlCgw" targetNode="_g-fl0FybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_dPJFybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_dPJVybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_dPJlybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_edQFybEemc87q3iJlCgw" sourceNode="_g-dJkVybEemc87q3iJlCgw" targetNode="_g-hbAVybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//State"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_edQVybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_edQlybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_edQ1ybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_fEUFybEemc87q3iJlCgw" sourceNode="_g-GkQFybEemc87q3iJlCgw" targetNode="_g-SKcFybEemc87q3iJlCgw">

+      <target xmi:type="ecore:EClass" href="yakindu.ecore#//Pseudostate"/>

+      <semanticElements xmi:type="ecore:EClass" href="yakindu.ecore#//Pseudostate"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_fEUVybEemc87q3iJlCgw" targetArrow="InputClosedArrow" routingStyle="tree">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_fEUlybEemc87q3iJlCgw" showIcon="false">

+          <labelFormat>italic</labelFormat>

+        </beginLabelStyle>

+        <centerLabelStyle xmi:type="diagram:CenterLabelStyle" uid="_g_fEU1ybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='EC%20ESupertypes']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_frY1ybEemc87q3iJlCgw" sourceNode="_g-SKcFybEemc87q3iJlCgw" targetNode="_g-Wb4FybEemc87q3iJlCgw" beginLabel="[1..1] target" endLabel="[0..*] incomingTransitions">

+      <target xmi:type="ecore:EReference" href="yakindu.ecore#//Vertex/incomingTransitions"/>

+      <semanticElements xmi:type="ecore:EReference" href="yakindu.ecore#//Vertex/incomingTransitions"/>

+      <semanticElements xmi:type="ecore:EReference" href="yakindu.ecore#//Transition/target"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_gScFybEemc87q3iJlCgw" sourceArrow="InputArrow" routingStyle="manhattan" strokeColor="0,0,0">

+        <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']/@style"/>

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_gScVybEemc87q3iJlCgw" showIcon="false"/>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_g_gSclybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>

+    </ownedDiagramElements>

+    <ownedDiagramElements xmi:type="diagram:DEdge" uid="_g_g5gFybEemc87q3iJlCgw" sourceNode="_g-SKcFybEemc87q3iJlCgw" targetNode="_g-Wb4FybEemc87q3iJlCgw" beginLabel="[0..1] source" endLabel="[0..*] outgoingTransitions">

+      <target xmi:type="ecore:EReference" href="yakindu.ecore#//Vertex/outgoingTransitions"/>

+      <semanticElements xmi:type="ecore:EReference" href="yakindu.ecore#//Vertex/outgoingTransitions"/>

+      <semanticElements xmi:type="ecore:EReference" href="yakindu.ecore#//Transition/source"/>

+      <ownedStyle xmi:type="diagram:EdgeStyle" uid="_g_g5hFybEemc87q3iJlCgw" description="_g_g5gVybEemc87q3iJlCgw" sourceArrow="FillDiamond" routingStyle="manhattan" strokeColor="0,0,0">

+        <beginLabelStyle xmi:type="diagram:BeginLabelStyle" uid="_g_g5hVybEemc87q3iJlCgw" showIcon="false"/>

+        <endLabelStyle xmi:type="diagram:EndLabelStyle" uid="_g_g5hlybEemc87q3iJlCgw" showIcon="false"/>

+      </ownedStyle>

+      <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer/@edgeMappings[name='Bi-directional%20EC_EReference%20']"/>

+    </ownedDiagramElements>

+    <description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']"/>

+    <filterVariableHistory xmi:type="diagram:FilterVariableHistory" uid="_gDlcwFybEemc87q3iJlCgw"/>

+    <activatedLayers xmi:type="description_1:Layer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@defaultLayer"/>

+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Package']"/>

+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Design']/@ownedRepresentations[name='Entities']/@additionalLayers[name='Validation']"/>

+    <activatedLayers xmi:type="description_1:AdditionalLayer" href="platform:/plugin/org.eclipse.emf.ecoretools.design/description/ecore.odesign#//@ownedViewpoints[name='Archetype']/@ownedRepresentationExtensions[name='Entities%20With%20Archetypes']/@layers[name='Archetypes']"/>

+    <target xmi:type="ecore:EPackage" href="yakindu.ecore#/"/>

+  </diagram:DSemanticDiagram>

+</xmi:XMI>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
index a2a573fc..f9d517b9 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/plugin.xml
@@ -27,110 +27,6 @@
       <query-specification fqn="ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.parent"/>

     </group>

   </extension>

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

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

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

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

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

-    </group>

-  </extension>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    </group>

-  </extension>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-    </group>

-  </extension>

   <extension id="extension.derived.ca.mcgill.ecse.dslreasoner.standalone.test.fam.queries.model" point="org.eclipse.viatra.query.runtime.base.wellbehaving.derived.features">

     <wellbehaving-derived-feature classifier-name="FunctionalElement" feature-name="model" package-nsUri="FamMetamodel"/>

   </extension>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/Child.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/Child.java
deleted file mode 100644
index 9867c1ee..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/Child.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         ///////////////////////////////

- *         // Extra

- *         //

- *         //{@literal @}Constraint(severity="error", message="error", key = {s})

- *         //pattern SynchronizedRegionDoesNotHaveParent(s : Synchronization, v : Vertex) {

- *         //   find transition(_, v, s);

- *         //   neg find child(_,v);

- *         //} or {

- *         //   find transition(_, s, v);

- *         //   neg find child(_,v);

- *         //}

- *         

- *         pattern child(parent: CompositeElement, child: Vertex) {

- *              CompositeElement.regions.vertices(parent, child);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class Child extends BaseGeneratedEMFQuerySpecification<Child.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.child pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private CompositeElement fParent;

-    

-    private Vertex fChild;

-    

-    private static List<String> parameterNames = makeImmutableList("parent", "child");

-    

-    private Match(final CompositeElement pParent, final Vertex pChild) {

-      this.fParent = pParent;

-      this.fChild = pChild;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("parent".equals(parameterName)) return this.fParent;

-      if ("child".equals(parameterName)) return this.fChild;

-      return null;

-    }

-    

-    public CompositeElement getParent() {

-      return this.fParent;

-    }

-    

-    public Vertex getChild() {

-      return this.fChild;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("parent".equals(parameterName) ) {

-          this.fParent = (CompositeElement) newValue;

-          return true;

-      }

-      if ("child".equals(parameterName) ) {

-          this.fChild = (Vertex) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setParent(final CompositeElement pParent) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fParent = pParent;

-    }

-    

-    public void setChild(final Vertex pChild) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fChild = pChild;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.child";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return Child.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fParent, fChild};

-    }

-    

-    @Override

-    public Child.Match toImmutable() {

-      return isMutable() ? newMatch(fParent, fChild) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"parent\"=" + prettyPrintValue(fParent) + ", ");

-      result.append("\"child\"=" + prettyPrintValue(fChild));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fParent, fChild);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof Child.Match)) {

-          Child.Match other = (Child.Match) obj;

-          return Objects.equals(fParent, other.fParent) && Objects.equals(fChild, other.fChild);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public Child specification() {

-      return Child.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static Child.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static Child.Match newMutableMatch(final CompositeElement pParent, final Vertex pChild) {

-      return new Mutable(pParent, pChild);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static Child.Match newMatch(final CompositeElement pParent, final Vertex pChild) {

-      return new Immutable(pParent, pChild);

-    }

-    

-    private static final class Mutable extends Child.Match {

-      Mutable(final CompositeElement pParent, final Vertex pChild) {

-        super(pParent, pChild);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends Child.Match {

-      Immutable(final CompositeElement pParent, final Vertex pChild) {

-        super(pParent, pChild);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.child pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * ///////////////////////////////

-   * // Extra

-   * //

-   * //{@literal @}Constraint(severity="error", message="error", key = {s})

-   * //pattern SynchronizedRegionDoesNotHaveParent(s : Synchronization, v : Vertex) {

-   * // find transition(_, v, s);

-   * // neg find child(_,v);

-   * //} or {

-   * // find transition(_, s, v);

-   * // neg find child(_,v);

-   * //}

-   * 

-   * pattern child(parent: CompositeElement, child: Vertex) {

-   *    CompositeElement.regions.vertices(parent, child);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see Child

-   * 

-   */

-  public static class Matcher extends BaseMatcher<Child.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static Child.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static Child.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_PARENT = 0;

-    

-    private final static int POSITION_CHILD = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Child.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<Child.Match> getAllMatches(final CompositeElement pParent, final Vertex pChild) {

-      return rawStreamAllMatches(new Object[]{pParent, pChild}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<Child.Match> streamAllMatches(final CompositeElement pParent, final Vertex pChild) {

-      return rawStreamAllMatches(new Object[]{pParent, pChild});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<Child.Match> getOneArbitraryMatch(final CompositeElement pParent, final Vertex pChild) {

-      return rawGetOneArbitraryMatch(new Object[]{pParent, pChild});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final CompositeElement pParent, final Vertex pChild) {

-      return rawHasMatch(new Object[]{pParent, pChild});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final CompositeElement pParent, final Vertex pChild) {

-      return rawCountMatches(new Object[]{pParent, pChild});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final CompositeElement pParent, final Vertex pChild, final Consumer<? super Child.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pParent, pChild}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pParent the fixed value of pattern parameter parent, or null if not bound.

-     * @param pChild the fixed value of pattern parameter child, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public Child.Match newMatch(final CompositeElement pParent, final Vertex pChild) {

-      return Child.Match.newMatch(pParent, pChild);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for parent.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<CompositeElement> rawStreamAllValuesOfparent(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_PARENT, parameters).map(CompositeElement.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for parent.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<CompositeElement> getAllValuesOfparent() {

-      return rawStreamAllValuesOfparent(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for parent.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<CompositeElement> streamAllValuesOfparent() {

-      return rawStreamAllValuesOfparent(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for parent.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<CompositeElement> streamAllValuesOfparent(final Child.Match partialMatch) {

-      return rawStreamAllValuesOfparent(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for parent.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<CompositeElement> streamAllValuesOfparent(final Vertex pChild) {

-      return rawStreamAllValuesOfparent(new Object[]{null, pChild});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for parent.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<CompositeElement> getAllValuesOfparent(final Child.Match partialMatch) {

-      return rawStreamAllValuesOfparent(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for parent.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<CompositeElement> getAllValuesOfparent(final Vertex pChild) {

-      return rawStreamAllValuesOfparent(new Object[]{null, pChild}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for child.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOfchild(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_CHILD, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for child.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfchild() {

-      return rawStreamAllValuesOfchild(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for child.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfchild() {

-      return rawStreamAllValuesOfchild(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for child.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfchild(final Child.Match partialMatch) {

-      return rawStreamAllValuesOfchild(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for child.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfchild(final CompositeElement pParent) {

-      return rawStreamAllValuesOfchild(new Object[]{pParent, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for child.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfchild(final Child.Match partialMatch) {

-      return rawStreamAllValuesOfchild(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for child.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfchild(final CompositeElement pParent) {

-      return rawStreamAllValuesOfchild(new Object[]{pParent, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected Child.Match tupleToMatch(final Tuple t) {

-      try {

-          return Child.Match.newMatch((CompositeElement) t.get(POSITION_PARENT), (Vertex) t.get(POSITION_CHILD));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected Child.Match arrayToMatch(final Object[] match) {

-      try {

-          return Child.Match.newMatch((CompositeElement) match[POSITION_PARENT], (Vertex) match[POSITION_CHILD]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected Child.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return Child.Match.newMutableMatch((CompositeElement) match[POSITION_PARENT], (Vertex) match[POSITION_CHILD]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<Child.Matcher> querySpecification() {

-      return Child.instance();

-    }

-  }

-  

-  private Child() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static Child instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected Child.Matcher instantiate(final ViatraQueryEngine engine) {

-    return Child.Matcher.on(engine);

-  }

-  

-  @Override

-  public Child.Matcher instantiate() {

-    return Child.Matcher.create();

-  }

-  

-  @Override

-  public Child.Match newEmptyMatch() {

-    return Child.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public Child.Match newMatch(final Object... parameters) {

-    return Child.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Child (visibility: PUBLIC, simpleName: Child, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Child, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Child (visibility: PUBLIC, simpleName: Child, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Child, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static Child INSTANCE = new Child();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static Child.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_parent = new PParameter("parent", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "CompositeElement")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_child = new PParameter("child", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_parent, parameter_child);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.child";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("parent","child");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_parent = body.getOrCreateVariableByName("parent");

-          PVariable var_child = body.getOrCreateVariableByName("child");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_parent), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_child), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_parent, parameter_parent),

-             new ExportedParameter(body, var_child, parameter_child)

-          ));

-          //    CompositeElement.regions.vertices(parent, child)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_parent), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_parent, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "CompositeElement", "regions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_child);

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/ChoiceHasNoIncoming.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/ChoiceHasNoIncoming.java
deleted file mode 100644
index 8e62ee9d..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/ChoiceHasNoIncoming.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Choice;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {c})

- *         pattern choiceHasNoIncoming(c: Choice) {

- *              neg find transition(_, _, c);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class ChoiceHasNoIncoming extends BaseGeneratedEMFQuerySpecification<ChoiceHasNoIncoming.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Choice fC;

-    

-    private static List<String> parameterNames = makeImmutableList("c");

-    

-    private Match(final Choice pC) {

-      this.fC = pC;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("c".equals(parameterName)) return this.fC;

-      return null;

-    }

-    

-    public Choice getC() {

-      return this.fC;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("c".equals(parameterName) ) {

-          this.fC = (Choice) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setC(final Choice pC) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fC = pC;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return ChoiceHasNoIncoming.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fC};

-    }

-    

-    @Override

-    public ChoiceHasNoIncoming.Match toImmutable() {

-      return isMutable() ? newMatch(fC) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"c\"=" + prettyPrintValue(fC));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fC);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof ChoiceHasNoIncoming.Match)) {

-          ChoiceHasNoIncoming.Match other = (ChoiceHasNoIncoming.Match) obj;

-          return Objects.equals(fC, other.fC);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public ChoiceHasNoIncoming specification() {

-      return ChoiceHasNoIncoming.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static ChoiceHasNoIncoming.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static ChoiceHasNoIncoming.Match newMutableMatch(final Choice pC) {

-      return new Mutable(pC);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static ChoiceHasNoIncoming.Match newMatch(final Choice pC) {

-      return new Immutable(pC);

-    }

-    

-    private static final class Mutable extends ChoiceHasNoIncoming.Match {

-      Mutable(final Choice pC) {

-        super(pC);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends ChoiceHasNoIncoming.Match {

-      Immutable(final Choice pC) {

-        super(pC);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {c})

-   * pattern choiceHasNoIncoming(c: Choice) {

-   *    neg find transition(_, _, c);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see ChoiceHasNoIncoming

-   * 

-   */

-  public static class Matcher extends BaseMatcher<ChoiceHasNoIncoming.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static ChoiceHasNoIncoming.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static ChoiceHasNoIncoming.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_C = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChoiceHasNoIncoming.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<ChoiceHasNoIncoming.Match> getAllMatches(final Choice pC) {

-      return rawStreamAllMatches(new Object[]{pC}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<ChoiceHasNoIncoming.Match> streamAllMatches(final Choice pC) {

-      return rawStreamAllMatches(new Object[]{pC});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<ChoiceHasNoIncoming.Match> getOneArbitraryMatch(final Choice pC) {

-      return rawGetOneArbitraryMatch(new Object[]{pC});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Choice pC) {

-      return rawHasMatch(new Object[]{pC});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Choice pC) {

-      return rawCountMatches(new Object[]{pC});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Choice pC, final Consumer<? super ChoiceHasNoIncoming.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pC}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public ChoiceHasNoIncoming.Match newMatch(final Choice pC) {

-      return ChoiceHasNoIncoming.Match.newMatch(pC);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for c.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Choice> rawStreamAllValuesOfc(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_C, parameters).map(Choice.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for c.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Choice> getAllValuesOfc() {

-      return rawStreamAllValuesOfc(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for c.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Choice> streamAllValuesOfc() {

-      return rawStreamAllValuesOfc(emptyArray());

-    }

-    

-    @Override

-    protected ChoiceHasNoIncoming.Match tupleToMatch(final Tuple t) {

-      try {

-          return ChoiceHasNoIncoming.Match.newMatch((Choice) t.get(POSITION_C));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected ChoiceHasNoIncoming.Match arrayToMatch(final Object[] match) {

-      try {

-          return ChoiceHasNoIncoming.Match.newMatch((Choice) match[POSITION_C]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected ChoiceHasNoIncoming.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return ChoiceHasNoIncoming.Match.newMutableMatch((Choice) match[POSITION_C]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<ChoiceHasNoIncoming.Matcher> querySpecification() {

-      return ChoiceHasNoIncoming.instance();

-    }

-  }

-  

-  private ChoiceHasNoIncoming() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static ChoiceHasNoIncoming instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected ChoiceHasNoIncoming.Matcher instantiate(final ViatraQueryEngine engine) {

-    return ChoiceHasNoIncoming.Matcher.on(engine);

-  }

-  

-  @Override

-  public ChoiceHasNoIncoming.Matcher instantiate() {

-    return ChoiceHasNoIncoming.Matcher.create();

-  }

-  

-  @Override

-  public ChoiceHasNoIncoming.Match newEmptyMatch() {

-    return ChoiceHasNoIncoming.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public ChoiceHasNoIncoming.Match newMatch(final Object... parameters) {

-    return ChoiceHasNoIncoming.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Choice) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoIncoming (visibility: PUBLIC, simpleName: ChoiceHasNoIncoming, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoIncoming, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoIncoming (visibility: PUBLIC, simpleName: ChoiceHasNoIncoming, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoIncoming, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static ChoiceHasNoIncoming INSTANCE = new ChoiceHasNoIncoming();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static ChoiceHasNoIncoming.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_c = new PParameter("c", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Choice", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Choice")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_c);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoIncoming";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("c");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_c = body.getOrCreateVariableByName("c");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_c), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Choice")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_c, parameter_c)

-          ));

-          //    neg find transition(_, _, c)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var___1_, var_c), Transition.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("c")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/ChoiceHasNoOutgoing.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/ChoiceHasNoOutgoing.java
deleted file mode 100644
index 1c20a03b..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/ChoiceHasNoOutgoing.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Choice;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         /////////

- *         // Choice

- *         /////////

- *         

- *         {@literal @}Constraint(severity="error", message="error", key = {c})

- *         pattern choiceHasNoOutgoing(c : Choice) {

- *              neg find transition(_, c, _);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class ChoiceHasNoOutgoing extends BaseGeneratedEMFQuerySpecification<ChoiceHasNoOutgoing.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Choice fC;

-    

-    private static List<String> parameterNames = makeImmutableList("c");

-    

-    private Match(final Choice pC) {

-      this.fC = pC;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("c".equals(parameterName)) return this.fC;

-      return null;

-    }

-    

-    public Choice getC() {

-      return this.fC;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("c".equals(parameterName) ) {

-          this.fC = (Choice) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setC(final Choice pC) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fC = pC;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return ChoiceHasNoOutgoing.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fC};

-    }

-    

-    @Override

-    public ChoiceHasNoOutgoing.Match toImmutable() {

-      return isMutable() ? newMatch(fC) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"c\"=" + prettyPrintValue(fC));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fC);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof ChoiceHasNoOutgoing.Match)) {

-          ChoiceHasNoOutgoing.Match other = (ChoiceHasNoOutgoing.Match) obj;

-          return Objects.equals(fC, other.fC);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public ChoiceHasNoOutgoing specification() {

-      return ChoiceHasNoOutgoing.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static ChoiceHasNoOutgoing.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static ChoiceHasNoOutgoing.Match newMutableMatch(final Choice pC) {

-      return new Mutable(pC);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static ChoiceHasNoOutgoing.Match newMatch(final Choice pC) {

-      return new Immutable(pC);

-    }

-    

-    private static final class Mutable extends ChoiceHasNoOutgoing.Match {

-      Mutable(final Choice pC) {

-        super(pC);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends ChoiceHasNoOutgoing.Match {

-      Immutable(final Choice pC) {

-        super(pC);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * /////////

-   * // Choice

-   * /////////

-   * 

-   * {@literal @}Constraint(severity="error", message="error", key = {c})

-   * pattern choiceHasNoOutgoing(c : Choice) {

-   *    neg find transition(_, c, _);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see ChoiceHasNoOutgoing

-   * 

-   */

-  public static class Matcher extends BaseMatcher<ChoiceHasNoOutgoing.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static ChoiceHasNoOutgoing.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static ChoiceHasNoOutgoing.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_C = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(ChoiceHasNoOutgoing.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<ChoiceHasNoOutgoing.Match> getAllMatches(final Choice pC) {

-      return rawStreamAllMatches(new Object[]{pC}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<ChoiceHasNoOutgoing.Match> streamAllMatches(final Choice pC) {

-      return rawStreamAllMatches(new Object[]{pC});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<ChoiceHasNoOutgoing.Match> getOneArbitraryMatch(final Choice pC) {

-      return rawGetOneArbitraryMatch(new Object[]{pC});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Choice pC) {

-      return rawHasMatch(new Object[]{pC});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Choice pC) {

-      return rawCountMatches(new Object[]{pC});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Choice pC, final Consumer<? super ChoiceHasNoOutgoing.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pC}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pC the fixed value of pattern parameter c, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public ChoiceHasNoOutgoing.Match newMatch(final Choice pC) {

-      return ChoiceHasNoOutgoing.Match.newMatch(pC);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for c.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Choice> rawStreamAllValuesOfc(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_C, parameters).map(Choice.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for c.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Choice> getAllValuesOfc() {

-      return rawStreamAllValuesOfc(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for c.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Choice> streamAllValuesOfc() {

-      return rawStreamAllValuesOfc(emptyArray());

-    }

-    

-    @Override

-    protected ChoiceHasNoOutgoing.Match tupleToMatch(final Tuple t) {

-      try {

-          return ChoiceHasNoOutgoing.Match.newMatch((Choice) t.get(POSITION_C));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected ChoiceHasNoOutgoing.Match arrayToMatch(final Object[] match) {

-      try {

-          return ChoiceHasNoOutgoing.Match.newMatch((Choice) match[POSITION_C]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected ChoiceHasNoOutgoing.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return ChoiceHasNoOutgoing.Match.newMutableMatch((Choice) match[POSITION_C]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<ChoiceHasNoOutgoing.Matcher> querySpecification() {

-      return ChoiceHasNoOutgoing.instance();

-    }

-  }

-  

-  private ChoiceHasNoOutgoing() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static ChoiceHasNoOutgoing instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected ChoiceHasNoOutgoing.Matcher instantiate(final ViatraQueryEngine engine) {

-    return ChoiceHasNoOutgoing.Matcher.on(engine);

-  }

-  

-  @Override

-  public ChoiceHasNoOutgoing.Matcher instantiate() {

-    return ChoiceHasNoOutgoing.Matcher.create();

-  }

-  

-  @Override

-  public ChoiceHasNoOutgoing.Match newEmptyMatch() {

-    return ChoiceHasNoOutgoing.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public ChoiceHasNoOutgoing.Match newMatch(final Object... parameters) {

-    return ChoiceHasNoOutgoing.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Choice) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoOutgoing (visibility: PUBLIC, simpleName: ChoiceHasNoOutgoing, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoOutgoing, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoOutgoing (visibility: PUBLIC, simpleName: ChoiceHasNoOutgoing, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.ChoiceHasNoOutgoing, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static ChoiceHasNoOutgoing INSTANCE = new ChoiceHasNoOutgoing();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static ChoiceHasNoOutgoing.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_c = new PParameter("c", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Choice", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Choice")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_c);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.choiceHasNoOutgoing";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("c");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_c = body.getOrCreateVariableByName("c");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_c), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Choice")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_c, parameter_c)

-          ));

-          //    neg find transition(_, c, _)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_c, var___1_), Transition.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("c")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/EntryInRegion.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/EntryInRegion.java
deleted file mode 100644
index 147b27f9..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/EntryInRegion.java
+++ /dev/null
@@ -1,702 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         /////////

- *         // Entry

- *         /////////

- *         

- *         pattern entryInRegion(r1 : Region, e1 : Entry) {

- *              Region.vertices(r1, e1);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class EntryInRegion extends BaseGeneratedEMFQuerySpecification<EntryInRegion.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Region fR1;

-    

-    private Entry fE1;

-    

-    private static List<String> parameterNames = makeImmutableList("r1", "e1");

-    

-    private Match(final Region pR1, final Entry pE1) {

-      this.fR1 = pR1;

-      this.fE1 = pE1;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("r1".equals(parameterName)) return this.fR1;

-      if ("e1".equals(parameterName)) return this.fE1;

-      return null;

-    }

-    

-    public Region getR1() {

-      return this.fR1;

-    }

-    

-    public Entry getE1() {

-      return this.fE1;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("r1".equals(parameterName) ) {

-          this.fR1 = (Region) newValue;

-          return true;

-      }

-      if ("e1".equals(parameterName) ) {

-          this.fE1 = (Entry) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setR1(final Region pR1) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fR1 = pR1;

-    }

-    

-    public void setE1(final Entry pE1) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fE1 = pE1;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return EntryInRegion.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fR1, fE1};

-    }

-    

-    @Override

-    public EntryInRegion.Match toImmutable() {

-      return isMutable() ? newMatch(fR1, fE1) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"r1\"=" + prettyPrintValue(fR1) + ", ");

-      result.append("\"e1\"=" + prettyPrintValue(fE1));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fR1, fE1);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof EntryInRegion.Match)) {

-          EntryInRegion.Match other = (EntryInRegion.Match) obj;

-          return Objects.equals(fR1, other.fR1) && Objects.equals(fE1, other.fE1);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public EntryInRegion specification() {

-      return EntryInRegion.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static EntryInRegion.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static EntryInRegion.Match newMutableMatch(final Region pR1, final Entry pE1) {

-      return new Mutable(pR1, pE1);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static EntryInRegion.Match newMatch(final Region pR1, final Entry pE1) {

-      return new Immutable(pR1, pE1);

-    }

-    

-    private static final class Mutable extends EntryInRegion.Match {

-      Mutable(final Region pR1, final Entry pE1) {

-        super(pR1, pE1);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends EntryInRegion.Match {

-      Immutable(final Region pR1, final Entry pE1) {

-        super(pR1, pE1);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * /////////

-   * // Entry

-   * /////////

-   * 

-   * pattern entryInRegion(r1 : Region, e1 : Entry) {

-   *    Region.vertices(r1, e1);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see EntryInRegion

-   * 

-   */

-  public static class Matcher extends BaseMatcher<EntryInRegion.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static EntryInRegion.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static EntryInRegion.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_R1 = 0;

-    

-    private final static int POSITION_E1 = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(EntryInRegion.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<EntryInRegion.Match> getAllMatches(final Region pR1, final Entry pE1) {

-      return rawStreamAllMatches(new Object[]{pR1, pE1}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<EntryInRegion.Match> streamAllMatches(final Region pR1, final Entry pE1) {

-      return rawStreamAllMatches(new Object[]{pR1, pE1});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<EntryInRegion.Match> getOneArbitraryMatch(final Region pR1, final Entry pE1) {

-      return rawGetOneArbitraryMatch(new Object[]{pR1, pE1});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Region pR1, final Entry pE1) {

-      return rawHasMatch(new Object[]{pR1, pE1});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Region pR1, final Entry pE1) {

-      return rawCountMatches(new Object[]{pR1, pE1});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Region pR1, final Entry pE1, final Consumer<? super EntryInRegion.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pR1, pE1}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param pE1 the fixed value of pattern parameter e1, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public EntryInRegion.Match newMatch(final Region pR1, final Entry pE1) {

-      return EntryInRegion.Match.newMatch(pR1, pE1);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Region> rawStreamAllValuesOfr1(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_R1, parameters).map(Region.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfr1() {

-      return rawStreamAllValuesOfr1(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfr1() {

-      return rawStreamAllValuesOfr1(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfr1(final EntryInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfr1(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfr1(final Entry pE1) {

-      return rawStreamAllValuesOfr1(new Object[]{null, pE1});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfr1(final EntryInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfr1(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfr1(final Entry pE1) {

-      return rawStreamAllValuesOfr1(new Object[]{null, pE1}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Entry> rawStreamAllValuesOfe1(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_E1, parameters).map(Entry.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe1() {

-      return rawStreamAllValuesOfe1(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe1() {

-      return rawStreamAllValuesOfe1(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe1(final EntryInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfe1(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe1(final Region pR1) {

-      return rawStreamAllValuesOfe1(new Object[]{pR1, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe1(final EntryInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfe1(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe1(final Region pR1) {

-      return rawStreamAllValuesOfe1(new Object[]{pR1, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected EntryInRegion.Match tupleToMatch(final Tuple t) {

-      try {

-          return EntryInRegion.Match.newMatch((Region) t.get(POSITION_R1), (Entry) t.get(POSITION_E1));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected EntryInRegion.Match arrayToMatch(final Object[] match) {

-      try {

-          return EntryInRegion.Match.newMatch((Region) match[POSITION_R1], (Entry) match[POSITION_E1]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected EntryInRegion.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return EntryInRegion.Match.newMutableMatch((Region) match[POSITION_R1], (Entry) match[POSITION_E1]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<EntryInRegion.Matcher> querySpecification() {

-      return EntryInRegion.instance();

-    }

-  }

-  

-  private EntryInRegion() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static EntryInRegion instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected EntryInRegion.Matcher instantiate(final ViatraQueryEngine engine) {

-    return EntryInRegion.Matcher.on(engine);

-  }

-  

-  @Override

-  public EntryInRegion.Matcher instantiate() {

-    return EntryInRegion.Matcher.create();

-  }

-  

-  @Override

-  public EntryInRegion.Match newEmptyMatch() {

-    return EntryInRegion.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public EntryInRegion.Match newMatch(final Object... parameters) {

-    return EntryInRegion.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.EntryInRegion (visibility: PUBLIC, simpleName: EntryInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.EntryInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.EntryInRegion (visibility: PUBLIC, simpleName: EntryInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.EntryInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static EntryInRegion INSTANCE = new EntryInRegion();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static EntryInRegion.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_r1 = new PParameter("r1", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Region")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_e1 = new PParameter("e1", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Entry")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_r1, parameter_e1);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.entryInRegion";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("r1","e1");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_r1 = body.getOrCreateVariableByName("r1");

-          PVariable var_e1 = body.getOrCreateVariableByName("e1");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Entry")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_r1, parameter_r1),

-             new ExportedParameter(body, var_e1, parameter_e1)

-          ));

-          //    Region.vertices(r1, e1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_0_, var_e1);

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleIncomingTrainsition.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleIncomingTrainsition.java
deleted file mode 100644
index 236ce5ff..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleIncomingTrainsition.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         pattern hasMultipleIncomingTrainsition(v : Synchronization) {

- *              find transition(_, src1, v);

- *              find transition(_, src2, v);

- *              src1 != src2;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class HasMultipleIncomingTrainsition extends BaseGeneratedEMFQuerySpecification<HasMultipleIncomingTrainsition.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleIncomingTrainsition pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fV;

-    

-    private static List<String> parameterNames = makeImmutableList("v");

-    

-    private Match(final Synchronization pV) {

-      this.fV = pV;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("v".equals(parameterName)) return this.fV;

-      return null;

-    }

-    

-    public Synchronization getV() {

-      return this.fV;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("v".equals(parameterName) ) {

-          this.fV = (Synchronization) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setV(final Synchronization pV) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fV = pV;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleIncomingTrainsition";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return HasMultipleIncomingTrainsition.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fV};

-    }

-    

-    @Override

-    public HasMultipleIncomingTrainsition.Match toImmutable() {

-      return isMutable() ? newMatch(fV) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"v\"=" + prettyPrintValue(fV));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fV);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof HasMultipleIncomingTrainsition.Match)) {

-          HasMultipleIncomingTrainsition.Match other = (HasMultipleIncomingTrainsition.Match) obj;

-          return Objects.equals(fV, other.fV);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public HasMultipleIncomingTrainsition specification() {

-      return HasMultipleIncomingTrainsition.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static HasMultipleIncomingTrainsition.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static HasMultipleIncomingTrainsition.Match newMutableMatch(final Synchronization pV) {

-      return new Mutable(pV);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static HasMultipleIncomingTrainsition.Match newMatch(final Synchronization pV) {

-      return new Immutable(pV);

-    }

-    

-    private static final class Mutable extends HasMultipleIncomingTrainsition.Match {

-      Mutable(final Synchronization pV) {

-        super(pV);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends HasMultipleIncomingTrainsition.Match {

-      Immutable(final Synchronization pV) {

-        super(pV);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleIncomingTrainsition pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * pattern hasMultipleIncomingTrainsition(v : Synchronization) {

-   *    find transition(_, src1, v);

-   *    find transition(_, src2, v);

-   *    src1 != src2;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see HasMultipleIncomingTrainsition

-   * 

-   */

-  public static class Matcher extends BaseMatcher<HasMultipleIncomingTrainsition.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static HasMultipleIncomingTrainsition.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static HasMultipleIncomingTrainsition.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_V = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(HasMultipleIncomingTrainsition.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<HasMultipleIncomingTrainsition.Match> getAllMatches(final Synchronization pV) {

-      return rawStreamAllMatches(new Object[]{pV}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<HasMultipleIncomingTrainsition.Match> streamAllMatches(final Synchronization pV) {

-      return rawStreamAllMatches(new Object[]{pV});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<HasMultipleIncomingTrainsition.Match> getOneArbitraryMatch(final Synchronization pV) {

-      return rawGetOneArbitraryMatch(new Object[]{pV});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pV) {

-      return rawHasMatch(new Object[]{pV});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pV) {

-      return rawCountMatches(new Object[]{pV});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pV, final Consumer<? super HasMultipleIncomingTrainsition.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pV}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public HasMultipleIncomingTrainsition.Match newMatch(final Synchronization pV) {

-      return HasMultipleIncomingTrainsition.Match.newMatch(pV);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfv(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_V, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfv() {

-      return rawStreamAllValuesOfv(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfv() {

-      return rawStreamAllValuesOfv(emptyArray());

-    }

-    

-    @Override

-    protected HasMultipleIncomingTrainsition.Match tupleToMatch(final Tuple t) {

-      try {

-          return HasMultipleIncomingTrainsition.Match.newMatch((Synchronization) t.get(POSITION_V));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected HasMultipleIncomingTrainsition.Match arrayToMatch(final Object[] match) {

-      try {

-          return HasMultipleIncomingTrainsition.Match.newMatch((Synchronization) match[POSITION_V]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected HasMultipleIncomingTrainsition.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return HasMultipleIncomingTrainsition.Match.newMutableMatch((Synchronization) match[POSITION_V]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<HasMultipleIncomingTrainsition.Matcher> querySpecification() {

-      return HasMultipleIncomingTrainsition.instance();

-    }

-  }

-  

-  private HasMultipleIncomingTrainsition() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static HasMultipleIncomingTrainsition instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected HasMultipleIncomingTrainsition.Matcher instantiate(final ViatraQueryEngine engine) {

-    return HasMultipleIncomingTrainsition.Matcher.on(engine);

-  }

-  

-  @Override

-  public HasMultipleIncomingTrainsition.Matcher instantiate() {

-    return HasMultipleIncomingTrainsition.Matcher.create();

-  }

-  

-  @Override

-  public HasMultipleIncomingTrainsition.Match newEmptyMatch() {

-    return HasMultipleIncomingTrainsition.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public HasMultipleIncomingTrainsition.Match newMatch(final Object... parameters) {

-    return HasMultipleIncomingTrainsition.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleIncomingTrainsition (visibility: PUBLIC, simpleName: HasMultipleIncomingTrainsition, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleIncomingTrainsition, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleIncomingTrainsition (visibility: PUBLIC, simpleName: HasMultipleIncomingTrainsition, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleIncomingTrainsition, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static HasMultipleIncomingTrainsition INSTANCE = new HasMultipleIncomingTrainsition();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static HasMultipleIncomingTrainsition.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_v = new PParameter("v", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_v);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleIncomingTrainsition";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("v");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_v = body.getOrCreateVariableByName("v");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var_src1 = body.getOrCreateVariableByName("src1");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          PVariable var_src2 = body.getOrCreateVariableByName("src2");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_v, parameter_v)

-          ));

-          //    find transition(_, src1, v)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___0_, var_src1, var_v), Transition.instance().getInternalQueryRepresentation());

-          //    find transition(_, src2, v)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___1_, var_src2, var_v), Transition.instance().getInternalQueryRepresentation());

-          //    src1 != src2

-          new Inequality(body, var_src1, var_src2);

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleOutgoingTrainsition.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleOutgoingTrainsition.java
deleted file mode 100644
index 115b93e1..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleOutgoingTrainsition.java
+++ /dev/null
@@ -1,549 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         pattern hasMultipleOutgoingTrainsition(v : Synchronization) {

- *              find transition(_, v, trg1);

- *              find transition(_, v, trg2);

- *              trg1 != trg2;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class HasMultipleOutgoingTrainsition extends BaseGeneratedEMFQuerySpecification<HasMultipleOutgoingTrainsition.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleOutgoingTrainsition pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fV;

-    

-    private static List<String> parameterNames = makeImmutableList("v");

-    

-    private Match(final Synchronization pV) {

-      this.fV = pV;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("v".equals(parameterName)) return this.fV;

-      return null;

-    }

-    

-    public Synchronization getV() {

-      return this.fV;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("v".equals(parameterName) ) {

-          this.fV = (Synchronization) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setV(final Synchronization pV) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fV = pV;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleOutgoingTrainsition";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return HasMultipleOutgoingTrainsition.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fV};

-    }

-    

-    @Override

-    public HasMultipleOutgoingTrainsition.Match toImmutable() {

-      return isMutable() ? newMatch(fV) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"v\"=" + prettyPrintValue(fV));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fV);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof HasMultipleOutgoingTrainsition.Match)) {

-          HasMultipleOutgoingTrainsition.Match other = (HasMultipleOutgoingTrainsition.Match) obj;

-          return Objects.equals(fV, other.fV);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public HasMultipleOutgoingTrainsition specification() {

-      return HasMultipleOutgoingTrainsition.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static HasMultipleOutgoingTrainsition.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static HasMultipleOutgoingTrainsition.Match newMutableMatch(final Synchronization pV) {

-      return new Mutable(pV);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static HasMultipleOutgoingTrainsition.Match newMatch(final Synchronization pV) {

-      return new Immutable(pV);

-    }

-    

-    private static final class Mutable extends HasMultipleOutgoingTrainsition.Match {

-      Mutable(final Synchronization pV) {

-        super(pV);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends HasMultipleOutgoingTrainsition.Match {

-      Immutable(final Synchronization pV) {

-        super(pV);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleOutgoingTrainsition pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * pattern hasMultipleOutgoingTrainsition(v : Synchronization) {

-   *    find transition(_, v, trg1);

-   *    find transition(_, v, trg2);

-   *    trg1 != trg2;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see HasMultipleOutgoingTrainsition

-   * 

-   */

-  public static class Matcher extends BaseMatcher<HasMultipleOutgoingTrainsition.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static HasMultipleOutgoingTrainsition.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static HasMultipleOutgoingTrainsition.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_V = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(HasMultipleOutgoingTrainsition.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<HasMultipleOutgoingTrainsition.Match> getAllMatches(final Synchronization pV) {

-      return rawStreamAllMatches(new Object[]{pV}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<HasMultipleOutgoingTrainsition.Match> streamAllMatches(final Synchronization pV) {

-      return rawStreamAllMatches(new Object[]{pV});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<HasMultipleOutgoingTrainsition.Match> getOneArbitraryMatch(final Synchronization pV) {

-      return rawGetOneArbitraryMatch(new Object[]{pV});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pV) {

-      return rawHasMatch(new Object[]{pV});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pV) {

-      return rawCountMatches(new Object[]{pV});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pV, final Consumer<? super HasMultipleOutgoingTrainsition.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pV}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public HasMultipleOutgoingTrainsition.Match newMatch(final Synchronization pV) {

-      return HasMultipleOutgoingTrainsition.Match.newMatch(pV);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfv(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_V, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfv() {

-      return rawStreamAllValuesOfv(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfv() {

-      return rawStreamAllValuesOfv(emptyArray());

-    }

-    

-    @Override

-    protected HasMultipleOutgoingTrainsition.Match tupleToMatch(final Tuple t) {

-      try {

-          return HasMultipleOutgoingTrainsition.Match.newMatch((Synchronization) t.get(POSITION_V));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected HasMultipleOutgoingTrainsition.Match arrayToMatch(final Object[] match) {

-      try {

-          return HasMultipleOutgoingTrainsition.Match.newMatch((Synchronization) match[POSITION_V]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected HasMultipleOutgoingTrainsition.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return HasMultipleOutgoingTrainsition.Match.newMutableMatch((Synchronization) match[POSITION_V]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<HasMultipleOutgoingTrainsition.Matcher> querySpecification() {

-      return HasMultipleOutgoingTrainsition.instance();

-    }

-  }

-  

-  private HasMultipleOutgoingTrainsition() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static HasMultipleOutgoingTrainsition instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected HasMultipleOutgoingTrainsition.Matcher instantiate(final ViatraQueryEngine engine) {

-    return HasMultipleOutgoingTrainsition.Matcher.on(engine);

-  }

-  

-  @Override

-  public HasMultipleOutgoingTrainsition.Matcher instantiate() {

-    return HasMultipleOutgoingTrainsition.Matcher.create();

-  }

-  

-  @Override

-  public HasMultipleOutgoingTrainsition.Match newEmptyMatch() {

-    return HasMultipleOutgoingTrainsition.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public HasMultipleOutgoingTrainsition.Match newMatch(final Object... parameters) {

-    return HasMultipleOutgoingTrainsition.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleOutgoingTrainsition (visibility: PUBLIC, simpleName: HasMultipleOutgoingTrainsition, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleOutgoingTrainsition, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleOutgoingTrainsition (visibility: PUBLIC, simpleName: HasMultipleOutgoingTrainsition, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleOutgoingTrainsition, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static HasMultipleOutgoingTrainsition INSTANCE = new HasMultipleOutgoingTrainsition();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static HasMultipleOutgoingTrainsition.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_v = new PParameter("v", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_v);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleOutgoingTrainsition";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("v");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_v = body.getOrCreateVariableByName("v");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var_trg1 = body.getOrCreateVariableByName("trg1");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          PVariable var_trg2 = body.getOrCreateVariableByName("trg2");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_v, parameter_v)

-          ));

-          //    find transition(_, v, trg1)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___0_, var_v, var_trg1), Transition.instance().getInternalQueryRepresentation());

-          //    find transition(_, v, trg2)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___1_, var_v, var_trg2), Transition.instance().getInternalQueryRepresentation());

-          //    trg1 != trg2

-          new Inequality(body, var_trg1, var_trg2);

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleRegions.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleRegions.java
deleted file mode 100644
index 5542ccbb..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/HasMultipleRegions.java
+++ /dev/null
@@ -1,555 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         pattern hasMultipleRegions(composite: CompositeElement) {

- *              CompositeElement.regions(composite,region1);

- *              CompositeElement.regions(composite,region2);

- *              region1 != region2;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class HasMultipleRegions extends BaseGeneratedEMFQuerySpecification<HasMultipleRegions.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleRegions pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private CompositeElement fComposite;

-    

-    private static List<String> parameterNames = makeImmutableList("composite");

-    

-    private Match(final CompositeElement pComposite) {

-      this.fComposite = pComposite;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("composite".equals(parameterName)) return this.fComposite;

-      return null;

-    }

-    

-    public CompositeElement getComposite() {

-      return this.fComposite;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("composite".equals(parameterName) ) {

-          this.fComposite = (CompositeElement) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setComposite(final CompositeElement pComposite) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fComposite = pComposite;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleRegions";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return HasMultipleRegions.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fComposite};

-    }

-    

-    @Override

-    public HasMultipleRegions.Match toImmutable() {

-      return isMutable() ? newMatch(fComposite) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"composite\"=" + prettyPrintValue(fComposite));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fComposite);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof HasMultipleRegions.Match)) {

-          HasMultipleRegions.Match other = (HasMultipleRegions.Match) obj;

-          return Objects.equals(fComposite, other.fComposite);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public HasMultipleRegions specification() {

-      return HasMultipleRegions.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static HasMultipleRegions.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static HasMultipleRegions.Match newMutableMatch(final CompositeElement pComposite) {

-      return new Mutable(pComposite);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static HasMultipleRegions.Match newMatch(final CompositeElement pComposite) {

-      return new Immutable(pComposite);

-    }

-    

-    private static final class Mutable extends HasMultipleRegions.Match {

-      Mutable(final CompositeElement pComposite) {

-        super(pComposite);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends HasMultipleRegions.Match {

-      Immutable(final CompositeElement pComposite) {

-        super(pComposite);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleRegions pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * pattern hasMultipleRegions(composite: CompositeElement) {

-   *    CompositeElement.regions(composite,region1);

-   *    CompositeElement.regions(composite,region2);

-   *    region1 != region2;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see HasMultipleRegions

-   * 

-   */

-  public static class Matcher extends BaseMatcher<HasMultipleRegions.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static HasMultipleRegions.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static HasMultipleRegions.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_COMPOSITE = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(HasMultipleRegions.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<HasMultipleRegions.Match> getAllMatches(final CompositeElement pComposite) {

-      return rawStreamAllMatches(new Object[]{pComposite}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<HasMultipleRegions.Match> streamAllMatches(final CompositeElement pComposite) {

-      return rawStreamAllMatches(new Object[]{pComposite});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<HasMultipleRegions.Match> getOneArbitraryMatch(final CompositeElement pComposite) {

-      return rawGetOneArbitraryMatch(new Object[]{pComposite});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final CompositeElement pComposite) {

-      return rawHasMatch(new Object[]{pComposite});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final CompositeElement pComposite) {

-      return rawCountMatches(new Object[]{pComposite});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final CompositeElement pComposite, final Consumer<? super HasMultipleRegions.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pComposite}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pComposite the fixed value of pattern parameter composite, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public HasMultipleRegions.Match newMatch(final CompositeElement pComposite) {

-      return HasMultipleRegions.Match.newMatch(pComposite);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for composite.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<CompositeElement> rawStreamAllValuesOfcomposite(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_COMPOSITE, parameters).map(CompositeElement.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for composite.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<CompositeElement> getAllValuesOfcomposite() {

-      return rawStreamAllValuesOfcomposite(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for composite.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<CompositeElement> streamAllValuesOfcomposite() {

-      return rawStreamAllValuesOfcomposite(emptyArray());

-    }

-    

-    @Override

-    protected HasMultipleRegions.Match tupleToMatch(final Tuple t) {

-      try {

-          return HasMultipleRegions.Match.newMatch((CompositeElement) t.get(POSITION_COMPOSITE));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected HasMultipleRegions.Match arrayToMatch(final Object[] match) {

-      try {

-          return HasMultipleRegions.Match.newMatch((CompositeElement) match[POSITION_COMPOSITE]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected HasMultipleRegions.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return HasMultipleRegions.Match.newMutableMatch((CompositeElement) match[POSITION_COMPOSITE]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<HasMultipleRegions.Matcher> querySpecification() {

-      return HasMultipleRegions.instance();

-    }

-  }

-  

-  private HasMultipleRegions() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static HasMultipleRegions instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected HasMultipleRegions.Matcher instantiate(final ViatraQueryEngine engine) {

-    return HasMultipleRegions.Matcher.on(engine);

-  }

-  

-  @Override

-  public HasMultipleRegions.Matcher instantiate() {

-    return HasMultipleRegions.Matcher.create();

-  }

-  

-  @Override

-  public HasMultipleRegions.Match newEmptyMatch() {

-    return HasMultipleRegions.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public HasMultipleRegions.Match newMatch(final Object... parameters) {

-    return HasMultipleRegions.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleRegions (visibility: PUBLIC, simpleName: HasMultipleRegions, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleRegions, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleRegions (visibility: PUBLIC, simpleName: HasMultipleRegions, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleRegions, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static HasMultipleRegions INSTANCE = new HasMultipleRegions();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static HasMultipleRegions.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_composite = new PParameter("composite", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.CompositeElement", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "CompositeElement")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_composite);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.hasMultipleRegions";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("composite");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_composite = body.getOrCreateVariableByName("composite");

-          PVariable var_region1 = body.getOrCreateVariableByName("region1");

-          PVariable var_region2 = body.getOrCreateVariableByName("region2");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_composite), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_composite, parameter_composite)

-          ));

-          //    CompositeElement.regions(composite,region1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_composite), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_composite, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "CompositeElement", "regions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          new Equality(body, var__virtual_0_, var_region1);

-          //    CompositeElement.regions(composite,region2)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_composite), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_composite, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "CompositeElement", "regions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          new Equality(body, var__virtual_1_, var_region2);

-          //    region1 != region2

-          new Inequality(body, var_region1, var_region2);

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/IncomingToEntry.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/IncomingToEntry.java
deleted file mode 100644
index ed8ca3e5..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/IncomingToEntry.java
+++ /dev/null
@@ -1,703 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {e})

- *         pattern incomingToEntry(t : Transition, e : Entry) {

- *              find transition(t, _, e);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class IncomingToEntry extends BaseGeneratedEMFQuerySpecification<IncomingToEntry.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Transition fT;

-    

-    private Entry fE;

-    

-    private static List<String> parameterNames = makeImmutableList("t", "e");

-    

-    private Match(final Transition pT, final Entry pE) {

-      this.fT = pT;

-      this.fE = pE;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("t".equals(parameterName)) return this.fT;

-      if ("e".equals(parameterName)) return this.fE;

-      return null;

-    }

-    

-    public Transition getT() {

-      return this.fT;

-    }

-    

-    public Entry getE() {

-      return this.fE;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("t".equals(parameterName) ) {

-          this.fT = (Transition) newValue;

-          return true;

-      }

-      if ("e".equals(parameterName) ) {

-          this.fE = (Entry) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setT(final Transition pT) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT = pT;

-    }

-    

-    public void setE(final Entry pE) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fE = pE;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return IncomingToEntry.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fT, fE};

-    }

-    

-    @Override

-    public IncomingToEntry.Match toImmutable() {

-      return isMutable() ? newMatch(fT, fE) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"t\"=" + prettyPrintValue(fT) + ", ");

-      result.append("\"e\"=" + prettyPrintValue(fE));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fT, fE);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof IncomingToEntry.Match)) {

-          IncomingToEntry.Match other = (IncomingToEntry.Match) obj;

-          return Objects.equals(fT, other.fT) && Objects.equals(fE, other.fE);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public IncomingToEntry specification() {

-      return IncomingToEntry.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static IncomingToEntry.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static IncomingToEntry.Match newMutableMatch(final Transition pT, final Entry pE) {

-      return new Mutable(pT, pE);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static IncomingToEntry.Match newMatch(final Transition pT, final Entry pE) {

-      return new Immutable(pT, pE);

-    }

-    

-    private static final class Mutable extends IncomingToEntry.Match {

-      Mutable(final Transition pT, final Entry pE) {

-        super(pT, pE);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends IncomingToEntry.Match {

-      Immutable(final Transition pT, final Entry pE) {

-        super(pT, pE);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {e})

-   * pattern incomingToEntry(t : Transition, e : Entry) {

-   *    find transition(t, _, e);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see IncomingToEntry

-   * 

-   */

-  public static class Matcher extends BaseMatcher<IncomingToEntry.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static IncomingToEntry.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static IncomingToEntry.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_T = 0;

-    

-    private final static int POSITION_E = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(IncomingToEntry.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<IncomingToEntry.Match> getAllMatches(final Transition pT, final Entry pE) {

-      return rawStreamAllMatches(new Object[]{pT, pE}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<IncomingToEntry.Match> streamAllMatches(final Transition pT, final Entry pE) {

-      return rawStreamAllMatches(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<IncomingToEntry.Match> getOneArbitraryMatch(final Transition pT, final Entry pE) {

-      return rawGetOneArbitraryMatch(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Transition pT, final Entry pE) {

-      return rawHasMatch(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Transition pT, final Entry pE) {

-      return rawCountMatches(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Transition pT, final Entry pE, final Consumer<? super IncomingToEntry.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pT, pE}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public IncomingToEntry.Match newMatch(final Transition pT, final Entry pE) {

-      return IncomingToEntry.Match.newMatch(pT, pE);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Transition> rawStreamAllValuesOft(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T, parameters).map(Transition.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft(final IncomingToEntry.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft(final Entry pE) {

-      return rawStreamAllValuesOft(new Object[]{null, pE});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft(final IncomingToEntry.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft(final Entry pE) {

-      return rawStreamAllValuesOft(new Object[]{null, pE}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Entry> rawStreamAllValuesOfe(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_E, parameters).map(Entry.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe(final IncomingToEntry.Match partialMatch) {

-      return rawStreamAllValuesOfe(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe(final Transition pT) {

-      return rawStreamAllValuesOfe(new Object[]{pT, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe(final IncomingToEntry.Match partialMatch) {

-      return rawStreamAllValuesOfe(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe(final Transition pT) {

-      return rawStreamAllValuesOfe(new Object[]{pT, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected IncomingToEntry.Match tupleToMatch(final Tuple t) {

-      try {

-          return IncomingToEntry.Match.newMatch((Transition) t.get(POSITION_T), (Entry) t.get(POSITION_E));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected IncomingToEntry.Match arrayToMatch(final Object[] match) {

-      try {

-          return IncomingToEntry.Match.newMatch((Transition) match[POSITION_T], (Entry) match[POSITION_E]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected IncomingToEntry.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return IncomingToEntry.Match.newMutableMatch((Transition) match[POSITION_T], (Entry) match[POSITION_E]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<IncomingToEntry.Matcher> querySpecification() {

-      return IncomingToEntry.instance();

-    }

-  }

-  

-  private IncomingToEntry() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static IncomingToEntry instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected IncomingToEntry.Matcher instantiate(final ViatraQueryEngine engine) {

-    return IncomingToEntry.Matcher.on(engine);

-  }

-  

-  @Override

-  public IncomingToEntry.Matcher instantiate() {

-    return IncomingToEntry.Matcher.create();

-  }

-  

-  @Override

-  public IncomingToEntry.Match newEmptyMatch() {

-    return IncomingToEntry.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public IncomingToEntry.Match newMatch(final Object... parameters) {

-    return IncomingToEntry.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.IncomingToEntry (visibility: PUBLIC, simpleName: IncomingToEntry, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.IncomingToEntry, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.IncomingToEntry (visibility: PUBLIC, simpleName: IncomingToEntry, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.IncomingToEntry, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static IncomingToEntry INSTANCE = new IncomingToEntry();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static IncomingToEntry.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_t = new PParameter("t", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Transition")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_e = new PParameter("e", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Entry")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_t, parameter_e);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.incomingToEntry";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("t","e");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_t = body.getOrCreateVariableByName("t");

-          PVariable var_e = body.getOrCreateVariableByName("e");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Entry")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_t, parameter_t),

-             new ExportedParameter(body, var_e, parameter_e)

-          ));

-          //    find transition(t, _, e)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_t, var___0_, var_e), ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("e")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/MultipleTransitionFromEntry.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/MultipleTransitionFromEntry.java
deleted file mode 100644
index e4c1bac5..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/MultipleTransitionFromEntry.java
+++ /dev/null
@@ -1,827 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {e})

- *         pattern multipleTransitionFromEntry(e : Entry, t1 : Transition, t2: Transition) {

- *              Entry.outgoingTransitions(e,t1);

- *              Entry.outgoingTransitions(e,t2);

- *              t1!=t2;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class MultipleTransitionFromEntry extends BaseGeneratedEMFQuerySpecification<MultipleTransitionFromEntry.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Entry fE;

-    

-    private Transition fT1;

-    

-    private Transition fT2;

-    

-    private static List<String> parameterNames = makeImmutableList("e", "t1", "t2");

-    

-    private Match(final Entry pE, final Transition pT1, final Transition pT2) {

-      this.fE = pE;

-      this.fT1 = pT1;

-      this.fT2 = pT2;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("e".equals(parameterName)) return this.fE;

-      if ("t1".equals(parameterName)) return this.fT1;

-      if ("t2".equals(parameterName)) return this.fT2;

-      return null;

-    }

-    

-    public Entry getE() {

-      return this.fE;

-    }

-    

-    public Transition getT1() {

-      return this.fT1;

-    }

-    

-    public Transition getT2() {

-      return this.fT2;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("e".equals(parameterName) ) {

-          this.fE = (Entry) newValue;

-          return true;

-      }

-      if ("t1".equals(parameterName) ) {

-          this.fT1 = (Transition) newValue;

-          return true;

-      }

-      if ("t2".equals(parameterName) ) {

-          this.fT2 = (Transition) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setE(final Entry pE) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fE = pE;

-    }

-    

-    public void setT1(final Transition pT1) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT1 = pT1;

-    }

-    

-    public void setT2(final Transition pT2) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT2 = pT2;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return MultipleTransitionFromEntry.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fE, fT1, fT2};

-    }

-    

-    @Override

-    public MultipleTransitionFromEntry.Match toImmutable() {

-      return isMutable() ? newMatch(fE, fT1, fT2) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"e\"=" + prettyPrintValue(fE) + ", ");

-      result.append("\"t1\"=" + prettyPrintValue(fT1) + ", ");

-      result.append("\"t2\"=" + prettyPrintValue(fT2));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fE, fT1, fT2);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof MultipleTransitionFromEntry.Match)) {

-          MultipleTransitionFromEntry.Match other = (MultipleTransitionFromEntry.Match) obj;

-          return Objects.equals(fE, other.fE) && Objects.equals(fT1, other.fT1) && Objects.equals(fT2, other.fT2);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public MultipleTransitionFromEntry specification() {

-      return MultipleTransitionFromEntry.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static MultipleTransitionFromEntry.Match newEmptyMatch() {

-      return new Mutable(null, null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static MultipleTransitionFromEntry.Match newMutableMatch(final Entry pE, final Transition pT1, final Transition pT2) {

-      return new Mutable(pE, pT1, pT2);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static MultipleTransitionFromEntry.Match newMatch(final Entry pE, final Transition pT1, final Transition pT2) {

-      return new Immutable(pE, pT1, pT2);

-    }

-    

-    private static final class Mutable extends MultipleTransitionFromEntry.Match {

-      Mutable(final Entry pE, final Transition pT1, final Transition pT2) {

-        super(pE, pT1, pT2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends MultipleTransitionFromEntry.Match {

-      Immutable(final Entry pE, final Transition pT1, final Transition pT2) {

-        super(pE, pT1, pT2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {e})

-   * pattern multipleTransitionFromEntry(e : Entry, t1 : Transition, t2: Transition) {

-   *    Entry.outgoingTransitions(e,t1);

-   *    Entry.outgoingTransitions(e,t2);

-   *    t1!=t2;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see MultipleTransitionFromEntry

-   * 

-   */

-  public static class Matcher extends BaseMatcher<MultipleTransitionFromEntry.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static MultipleTransitionFromEntry.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static MultipleTransitionFromEntry.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_E = 0;

-    

-    private final static int POSITION_T1 = 1;

-    

-    private final static int POSITION_T2 = 2;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(MultipleTransitionFromEntry.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<MultipleTransitionFromEntry.Match> getAllMatches(final Entry pE, final Transition pT1, final Transition pT2) {

-      return rawStreamAllMatches(new Object[]{pE, pT1, pT2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<MultipleTransitionFromEntry.Match> streamAllMatches(final Entry pE, final Transition pT1, final Transition pT2) {

-      return rawStreamAllMatches(new Object[]{pE, pT1, pT2});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<MultipleTransitionFromEntry.Match> getOneArbitraryMatch(final Entry pE, final Transition pT1, final Transition pT2) {

-      return rawGetOneArbitraryMatch(new Object[]{pE, pT1, pT2});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Entry pE, final Transition pT1, final Transition pT2) {

-      return rawHasMatch(new Object[]{pE, pT1, pT2});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Entry pE, final Transition pT1, final Transition pT2) {

-      return rawCountMatches(new Object[]{pE, pT1, pT2});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Entry pE, final Transition pT1, final Transition pT2, final Consumer<? super MultipleTransitionFromEntry.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pE, pT1, pT2}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param pT1 the fixed value of pattern parameter t1, or null if not bound.

-     * @param pT2 the fixed value of pattern parameter t2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public MultipleTransitionFromEntry.Match newMatch(final Entry pE, final Transition pT1, final Transition pT2) {

-      return MultipleTransitionFromEntry.Match.newMatch(pE, pT1, pT2);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Entry> rawStreamAllValuesOfe(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_E, parameters).map(Entry.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe(final MultipleTransitionFromEntry.Match partialMatch) {

-      return rawStreamAllValuesOfe(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe(final Transition pT1, final Transition pT2) {

-      return rawStreamAllValuesOfe(new Object[]{null, pT1, pT2});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe(final MultipleTransitionFromEntry.Match partialMatch) {

-      return rawStreamAllValuesOfe(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe(final Transition pT1, final Transition pT2) {

-      return rawStreamAllValuesOfe(new Object[]{null, pT1, pT2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Transition> rawStreamAllValuesOft1(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T1, parameters).map(Transition.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft1() {

-      return rawStreamAllValuesOft1(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft1() {

-      return rawStreamAllValuesOft1(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft1(final MultipleTransitionFromEntry.Match partialMatch) {

-      return rawStreamAllValuesOft1(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft1(final Entry pE, final Transition pT2) {

-      return rawStreamAllValuesOft1(new Object[]{pE, null, pT2});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft1(final MultipleTransitionFromEntry.Match partialMatch) {

-      return rawStreamAllValuesOft1(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft1(final Entry pE, final Transition pT2) {

-      return rawStreamAllValuesOft1(new Object[]{pE, null, pT2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Transition> rawStreamAllValuesOft2(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T2, parameters).map(Transition.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft2() {

-      return rawStreamAllValuesOft2(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft2() {

-      return rawStreamAllValuesOft2(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft2(final MultipleTransitionFromEntry.Match partialMatch) {

-      return rawStreamAllValuesOft2(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft2(final Entry pE, final Transition pT1) {

-      return rawStreamAllValuesOft2(new Object[]{pE, pT1, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft2(final MultipleTransitionFromEntry.Match partialMatch) {

-      return rawStreamAllValuesOft2(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft2(final Entry pE, final Transition pT1) {

-      return rawStreamAllValuesOft2(new Object[]{pE, pT1, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected MultipleTransitionFromEntry.Match tupleToMatch(final Tuple t) {

-      try {

-          return MultipleTransitionFromEntry.Match.newMatch((Entry) t.get(POSITION_E), (Transition) t.get(POSITION_T1), (Transition) t.get(POSITION_T2));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected MultipleTransitionFromEntry.Match arrayToMatch(final Object[] match) {

-      try {

-          return MultipleTransitionFromEntry.Match.newMatch((Entry) match[POSITION_E], (Transition) match[POSITION_T1], (Transition) match[POSITION_T2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected MultipleTransitionFromEntry.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return MultipleTransitionFromEntry.Match.newMutableMatch((Entry) match[POSITION_E], (Transition) match[POSITION_T1], (Transition) match[POSITION_T2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<MultipleTransitionFromEntry.Matcher> querySpecification() {

-      return MultipleTransitionFromEntry.instance();

-    }

-  }

-  

-  private MultipleTransitionFromEntry() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static MultipleTransitionFromEntry instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected MultipleTransitionFromEntry.Matcher instantiate(final ViatraQueryEngine engine) {

-    return MultipleTransitionFromEntry.Matcher.on(engine);

-  }

-  

-  @Override

-  public MultipleTransitionFromEntry.Matcher instantiate() {

-    return MultipleTransitionFromEntry.Matcher.create();

-  }

-  

-  @Override

-  public MultipleTransitionFromEntry.Match newEmptyMatch() {

-    return MultipleTransitionFromEntry.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public MultipleTransitionFromEntry.Match newMatch(final Object... parameters) {

-    return MultipleTransitionFromEntry.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) parameters[1], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) parameters[2]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.MultipleTransitionFromEntry (visibility: PUBLIC, simpleName: MultipleTransitionFromEntry, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.MultipleTransitionFromEntry, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.MultipleTransitionFromEntry (visibility: PUBLIC, simpleName: MultipleTransitionFromEntry, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.MultipleTransitionFromEntry, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static MultipleTransitionFromEntry INSTANCE = new MultipleTransitionFromEntry();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static MultipleTransitionFromEntry.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_e = new PParameter("e", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Entry")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_t1 = new PParameter("t1", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Transition")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_t2 = new PParameter("t2", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Transition")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_e, parameter_t1, parameter_t2);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.multipleTransitionFromEntry";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("e","t1","t2");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_e = body.getOrCreateVariableByName("e");

-          PVariable var_t1 = body.getOrCreateVariableByName("t1");

-          PVariable var_t2 = body.getOrCreateVariableByName("t2");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Entry")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_e, parameter_e),

-             new ExportedParameter(body, var_t1, parameter_t1),

-             new ExportedParameter(body, var_t2, parameter_t2)

-          ));

-          //    Entry.outgoingTransitions(e,t1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Entry")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Vertex", "outgoingTransitions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new Equality(body, var__virtual_0_, var_t1);

-          //    Entry.outgoingTransitions(e,t2)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Entry")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Vertex", "outgoingTransitions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new Equality(body, var__virtual_1_, var_t2);

-          //    t1!=t2

-          new Inequality(body, var_t1, var_t2);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("e")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoEntryInRegion.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoEntryInRegion.java
deleted file mode 100644
index c1f7df4a..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoEntryInRegion.java
+++ /dev/null
@@ -1,550 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.EntryInRegion;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {r1})

- *         pattern noEntryInRegion(r1 : Region) {

- *              neg find entryInRegion(r1, _);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class NoEntryInRegion extends BaseGeneratedEMFQuerySpecification<NoEntryInRegion.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Region fR1;

-    

-    private static List<String> parameterNames = makeImmutableList("r1");

-    

-    private Match(final Region pR1) {

-      this.fR1 = pR1;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("r1".equals(parameterName)) return this.fR1;

-      return null;

-    }

-    

-    public Region getR1() {

-      return this.fR1;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("r1".equals(parameterName) ) {

-          this.fR1 = (Region) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setR1(final Region pR1) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fR1 = pR1;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return NoEntryInRegion.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fR1};

-    }

-    

-    @Override

-    public NoEntryInRegion.Match toImmutable() {

-      return isMutable() ? newMatch(fR1) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"r1\"=" + prettyPrintValue(fR1));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fR1);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof NoEntryInRegion.Match)) {

-          NoEntryInRegion.Match other = (NoEntryInRegion.Match) obj;

-          return Objects.equals(fR1, other.fR1);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public NoEntryInRegion specification() {

-      return NoEntryInRegion.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static NoEntryInRegion.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static NoEntryInRegion.Match newMutableMatch(final Region pR1) {

-      return new Mutable(pR1);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static NoEntryInRegion.Match newMatch(final Region pR1) {

-      return new Immutable(pR1);

-    }

-    

-    private static final class Mutable extends NoEntryInRegion.Match {

-      Mutable(final Region pR1) {

-        super(pR1);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends NoEntryInRegion.Match {

-      Immutable(final Region pR1) {

-        super(pR1);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {r1})

-   * pattern noEntryInRegion(r1 : Region) {

-   *    neg find entryInRegion(r1, _);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see NoEntryInRegion

-   * 

-   */

-  public static class Matcher extends BaseMatcher<NoEntryInRegion.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static NoEntryInRegion.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static NoEntryInRegion.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_R1 = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NoEntryInRegion.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<NoEntryInRegion.Match> getAllMatches(final Region pR1) {

-      return rawStreamAllMatches(new Object[]{pR1}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<NoEntryInRegion.Match> streamAllMatches(final Region pR1) {

-      return rawStreamAllMatches(new Object[]{pR1});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<NoEntryInRegion.Match> getOneArbitraryMatch(final Region pR1) {

-      return rawGetOneArbitraryMatch(new Object[]{pR1});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Region pR1) {

-      return rawHasMatch(new Object[]{pR1});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Region pR1) {

-      return rawCountMatches(new Object[]{pR1});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Region pR1, final Consumer<? super NoEntryInRegion.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pR1}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pR1 the fixed value of pattern parameter r1, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public NoEntryInRegion.Match newMatch(final Region pR1) {

-      return NoEntryInRegion.Match.newMatch(pR1);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Region> rawStreamAllValuesOfr1(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_R1, parameters).map(Region.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfr1() {

-      return rawStreamAllValuesOfr1(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for r1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfr1() {

-      return rawStreamAllValuesOfr1(emptyArray());

-    }

-    

-    @Override

-    protected NoEntryInRegion.Match tupleToMatch(final Tuple t) {

-      try {

-          return NoEntryInRegion.Match.newMatch((Region) t.get(POSITION_R1));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NoEntryInRegion.Match arrayToMatch(final Object[] match) {

-      try {

-          return NoEntryInRegion.Match.newMatch((Region) match[POSITION_R1]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NoEntryInRegion.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return NoEntryInRegion.Match.newMutableMatch((Region) match[POSITION_R1]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<NoEntryInRegion.Matcher> querySpecification() {

-      return NoEntryInRegion.instance();

-    }

-  }

-  

-  private NoEntryInRegion() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static NoEntryInRegion instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected NoEntryInRegion.Matcher instantiate(final ViatraQueryEngine engine) {

-    return NoEntryInRegion.Matcher.on(engine);

-  }

-  

-  @Override

-  public NoEntryInRegion.Matcher instantiate() {

-    return NoEntryInRegion.Matcher.create();

-  }

-  

-  @Override

-  public NoEntryInRegion.Match newEmptyMatch() {

-    return NoEntryInRegion.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public NoEntryInRegion.Match newMatch(final Object... parameters) {

-    return NoEntryInRegion.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoEntryInRegion (visibility: PUBLIC, simpleName: NoEntryInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoEntryInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoEntryInRegion (visibility: PUBLIC, simpleName: NoEntryInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoEntryInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static NoEntryInRegion INSTANCE = new NoEntryInRegion();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static NoEntryInRegion.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_r1 = new PParameter("r1", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Region")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_r1);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noEntryInRegion";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("r1");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_r1 = body.getOrCreateVariableByName("r1");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_r1, parameter_r1)

-          ));

-          //    neg find entryInRegion(r1, _)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var_r1, var___0_), EntryInRegion.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("r1")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoOutgoingTransitionFromEntry.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoOutgoingTransitionFromEntry.java
deleted file mode 100644
index d9a3de50..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoOutgoingTransitionFromEntry.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {e})

- *         pattern noOutgoingTransitionFromEntry(e : Entry) {

- *              neg find transition(_, e, _);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class NoOutgoingTransitionFromEntry extends BaseGeneratedEMFQuerySpecification<NoOutgoingTransitionFromEntry.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Entry fE;

-    

-    private static List<String> parameterNames = makeImmutableList("e");

-    

-    private Match(final Entry pE) {

-      this.fE = pE;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("e".equals(parameterName)) return this.fE;

-      return null;

-    }

-    

-    public Entry getE() {

-      return this.fE;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("e".equals(parameterName) ) {

-          this.fE = (Entry) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setE(final Entry pE) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fE = pE;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return NoOutgoingTransitionFromEntry.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fE};

-    }

-    

-    @Override

-    public NoOutgoingTransitionFromEntry.Match toImmutable() {

-      return isMutable() ? newMatch(fE) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"e\"=" + prettyPrintValue(fE));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fE);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof NoOutgoingTransitionFromEntry.Match)) {

-          NoOutgoingTransitionFromEntry.Match other = (NoOutgoingTransitionFromEntry.Match) obj;

-          return Objects.equals(fE, other.fE);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public NoOutgoingTransitionFromEntry specification() {

-      return NoOutgoingTransitionFromEntry.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static NoOutgoingTransitionFromEntry.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static NoOutgoingTransitionFromEntry.Match newMutableMatch(final Entry pE) {

-      return new Mutable(pE);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static NoOutgoingTransitionFromEntry.Match newMatch(final Entry pE) {

-      return new Immutable(pE);

-    }

-    

-    private static final class Mutable extends NoOutgoingTransitionFromEntry.Match {

-      Mutable(final Entry pE) {

-        super(pE);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends NoOutgoingTransitionFromEntry.Match {

-      Immutable(final Entry pE) {

-        super(pE);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {e})

-   * pattern noOutgoingTransitionFromEntry(e : Entry) {

-   *    neg find transition(_, e, _);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see NoOutgoingTransitionFromEntry

-   * 

-   */

-  public static class Matcher extends BaseMatcher<NoOutgoingTransitionFromEntry.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static NoOutgoingTransitionFromEntry.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static NoOutgoingTransitionFromEntry.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_E = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NoOutgoingTransitionFromEntry.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<NoOutgoingTransitionFromEntry.Match> getAllMatches(final Entry pE) {

-      return rawStreamAllMatches(new Object[]{pE}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<NoOutgoingTransitionFromEntry.Match> streamAllMatches(final Entry pE) {

-      return rawStreamAllMatches(new Object[]{pE});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<NoOutgoingTransitionFromEntry.Match> getOneArbitraryMatch(final Entry pE) {

-      return rawGetOneArbitraryMatch(new Object[]{pE});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Entry pE) {

-      return rawHasMatch(new Object[]{pE});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Entry pE) {

-      return rawCountMatches(new Object[]{pE});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Entry pE, final Consumer<? super NoOutgoingTransitionFromEntry.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pE}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public NoOutgoingTransitionFromEntry.Match newMatch(final Entry pE) {

-      return NoOutgoingTransitionFromEntry.Match.newMatch(pE);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Entry> rawStreamAllValuesOfe(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_E, parameters).map(Entry.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Entry> getAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Entry> streamAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray());

-    }

-    

-    @Override

-    protected NoOutgoingTransitionFromEntry.Match tupleToMatch(final Tuple t) {

-      try {

-          return NoOutgoingTransitionFromEntry.Match.newMatch((Entry) t.get(POSITION_E));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NoOutgoingTransitionFromEntry.Match arrayToMatch(final Object[] match) {

-      try {

-          return NoOutgoingTransitionFromEntry.Match.newMatch((Entry) match[POSITION_E]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NoOutgoingTransitionFromEntry.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return NoOutgoingTransitionFromEntry.Match.newMutableMatch((Entry) match[POSITION_E]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<NoOutgoingTransitionFromEntry.Matcher> querySpecification() {

-      return NoOutgoingTransitionFromEntry.instance();

-    }

-  }

-  

-  private NoOutgoingTransitionFromEntry() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static NoOutgoingTransitionFromEntry instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected NoOutgoingTransitionFromEntry.Matcher instantiate(final ViatraQueryEngine engine) {

-    return NoOutgoingTransitionFromEntry.Matcher.on(engine);

-  }

-  

-  @Override

-  public NoOutgoingTransitionFromEntry.Matcher instantiate() {

-    return NoOutgoingTransitionFromEntry.Matcher.create();

-  }

-  

-  @Override

-  public NoOutgoingTransitionFromEntry.Match newEmptyMatch() {

-    return NoOutgoingTransitionFromEntry.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public NoOutgoingTransitionFromEntry.Match newMatch(final Object... parameters) {

-    return NoOutgoingTransitionFromEntry.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoOutgoingTransitionFromEntry (visibility: PUBLIC, simpleName: NoOutgoingTransitionFromEntry, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoOutgoingTransitionFromEntry, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoOutgoingTransitionFromEntry (visibility: PUBLIC, simpleName: NoOutgoingTransitionFromEntry, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoOutgoingTransitionFromEntry, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static NoOutgoingTransitionFromEntry INSTANCE = new NoOutgoingTransitionFromEntry();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static NoOutgoingTransitionFromEntry.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_e = new PParameter("e", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Entry", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Entry")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_e);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noOutgoingTransitionFromEntry";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("e");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_e = body.getOrCreateVariableByName("e");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Entry")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_e, parameter_e)

-          ));

-          //    neg find transition(_, e, _)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_e, var___1_), Transition.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("e")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoStateInRegion.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoStateInRegion.java
deleted file mode 100644
index 841339ae..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NoStateInRegion.java
+++ /dev/null
@@ -1,558 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         /////////

- *         // State vs Region

- *         /////////

- *         

- *         {@literal @}Constraint(severity="error", message="error", key = {region})

- *         pattern noStateInRegion(region: Region) {

- *              neg find StateInRegion(region,_);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class NoStateInRegion extends BaseGeneratedEMFQuerySpecification<NoStateInRegion.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Region fRegion;

-    

-    private static List<String> parameterNames = makeImmutableList("region");

-    

-    private Match(final Region pRegion) {

-      this.fRegion = pRegion;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("region".equals(parameterName)) return this.fRegion;

-      return null;

-    }

-    

-    public Region getRegion() {

-      return this.fRegion;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("region".equals(parameterName) ) {

-          this.fRegion = (Region) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setRegion(final Region pRegion) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fRegion = pRegion;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return NoStateInRegion.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fRegion};

-    }

-    

-    @Override

-    public NoStateInRegion.Match toImmutable() {

-      return isMutable() ? newMatch(fRegion) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"region\"=" + prettyPrintValue(fRegion));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fRegion);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof NoStateInRegion.Match)) {

-          NoStateInRegion.Match other = (NoStateInRegion.Match) obj;

-          return Objects.equals(fRegion, other.fRegion);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public NoStateInRegion specification() {

-      return NoStateInRegion.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static NoStateInRegion.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static NoStateInRegion.Match newMutableMatch(final Region pRegion) {

-      return new Mutable(pRegion);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static NoStateInRegion.Match newMatch(final Region pRegion) {

-      return new Immutable(pRegion);

-    }

-    

-    private static final class Mutable extends NoStateInRegion.Match {

-      Mutable(final Region pRegion) {

-        super(pRegion);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends NoStateInRegion.Match {

-      Immutable(final Region pRegion) {

-        super(pRegion);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * /////////

-   * // State vs Region

-   * /////////

-   * 

-   * {@literal @}Constraint(severity="error", message="error", key = {region})

-   * pattern noStateInRegion(region: Region) {

-   *    neg find StateInRegion(region,_);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see NoStateInRegion

-   * 

-   */

-  public static class Matcher extends BaseMatcher<NoStateInRegion.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static NoStateInRegion.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static NoStateInRegion.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_REGION = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NoStateInRegion.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<NoStateInRegion.Match> getAllMatches(final Region pRegion) {

-      return rawStreamAllMatches(new Object[]{pRegion}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<NoStateInRegion.Match> streamAllMatches(final Region pRegion) {

-      return rawStreamAllMatches(new Object[]{pRegion});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<NoStateInRegion.Match> getOneArbitraryMatch(final Region pRegion) {

-      return rawGetOneArbitraryMatch(new Object[]{pRegion});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Region pRegion) {

-      return rawHasMatch(new Object[]{pRegion});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Region pRegion) {

-      return rawCountMatches(new Object[]{pRegion});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Region pRegion, final Consumer<? super NoStateInRegion.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pRegion}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public NoStateInRegion.Match newMatch(final Region pRegion) {

-      return NoStateInRegion.Match.newMatch(pRegion);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Region> rawStreamAllValuesOfregion(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_REGION, parameters).map(Region.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfregion() {

-      return rawStreamAllValuesOfregion(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfregion() {

-      return rawStreamAllValuesOfregion(emptyArray());

-    }

-    

-    @Override

-    protected NoStateInRegion.Match tupleToMatch(final Tuple t) {

-      try {

-          return NoStateInRegion.Match.newMatch((Region) t.get(POSITION_REGION));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NoStateInRegion.Match arrayToMatch(final Object[] match) {

-      try {

-          return NoStateInRegion.Match.newMatch((Region) match[POSITION_REGION]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NoStateInRegion.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return NoStateInRegion.Match.newMutableMatch((Region) match[POSITION_REGION]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<NoStateInRegion.Matcher> querySpecification() {

-      return NoStateInRegion.instance();

-    }

-  }

-  

-  private NoStateInRegion() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static NoStateInRegion instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected NoStateInRegion.Matcher instantiate(final ViatraQueryEngine engine) {

-    return NoStateInRegion.Matcher.on(engine);

-  }

-  

-  @Override

-  public NoStateInRegion.Matcher instantiate() {

-    return NoStateInRegion.Matcher.create();

-  }

-  

-  @Override

-  public NoStateInRegion.Match newEmptyMatch() {

-    return NoStateInRegion.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public NoStateInRegion.Match newMatch(final Object... parameters) {

-    return NoStateInRegion.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoStateInRegion (visibility: PUBLIC, simpleName: NoStateInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoStateInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoStateInRegion (visibility: PUBLIC, simpleName: NoStateInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NoStateInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static NoStateInRegion INSTANCE = new NoStateInRegion();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static NoStateInRegion.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_region = new PParameter("region", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Region")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_region);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.noStateInRegion";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("region");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_region = body.getOrCreateVariableByName("region");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_region), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_region, parameter_region)

-          ));

-          //    neg find StateInRegion(region,_)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var_region, var___0_), StateInRegion.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("region")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NotSynchronizingStates.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NotSynchronizingStates.java
deleted file mode 100644
index b9a60ca9..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/NotSynchronizingStates.java
+++ /dev/null
@@ -1,554 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleIncomingTrainsition;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleOutgoingTrainsition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {s})

- *         pattern notSynchronizingStates(s : Synchronization) {

- *              neg find hasMultipleOutgoingTrainsition(s);

- *              neg find hasMultipleIncomingTrainsition(s);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class NotSynchronizingStates extends BaseGeneratedEMFQuerySpecification<NotSynchronizingStates.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.notSynchronizingStates pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS;

-    

-    private static List<String> parameterNames = makeImmutableList("s");

-    

-    private Match(final Synchronization pS) {

-      this.fS = pS;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s".equals(parameterName)) return this.fS;

-      return null;

-    }

-    

-    public Synchronization getS() {

-      return this.fS;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s".equals(parameterName) ) {

-          this.fS = (Synchronization) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS(final Synchronization pS) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS = pS;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.notSynchronizingStates";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return NotSynchronizingStates.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS};

-    }

-    

-    @Override

-    public NotSynchronizingStates.Match toImmutable() {

-      return isMutable() ? newMatch(fS) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s\"=" + prettyPrintValue(fS));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof NotSynchronizingStates.Match)) {

-          NotSynchronizingStates.Match other = (NotSynchronizingStates.Match) obj;

-          return Objects.equals(fS, other.fS);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public NotSynchronizingStates specification() {

-      return NotSynchronizingStates.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static NotSynchronizingStates.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static NotSynchronizingStates.Match newMutableMatch(final Synchronization pS) {

-      return new Mutable(pS);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static NotSynchronizingStates.Match newMatch(final Synchronization pS) {

-      return new Immutable(pS);

-    }

-    

-    private static final class Mutable extends NotSynchronizingStates.Match {

-      Mutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends NotSynchronizingStates.Match {

-      Immutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.notSynchronizingStates pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {s})

-   * pattern notSynchronizingStates(s : Synchronization) {

-   *    neg find hasMultipleOutgoingTrainsition(s);

-   *    neg find hasMultipleIncomingTrainsition(s);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see NotSynchronizingStates

-   * 

-   */

-  public static class Matcher extends BaseMatcher<NotSynchronizingStates.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static NotSynchronizingStates.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static NotSynchronizingStates.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(NotSynchronizingStates.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<NotSynchronizingStates.Match> getAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<NotSynchronizingStates.Match> streamAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<NotSynchronizingStates.Match> getOneArbitraryMatch(final Synchronization pS) {

-      return rawGetOneArbitraryMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS) {

-      return rawHasMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS) {

-      return rawCountMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS, final Consumer<? super NotSynchronizingStates.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public NotSynchronizingStates.Match newMatch(final Synchronization pS) {

-      return NotSynchronizingStates.Match.newMatch(pS);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray());

-    }

-    

-    @Override

-    protected NotSynchronizingStates.Match tupleToMatch(final Tuple t) {

-      try {

-          return NotSynchronizingStates.Match.newMatch((Synchronization) t.get(POSITION_S));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NotSynchronizingStates.Match arrayToMatch(final Object[] match) {

-      try {

-          return NotSynchronizingStates.Match.newMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected NotSynchronizingStates.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return NotSynchronizingStates.Match.newMutableMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<NotSynchronizingStates.Matcher> querySpecification() {

-      return NotSynchronizingStates.instance();

-    }

-  }

-  

-  private NotSynchronizingStates() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static NotSynchronizingStates instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected NotSynchronizingStates.Matcher instantiate(final ViatraQueryEngine engine) {

-    return NotSynchronizingStates.Matcher.on(engine);

-  }

-  

-  @Override

-  public NotSynchronizingStates.Matcher instantiate() {

-    return NotSynchronizingStates.Matcher.create();

-  }

-  

-  @Override

-  public NotSynchronizingStates.Match newEmptyMatch() {

-    return NotSynchronizingStates.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public NotSynchronizingStates.Match newMatch(final Object... parameters) {

-    return NotSynchronizingStates.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NotSynchronizingStates (visibility: PUBLIC, simpleName: NotSynchronizingStates, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NotSynchronizingStates, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NotSynchronizingStates (visibility: PUBLIC, simpleName: NotSynchronizingStates, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.NotSynchronizingStates, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static NotSynchronizingStates INSTANCE = new NotSynchronizingStates();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static NotSynchronizingStates.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s = new PParameter("s", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.notSynchronizingStates";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s)

-          ));

-          //    neg find hasMultipleOutgoingTrainsition(s)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var_s), HasMultipleOutgoingTrainsition.instance().getInternalQueryRepresentation());

-          //    neg find hasMultipleIncomingTrainsition(s)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var_s), HasMultipleIncomingTrainsition.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/OutgoingFromExit.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/OutgoingFromExit.java
deleted file mode 100644
index 10f0e056..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/OutgoingFromExit.java
+++ /dev/null
@@ -1,715 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Exit;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         /////////

- *         // Exit

- *         /////////

- *         

- *         {@literal @}Constraint(severity="error", message="error", key = {e})

- *         pattern outgoingFromExit(t : Transition, e : Exit) {

- *              Exit.outgoingTransitions(e,t);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class OutgoingFromExit extends BaseGeneratedEMFQuerySpecification<OutgoingFromExit.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromExit pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Transition fT;

-    

-    private Exit fE;

-    

-    private static List<String> parameterNames = makeImmutableList("t", "e");

-    

-    private Match(final Transition pT, final Exit pE) {

-      this.fT = pT;

-      this.fE = pE;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("t".equals(parameterName)) return this.fT;

-      if ("e".equals(parameterName)) return this.fE;

-      return null;

-    }

-    

-    public Transition getT() {

-      return this.fT;

-    }

-    

-    public Exit getE() {

-      return this.fE;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("t".equals(parameterName) ) {

-          this.fT = (Transition) newValue;

-          return true;

-      }

-      if ("e".equals(parameterName) ) {

-          this.fE = (Exit) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setT(final Transition pT) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT = pT;

-    }

-    

-    public void setE(final Exit pE) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fE = pE;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromExit";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return OutgoingFromExit.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fT, fE};

-    }

-    

-    @Override

-    public OutgoingFromExit.Match toImmutable() {

-      return isMutable() ? newMatch(fT, fE) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"t\"=" + prettyPrintValue(fT) + ", ");

-      result.append("\"e\"=" + prettyPrintValue(fE));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fT, fE);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof OutgoingFromExit.Match)) {

-          OutgoingFromExit.Match other = (OutgoingFromExit.Match) obj;

-          return Objects.equals(fT, other.fT) && Objects.equals(fE, other.fE);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public OutgoingFromExit specification() {

-      return OutgoingFromExit.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static OutgoingFromExit.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static OutgoingFromExit.Match newMutableMatch(final Transition pT, final Exit pE) {

-      return new Mutable(pT, pE);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static OutgoingFromExit.Match newMatch(final Transition pT, final Exit pE) {

-      return new Immutable(pT, pE);

-    }

-    

-    private static final class Mutable extends OutgoingFromExit.Match {

-      Mutable(final Transition pT, final Exit pE) {

-        super(pT, pE);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends OutgoingFromExit.Match {

-      Immutable(final Transition pT, final Exit pE) {

-        super(pT, pE);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromExit pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * /////////

-   * // Exit

-   * /////////

-   * 

-   * {@literal @}Constraint(severity="error", message="error", key = {e})

-   * pattern outgoingFromExit(t : Transition, e : Exit) {

-   *    Exit.outgoingTransitions(e,t);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see OutgoingFromExit

-   * 

-   */

-  public static class Matcher extends BaseMatcher<OutgoingFromExit.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static OutgoingFromExit.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static OutgoingFromExit.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_T = 0;

-    

-    private final static int POSITION_E = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(OutgoingFromExit.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<OutgoingFromExit.Match> getAllMatches(final Transition pT, final Exit pE) {

-      return rawStreamAllMatches(new Object[]{pT, pE}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<OutgoingFromExit.Match> streamAllMatches(final Transition pT, final Exit pE) {

-      return rawStreamAllMatches(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<OutgoingFromExit.Match> getOneArbitraryMatch(final Transition pT, final Exit pE) {

-      return rawGetOneArbitraryMatch(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Transition pT, final Exit pE) {

-      return rawHasMatch(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Transition pT, final Exit pE) {

-      return rawCountMatches(new Object[]{pT, pE});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Transition pT, final Exit pE, final Consumer<? super OutgoingFromExit.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pT, pE}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pE the fixed value of pattern parameter e, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public OutgoingFromExit.Match newMatch(final Transition pT, final Exit pE) {

-      return OutgoingFromExit.Match.newMatch(pT, pE);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Transition> rawStreamAllValuesOft(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T, parameters).map(Transition.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft(final OutgoingFromExit.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft(final Exit pE) {

-      return rawStreamAllValuesOft(new Object[]{null, pE});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft(final OutgoingFromExit.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft(final Exit pE) {

-      return rawStreamAllValuesOft(new Object[]{null, pE}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Exit> rawStreamAllValuesOfe(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_E, parameters).map(Exit.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Exit> getAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Exit> streamAllValuesOfe() {

-      return rawStreamAllValuesOfe(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Exit> streamAllValuesOfe(final OutgoingFromExit.Match partialMatch) {

-      return rawStreamAllValuesOfe(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Exit> streamAllValuesOfe(final Transition pT) {

-      return rawStreamAllValuesOfe(new Object[]{pT, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Exit> getAllValuesOfe(final OutgoingFromExit.Match partialMatch) {

-      return rawStreamAllValuesOfe(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for e.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Exit> getAllValuesOfe(final Transition pT) {

-      return rawStreamAllValuesOfe(new Object[]{pT, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected OutgoingFromExit.Match tupleToMatch(final Tuple t) {

-      try {

-          return OutgoingFromExit.Match.newMatch((Transition) t.get(POSITION_T), (Exit) t.get(POSITION_E));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected OutgoingFromExit.Match arrayToMatch(final Object[] match) {

-      try {

-          return OutgoingFromExit.Match.newMatch((Transition) match[POSITION_T], (Exit) match[POSITION_E]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected OutgoingFromExit.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return OutgoingFromExit.Match.newMutableMatch((Transition) match[POSITION_T], (Exit) match[POSITION_E]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<OutgoingFromExit.Matcher> querySpecification() {

-      return OutgoingFromExit.instance();

-    }

-  }

-  

-  private OutgoingFromExit() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static OutgoingFromExit instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected OutgoingFromExit.Matcher instantiate(final ViatraQueryEngine engine) {

-    return OutgoingFromExit.Matcher.on(engine);

-  }

-  

-  @Override

-  public OutgoingFromExit.Matcher instantiate() {

-    return OutgoingFromExit.Matcher.create();

-  }

-  

-  @Override

-  public OutgoingFromExit.Match newEmptyMatch() {

-    return OutgoingFromExit.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public OutgoingFromExit.Match newMatch(final Object... parameters) {

-    return OutgoingFromExit.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Exit) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromExit (visibility: PUBLIC, simpleName: OutgoingFromExit, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromExit, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromExit (visibility: PUBLIC, simpleName: OutgoingFromExit, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromExit, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static OutgoingFromExit INSTANCE = new OutgoingFromExit();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static OutgoingFromExit.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_t = new PParameter("t", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Transition")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_e = new PParameter("e", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Exit", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Exit")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_t, parameter_e);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromExit";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("t","e");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_t = body.getOrCreateVariableByName("t");

-          PVariable var_e = body.getOrCreateVariableByName("e");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Exit")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_t, parameter_t),

-             new ExportedParameter(body, var_e, parameter_e)

-          ));

-          //    Exit.outgoingTransitions(e,t)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Exit")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_e, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Vertex", "outgoingTransitions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new Equality(body, var__virtual_0_, var_t);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("e")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/OutgoingFromFinal.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/OutgoingFromFinal.java
deleted file mode 100644
index fbac352b..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/OutgoingFromFinal.java
+++ /dev/null
@@ -1,715 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.FinalState;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         /////////

- *         // Final

- *         /////////

- *         

- *         {@literal @}Constraint(severity="error", message="error", key = {f})

- *         pattern outgoingFromFinal(t : Transition, f : FinalState) {

- *              FinalState.outgoingTransitions(f,t);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class OutgoingFromFinal extends BaseGeneratedEMFQuerySpecification<OutgoingFromFinal.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromFinal pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Transition fT;

-    

-    private FinalState fF;

-    

-    private static List<String> parameterNames = makeImmutableList("t", "f");

-    

-    private Match(final Transition pT, final FinalState pF) {

-      this.fT = pT;

-      this.fF = pF;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("t".equals(parameterName)) return this.fT;

-      if ("f".equals(parameterName)) return this.fF;

-      return null;

-    }

-    

-    public Transition getT() {

-      return this.fT;

-    }

-    

-    public FinalState getF() {

-      return this.fF;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("t".equals(parameterName) ) {

-          this.fT = (Transition) newValue;

-          return true;

-      }

-      if ("f".equals(parameterName) ) {

-          this.fF = (FinalState) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setT(final Transition pT) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT = pT;

-    }

-    

-    public void setF(final FinalState pF) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fF = pF;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromFinal";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return OutgoingFromFinal.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fT, fF};

-    }

-    

-    @Override

-    public OutgoingFromFinal.Match toImmutable() {

-      return isMutable() ? newMatch(fT, fF) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"t\"=" + prettyPrintValue(fT) + ", ");

-      result.append("\"f\"=" + prettyPrintValue(fF));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fT, fF);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof OutgoingFromFinal.Match)) {

-          OutgoingFromFinal.Match other = (OutgoingFromFinal.Match) obj;

-          return Objects.equals(fT, other.fT) && Objects.equals(fF, other.fF);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public OutgoingFromFinal specification() {

-      return OutgoingFromFinal.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static OutgoingFromFinal.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static OutgoingFromFinal.Match newMutableMatch(final Transition pT, final FinalState pF) {

-      return new Mutable(pT, pF);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static OutgoingFromFinal.Match newMatch(final Transition pT, final FinalState pF) {

-      return new Immutable(pT, pF);

-    }

-    

-    private static final class Mutable extends OutgoingFromFinal.Match {

-      Mutable(final Transition pT, final FinalState pF) {

-        super(pT, pF);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends OutgoingFromFinal.Match {

-      Immutable(final Transition pT, final FinalState pF) {

-        super(pT, pF);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromFinal pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * /////////

-   * // Final

-   * /////////

-   * 

-   * {@literal @}Constraint(severity="error", message="error", key = {f})

-   * pattern outgoingFromFinal(t : Transition, f : FinalState) {

-   *    FinalState.outgoingTransitions(f,t);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see OutgoingFromFinal

-   * 

-   */

-  public static class Matcher extends BaseMatcher<OutgoingFromFinal.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static OutgoingFromFinal.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static OutgoingFromFinal.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_T = 0;

-    

-    private final static int POSITION_F = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(OutgoingFromFinal.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<OutgoingFromFinal.Match> getAllMatches(final Transition pT, final FinalState pF) {

-      return rawStreamAllMatches(new Object[]{pT, pF}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<OutgoingFromFinal.Match> streamAllMatches(final Transition pT, final FinalState pF) {

-      return rawStreamAllMatches(new Object[]{pT, pF});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<OutgoingFromFinal.Match> getOneArbitraryMatch(final Transition pT, final FinalState pF) {

-      return rawGetOneArbitraryMatch(new Object[]{pT, pF});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Transition pT, final FinalState pF) {

-      return rawHasMatch(new Object[]{pT, pF});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Transition pT, final FinalState pF) {

-      return rawCountMatches(new Object[]{pT, pF});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Transition pT, final FinalState pF, final Consumer<? super OutgoingFromFinal.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pT, pF}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pF the fixed value of pattern parameter f, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public OutgoingFromFinal.Match newMatch(final Transition pT, final FinalState pF) {

-      return OutgoingFromFinal.Match.newMatch(pT, pF);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Transition> rawStreamAllValuesOft(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T, parameters).map(Transition.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft(final OutgoingFromFinal.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Transition> streamAllValuesOft(final FinalState pF) {

-      return rawStreamAllValuesOft(new Object[]{null, pF});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft(final OutgoingFromFinal.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Transition> getAllValuesOft(final FinalState pF) {

-      return rawStreamAllValuesOft(new Object[]{null, pF}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for f.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<FinalState> rawStreamAllValuesOff(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_F, parameters).map(FinalState.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for f.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FinalState> getAllValuesOff() {

-      return rawStreamAllValuesOff(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for f.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FinalState> streamAllValuesOff() {

-      return rawStreamAllValuesOff(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for f.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FinalState> streamAllValuesOff(final OutgoingFromFinal.Match partialMatch) {

-      return rawStreamAllValuesOff(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for f.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<FinalState> streamAllValuesOff(final Transition pT) {

-      return rawStreamAllValuesOff(new Object[]{pT, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for f.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FinalState> getAllValuesOff(final OutgoingFromFinal.Match partialMatch) {

-      return rawStreamAllValuesOff(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for f.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<FinalState> getAllValuesOff(final Transition pT) {

-      return rawStreamAllValuesOff(new Object[]{pT, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected OutgoingFromFinal.Match tupleToMatch(final Tuple t) {

-      try {

-          return OutgoingFromFinal.Match.newMatch((Transition) t.get(POSITION_T), (FinalState) t.get(POSITION_F));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected OutgoingFromFinal.Match arrayToMatch(final Object[] match) {

-      try {

-          return OutgoingFromFinal.Match.newMatch((Transition) match[POSITION_T], (FinalState) match[POSITION_F]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected OutgoingFromFinal.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return OutgoingFromFinal.Match.newMutableMatch((Transition) match[POSITION_T], (FinalState) match[POSITION_F]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<OutgoingFromFinal.Matcher> querySpecification() {

-      return OutgoingFromFinal.instance();

-    }

-  }

-  

-  private OutgoingFromFinal() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static OutgoingFromFinal instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected OutgoingFromFinal.Matcher instantiate(final ViatraQueryEngine engine) {

-    return OutgoingFromFinal.Matcher.on(engine);

-  }

-  

-  @Override

-  public OutgoingFromFinal.Matcher instantiate() {

-    return OutgoingFromFinal.Matcher.create();

-  }

-  

-  @Override

-  public OutgoingFromFinal.Match newEmptyMatch() {

-    return OutgoingFromFinal.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public OutgoingFromFinal.Match newMatch(final Object... parameters) {

-    return OutgoingFromFinal.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.FinalState) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromFinal (visibility: PUBLIC, simpleName: OutgoingFromFinal, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromFinal, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromFinal (visibility: PUBLIC, simpleName: OutgoingFromFinal, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.OutgoingFromFinal, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static OutgoingFromFinal INSTANCE = new OutgoingFromFinal();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static OutgoingFromFinal.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_t = new PParameter("t", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Transition")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_f = new PParameter("f", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.FinalState", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "FinalState")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_t, parameter_f);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.outgoingFromFinal";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("t","f");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_t = body.getOrCreateVariableByName("t");

-          PVariable var_f = body.getOrCreateVariableByName("f");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_f), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "FinalState")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_t, parameter_t),

-             new ExportedParameter(body, var_f, parameter_f)

-          ));

-          //    FinalState.outgoingTransitions(f,t)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_f), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "FinalState")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_f, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Vertex", "outgoingTransitions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new Equality(body, var__virtual_0_, var_t);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("f")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/StateInRegion.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/StateInRegion.java
deleted file mode 100644
index 0d1fd0e6..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/StateInRegion.java
+++ /dev/null
@@ -1,694 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.State;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         pattern StateInRegion(region: Region, state: State) {

- *              Region.vertices(region,state);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class StateInRegion extends BaseGeneratedEMFQuerySpecification<StateInRegion.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Region fRegion;

-    

-    private State fState;

-    

-    private static List<String> parameterNames = makeImmutableList("region", "state");

-    

-    private Match(final Region pRegion, final State pState) {

-      this.fRegion = pRegion;

-      this.fState = pState;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("region".equals(parameterName)) return this.fRegion;

-      if ("state".equals(parameterName)) return this.fState;

-      return null;

-    }

-    

-    public Region getRegion() {

-      return this.fRegion;

-    }

-    

-    public State getState() {

-      return this.fState;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("region".equals(parameterName) ) {

-          this.fRegion = (Region) newValue;

-          return true;

-      }

-      if ("state".equals(parameterName) ) {

-          this.fState = (State) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setRegion(final Region pRegion) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fRegion = pRegion;

-    }

-    

-    public void setState(final State pState) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fState = pState;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return StateInRegion.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fRegion, fState};

-    }

-    

-    @Override

-    public StateInRegion.Match toImmutable() {

-      return isMutable() ? newMatch(fRegion, fState) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"region\"=" + prettyPrintValue(fRegion) + ", ");

-      result.append("\"state\"=" + prettyPrintValue(fState));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fRegion, fState);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof StateInRegion.Match)) {

-          StateInRegion.Match other = (StateInRegion.Match) obj;

-          return Objects.equals(fRegion, other.fRegion) && Objects.equals(fState, other.fState);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public StateInRegion specification() {

-      return StateInRegion.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static StateInRegion.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static StateInRegion.Match newMutableMatch(final Region pRegion, final State pState) {

-      return new Mutable(pRegion, pState);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static StateInRegion.Match newMatch(final Region pRegion, final State pState) {

-      return new Immutable(pRegion, pState);

-    }

-    

-    private static final class Mutable extends StateInRegion.Match {

-      Mutable(final Region pRegion, final State pState) {

-        super(pRegion, pState);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends StateInRegion.Match {

-      Immutable(final Region pRegion, final State pState) {

-        super(pRegion, pState);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * pattern StateInRegion(region: Region, state: State) {

-   *    Region.vertices(region,state);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see StateInRegion

-   * 

-   */

-  public static class Matcher extends BaseMatcher<StateInRegion.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static StateInRegion.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static StateInRegion.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_REGION = 0;

-    

-    private final static int POSITION_STATE = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(StateInRegion.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<StateInRegion.Match> getAllMatches(final Region pRegion, final State pState) {

-      return rawStreamAllMatches(new Object[]{pRegion, pState}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<StateInRegion.Match> streamAllMatches(final Region pRegion, final State pState) {

-      return rawStreamAllMatches(new Object[]{pRegion, pState});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<StateInRegion.Match> getOneArbitraryMatch(final Region pRegion, final State pState) {

-      return rawGetOneArbitraryMatch(new Object[]{pRegion, pState});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Region pRegion, final State pState) {

-      return rawHasMatch(new Object[]{pRegion, pState});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Region pRegion, final State pState) {

-      return rawCountMatches(new Object[]{pRegion, pState});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Region pRegion, final State pState, final Consumer<? super StateInRegion.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pRegion, pState}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pRegion the fixed value of pattern parameter region, or null if not bound.

-     * @param pState the fixed value of pattern parameter state, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public StateInRegion.Match newMatch(final Region pRegion, final State pState) {

-      return StateInRegion.Match.newMatch(pRegion, pState);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Region> rawStreamAllValuesOfregion(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_REGION, parameters).map(Region.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfregion() {

-      return rawStreamAllValuesOfregion(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfregion() {

-      return rawStreamAllValuesOfregion(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfregion(final StateInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfregion(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Region> streamAllValuesOfregion(final State pState) {

-      return rawStreamAllValuesOfregion(new Object[]{null, pState});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfregion(final StateInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfregion(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for region.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Region> getAllValuesOfregion(final State pState) {

-      return rawStreamAllValuesOfregion(new Object[]{null, pState}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for state.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<State> rawStreamAllValuesOfstate(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_STATE, parameters).map(State.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for state.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<State> getAllValuesOfstate() {

-      return rawStreamAllValuesOfstate(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for state.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<State> streamAllValuesOfstate() {

-      return rawStreamAllValuesOfstate(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for state.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<State> streamAllValuesOfstate(final StateInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfstate(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for state.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<State> streamAllValuesOfstate(final Region pRegion) {

-      return rawStreamAllValuesOfstate(new Object[]{pRegion, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for state.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<State> getAllValuesOfstate(final StateInRegion.Match partialMatch) {

-      return rawStreamAllValuesOfstate(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for state.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<State> getAllValuesOfstate(final Region pRegion) {

-      return rawStreamAllValuesOfstate(new Object[]{pRegion, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected StateInRegion.Match tupleToMatch(final Tuple t) {

-      try {

-          return StateInRegion.Match.newMatch((Region) t.get(POSITION_REGION), (State) t.get(POSITION_STATE));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected StateInRegion.Match arrayToMatch(final Object[] match) {

-      try {

-          return StateInRegion.Match.newMatch((Region) match[POSITION_REGION], (State) match[POSITION_STATE]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected StateInRegion.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return StateInRegion.Match.newMutableMatch((Region) match[POSITION_REGION], (State) match[POSITION_STATE]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<StateInRegion.Matcher> querySpecification() {

-      return StateInRegion.instance();

-    }

-  }

-  

-  private StateInRegion() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static StateInRegion instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected StateInRegion.Matcher instantiate(final ViatraQueryEngine engine) {

-    return StateInRegion.Matcher.on(engine);

-  }

-  

-  @Override

-  public StateInRegion.Matcher instantiate() {

-    return StateInRegion.Matcher.create();

-  }

-  

-  @Override

-  public StateInRegion.Match newEmptyMatch() {

-    return StateInRegion.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public StateInRegion.Match newMatch(final Object... parameters) {

-    return StateInRegion.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.State) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion (visibility: PUBLIC, simpleName: StateInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion (visibility: PUBLIC, simpleName: StateInRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static StateInRegion INSTANCE = new StateInRegion();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static StateInRegion.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_region = new PParameter("region", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Region", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Region")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_state = new PParameter("state", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.State", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "State")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_region, parameter_state);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.StateInRegion";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("region","state");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_region = body.getOrCreateVariableByName("region");

-          PVariable var_state = body.getOrCreateVariableByName("state");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_region), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_state), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "State")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_region, parameter_region),

-             new ExportedParameter(body, var_state, parameter_state)

-          ));

-          //    Region.vertices(region,state)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_region), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_region, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_0_, var_state);

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchHasNoIncoming.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchHasNoIncoming.java
deleted file mode 100644
index d59ab2d9..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchHasNoIncoming.java
+++ /dev/null
@@ -1,551 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {s})

- *         pattern synchHasNoIncoming(s : Synchronization) {

- *              neg find transition(_, _, s);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class SynchHasNoIncoming extends BaseGeneratedEMFQuerySpecification<SynchHasNoIncoming.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoIncoming pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS;

-    

-    private static List<String> parameterNames = makeImmutableList("s");

-    

-    private Match(final Synchronization pS) {

-      this.fS = pS;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s".equals(parameterName)) return this.fS;

-      return null;

-    }

-    

-    public Synchronization getS() {

-      return this.fS;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s".equals(parameterName) ) {

-          this.fS = (Synchronization) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS(final Synchronization pS) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS = pS;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoIncoming";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return SynchHasNoIncoming.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS};

-    }

-    

-    @Override

-    public SynchHasNoIncoming.Match toImmutable() {

-      return isMutable() ? newMatch(fS) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s\"=" + prettyPrintValue(fS));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof SynchHasNoIncoming.Match)) {

-          SynchHasNoIncoming.Match other = (SynchHasNoIncoming.Match) obj;

-          return Objects.equals(fS, other.fS);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public SynchHasNoIncoming specification() {

-      return SynchHasNoIncoming.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static SynchHasNoIncoming.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static SynchHasNoIncoming.Match newMutableMatch(final Synchronization pS) {

-      return new Mutable(pS);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static SynchHasNoIncoming.Match newMatch(final Synchronization pS) {

-      return new Immutable(pS);

-    }

-    

-    private static final class Mutable extends SynchHasNoIncoming.Match {

-      Mutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends SynchHasNoIncoming.Match {

-      Immutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoIncoming pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {s})

-   * pattern synchHasNoIncoming(s : Synchronization) {

-   *    neg find transition(_, _, s);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see SynchHasNoIncoming

-   * 

-   */

-  public static class Matcher extends BaseMatcher<SynchHasNoIncoming.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static SynchHasNoIncoming.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static SynchHasNoIncoming.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SynchHasNoIncoming.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<SynchHasNoIncoming.Match> getAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<SynchHasNoIncoming.Match> streamAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<SynchHasNoIncoming.Match> getOneArbitraryMatch(final Synchronization pS) {

-      return rawGetOneArbitraryMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS) {

-      return rawHasMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS) {

-      return rawCountMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS, final Consumer<? super SynchHasNoIncoming.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public SynchHasNoIncoming.Match newMatch(final Synchronization pS) {

-      return SynchHasNoIncoming.Match.newMatch(pS);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray());

-    }

-    

-    @Override

-    protected SynchHasNoIncoming.Match tupleToMatch(final Tuple t) {

-      try {

-          return SynchHasNoIncoming.Match.newMatch((Synchronization) t.get(POSITION_S));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchHasNoIncoming.Match arrayToMatch(final Object[] match) {

-      try {

-          return SynchHasNoIncoming.Match.newMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchHasNoIncoming.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return SynchHasNoIncoming.Match.newMutableMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<SynchHasNoIncoming.Matcher> querySpecification() {

-      return SynchHasNoIncoming.instance();

-    }

-  }

-  

-  private SynchHasNoIncoming() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static SynchHasNoIncoming instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected SynchHasNoIncoming.Matcher instantiate(final ViatraQueryEngine engine) {

-    return SynchHasNoIncoming.Matcher.on(engine);

-  }

-  

-  @Override

-  public SynchHasNoIncoming.Matcher instantiate() {

-    return SynchHasNoIncoming.Matcher.create();

-  }

-  

-  @Override

-  public SynchHasNoIncoming.Match newEmptyMatch() {

-    return SynchHasNoIncoming.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public SynchHasNoIncoming.Match newMatch(final Object... parameters) {

-    return SynchHasNoIncoming.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoIncoming (visibility: PUBLIC, simpleName: SynchHasNoIncoming, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoIncoming, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoIncoming (visibility: PUBLIC, simpleName: SynchHasNoIncoming, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoIncoming, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static SynchHasNoIncoming INSTANCE = new SynchHasNoIncoming();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static SynchHasNoIncoming.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s = new PParameter("s", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoIncoming";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s)

-          ));

-          //    neg find transition(_, _, s)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var___1_, var_s), Transition.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchHasNoOutgoing.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchHasNoOutgoing.java
deleted file mode 100644
index e3ff69bd..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchHasNoOutgoing.java
+++ /dev/null
@@ -1,559 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         /////////

- *         // Synchronization

- *         /////////

- *         

- *         {@literal @}Constraint(severity="error", message="error", key = {s})

- *         pattern synchHasNoOutgoing(s : Synchronization) {

- *              neg find transition(_, s, _);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class SynchHasNoOutgoing extends BaseGeneratedEMFQuerySpecification<SynchHasNoOutgoing.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoOutgoing pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS;

-    

-    private static List<String> parameterNames = makeImmutableList("s");

-    

-    private Match(final Synchronization pS) {

-      this.fS = pS;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s".equals(parameterName)) return this.fS;

-      return null;

-    }

-    

-    public Synchronization getS() {

-      return this.fS;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s".equals(parameterName) ) {

-          this.fS = (Synchronization) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS(final Synchronization pS) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS = pS;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoOutgoing";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return SynchHasNoOutgoing.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS};

-    }

-    

-    @Override

-    public SynchHasNoOutgoing.Match toImmutable() {

-      return isMutable() ? newMatch(fS) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s\"=" + prettyPrintValue(fS));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof SynchHasNoOutgoing.Match)) {

-          SynchHasNoOutgoing.Match other = (SynchHasNoOutgoing.Match) obj;

-          return Objects.equals(fS, other.fS);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public SynchHasNoOutgoing specification() {

-      return SynchHasNoOutgoing.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static SynchHasNoOutgoing.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static SynchHasNoOutgoing.Match newMutableMatch(final Synchronization pS) {

-      return new Mutable(pS);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static SynchHasNoOutgoing.Match newMatch(final Synchronization pS) {

-      return new Immutable(pS);

-    }

-    

-    private static final class Mutable extends SynchHasNoOutgoing.Match {

-      Mutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends SynchHasNoOutgoing.Match {

-      Immutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoOutgoing pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * /////////

-   * // Synchronization

-   * /////////

-   * 

-   * {@literal @}Constraint(severity="error", message="error", key = {s})

-   * pattern synchHasNoOutgoing(s : Synchronization) {

-   *    neg find transition(_, s, _);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see SynchHasNoOutgoing

-   * 

-   */

-  public static class Matcher extends BaseMatcher<SynchHasNoOutgoing.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static SynchHasNoOutgoing.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static SynchHasNoOutgoing.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SynchHasNoOutgoing.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<SynchHasNoOutgoing.Match> getAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<SynchHasNoOutgoing.Match> streamAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<SynchHasNoOutgoing.Match> getOneArbitraryMatch(final Synchronization pS) {

-      return rawGetOneArbitraryMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS) {

-      return rawHasMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS) {

-      return rawCountMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS, final Consumer<? super SynchHasNoOutgoing.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public SynchHasNoOutgoing.Match newMatch(final Synchronization pS) {

-      return SynchHasNoOutgoing.Match.newMatch(pS);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray());

-    }

-    

-    @Override

-    protected SynchHasNoOutgoing.Match tupleToMatch(final Tuple t) {

-      try {

-          return SynchHasNoOutgoing.Match.newMatch((Synchronization) t.get(POSITION_S));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchHasNoOutgoing.Match arrayToMatch(final Object[] match) {

-      try {

-          return SynchHasNoOutgoing.Match.newMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchHasNoOutgoing.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return SynchHasNoOutgoing.Match.newMutableMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<SynchHasNoOutgoing.Matcher> querySpecification() {

-      return SynchHasNoOutgoing.instance();

-    }

-  }

-  

-  private SynchHasNoOutgoing() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static SynchHasNoOutgoing instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected SynchHasNoOutgoing.Matcher instantiate(final ViatraQueryEngine engine) {

-    return SynchHasNoOutgoing.Matcher.on(engine);

-  }

-  

-  @Override

-  public SynchHasNoOutgoing.Matcher instantiate() {

-    return SynchHasNoOutgoing.Matcher.create();

-  }

-  

-  @Override

-  public SynchHasNoOutgoing.Match newEmptyMatch() {

-    return SynchHasNoOutgoing.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public SynchHasNoOutgoing.Match newMatch(final Object... parameters) {

-    return SynchHasNoOutgoing.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoOutgoing (visibility: PUBLIC, simpleName: SynchHasNoOutgoing, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoOutgoing, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoOutgoing (visibility: PUBLIC, simpleName: SynchHasNoOutgoing, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchHasNoOutgoing, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static SynchHasNoOutgoing INSTANCE = new SynchHasNoOutgoing();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static SynchHasNoOutgoing.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s = new PParameter("s", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchHasNoOutgoing";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s)

-          ));

-          //    neg find transition(_, s, _)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var___0_, var_s, var___1_), Transition.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchThree.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchThree.java
deleted file mode 100644
index 228db3a0..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchThree.java
+++ /dev/null
@@ -1,639 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         Simplifying model generation

- *          

- *         {@literal @}Constraint(severity="error", message="error", key = {s})

- *         pattern synchThree(s: Synchronization) {

- *              Transition.target(t1,s);

- *              Transition.target(t2,s);

- *              Transition.target(t3,s);

- *              t1!=t2;

- *              t2!=t3;

- *              t1!=t3;

- *         } or {

- *              Transition.source(t1,s);

- *              Transition.source(t2,s);

- *              Transition.source(t3,s);

- *              t1!=t2;

- *              t2!=t3;

- *              t1!=t3;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class SynchThree extends BaseGeneratedEMFQuerySpecification<SynchThree.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchThree pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS;

-    

-    private static List<String> parameterNames = makeImmutableList("s");

-    

-    private Match(final Synchronization pS) {

-      this.fS = pS;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s".equals(parameterName)) return this.fS;

-      return null;

-    }

-    

-    public Synchronization getS() {

-      return this.fS;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s".equals(parameterName) ) {

-          this.fS = (Synchronization) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS(final Synchronization pS) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS = pS;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchThree";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return SynchThree.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS};

-    }

-    

-    @Override

-    public SynchThree.Match toImmutable() {

-      return isMutable() ? newMatch(fS) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s\"=" + prettyPrintValue(fS));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof SynchThree.Match)) {

-          SynchThree.Match other = (SynchThree.Match) obj;

-          return Objects.equals(fS, other.fS);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public SynchThree specification() {

-      return SynchThree.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static SynchThree.Match newEmptyMatch() {

-      return new Mutable(null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static SynchThree.Match newMutableMatch(final Synchronization pS) {

-      return new Mutable(pS);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static SynchThree.Match newMatch(final Synchronization pS) {

-      return new Immutable(pS);

-    }

-    

-    private static final class Mutable extends SynchThree.Match {

-      Mutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends SynchThree.Match {

-      Immutable(final Synchronization pS) {

-        super(pS);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchThree pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * Simplifying model generation

-   *  

-   * {@literal @}Constraint(severity="error", message="error", key = {s})

-   * pattern synchThree(s: Synchronization) {

-   *    Transition.target(t1,s);

-   *    Transition.target(t2,s);

-   *    Transition.target(t3,s);

-   *    t1!=t2;

-   *    t2!=t3;

-   *    t1!=t3;

-   * } or {

-   *    Transition.source(t1,s);

-   *    Transition.source(t2,s);

-   *    Transition.source(t3,s);

-   *    t1!=t2;

-   *    t2!=t3;

-   *    t1!=t3;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see SynchThree

-   * 

-   */

-  public static class Matcher extends BaseMatcher<SynchThree.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static SynchThree.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static SynchThree.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S = 0;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SynchThree.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<SynchThree.Match> getAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<SynchThree.Match> streamAllMatches(final Synchronization pS) {

-      return rawStreamAllMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<SynchThree.Match> getOneArbitraryMatch(final Synchronization pS) {

-      return rawGetOneArbitraryMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS) {

-      return rawHasMatch(new Object[]{pS});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS) {

-      return rawCountMatches(new Object[]{pS});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS, final Consumer<? super SynchThree.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public SynchThree.Match newMatch(final Synchronization pS) {

-      return SynchThree.Match.newMatch(pS);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray());

-    }

-    

-    @Override

-    protected SynchThree.Match tupleToMatch(final Tuple t) {

-      try {

-          return SynchThree.Match.newMatch((Synchronization) t.get(POSITION_S));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchThree.Match arrayToMatch(final Object[] match) {

-      try {

-          return SynchThree.Match.newMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchThree.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return SynchThree.Match.newMutableMatch((Synchronization) match[POSITION_S]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<SynchThree.Matcher> querySpecification() {

-      return SynchThree.instance();

-    }

-  }

-  

-  private SynchThree() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static SynchThree instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected SynchThree.Matcher instantiate(final ViatraQueryEngine engine) {

-    return SynchThree.Matcher.on(engine);

-  }

-  

-  @Override

-  public SynchThree.Matcher instantiate() {

-    return SynchThree.Matcher.create();

-  }

-  

-  @Override

-  public SynchThree.Match newEmptyMatch() {

-    return SynchThree.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public SynchThree.Match newMatch(final Object... parameters) {

-    return SynchThree.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchThree (visibility: PUBLIC, simpleName: SynchThree, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchThree, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchThree (visibility: PUBLIC, simpleName: SynchThree, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchThree, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static SynchThree INSTANCE = new SynchThree();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static SynchThree.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s = new PParameter("s", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.synchThree";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_t1 = body.getOrCreateVariableByName("t1");

-          PVariable var_t2 = body.getOrCreateVariableByName("t2");

-          PVariable var_t3 = body.getOrCreateVariableByName("t3");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s)

-          ));

-          //    Transition.target(t1,s)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "target")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_0_, var_s);

-          //    Transition.target(t2,s)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t2, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "target")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_s);

-          //    Transition.target(t3,s)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t3), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t3, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "target")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_2_, var_s);

-          //    t1!=t2

-          new Inequality(body, var_t1, var_t2);

-          //    t2!=t3

-          new Inequality(body, var_t2, var_t3);

-          //    t1!=t3

-          new Inequality(body, var_t1, var_t3);

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_t1 = body.getOrCreateVariableByName("t1");

-          PVariable var_t2 = body.getOrCreateVariableByName("t2");

-          PVariable var_t3 = body.getOrCreateVariableByName("t3");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s)

-          ));

-          //    Transition.source(t1,s)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "source")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_0_, var_s);

-          //    Transition.source(t2,s)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t2, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "source")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_s);

-          //    Transition.source(t3,s)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t3), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t3, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "source")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_2_, var_s);

-          //    t1!=t2

-          new Inequality(body, var_t1, var_t2);

-          //    t2!=t3

-          new Inequality(body, var_t2, var_t3);

-          //    t1!=t3

-          new Inequality(body, var_t1, var_t3);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedIncomingInSameRegion.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedIncomingInSameRegion.java
deleted file mode 100644
index dabbe8c5..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedIncomingInSameRegion.java
+++ /dev/null
@@ -1,888 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {s})

- *         pattern SynchronizedIncomingInSameRegion(s : Synchronization, v1 : Vertex, v2 : Vertex) {

- *              find transition(t1, v1, s);

- *              find transition(t2, v2, s);

- *              t1!=t2;

- *              Region.vertices(r, v1);

- *              Region.vertices(r, v2);

- *         } or {

- *              find transition(t1, s, v1);

- *              find transition(t2, s, v2);

- *              t1!=t2;

- *              Region.vertices(r, v1);

- *              Region.vertices(r, v2);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class SynchronizedIncomingInSameRegion extends BaseGeneratedEMFQuerySpecification<SynchronizedIncomingInSameRegion.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS;

-    

-    private Vertex fV1;

-    

-    private Vertex fV2;

-    

-    private static List<String> parameterNames = makeImmutableList("s", "v1", "v2");

-    

-    private Match(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      this.fS = pS;

-      this.fV1 = pV1;

-      this.fV2 = pV2;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s".equals(parameterName)) return this.fS;

-      if ("v1".equals(parameterName)) return this.fV1;

-      if ("v2".equals(parameterName)) return this.fV2;

-      return null;

-    }

-    

-    public Synchronization getS() {

-      return this.fS;

-    }

-    

-    public Vertex getV1() {

-      return this.fV1;

-    }

-    

-    public Vertex getV2() {

-      return this.fV2;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s".equals(parameterName) ) {

-          this.fS = (Synchronization) newValue;

-          return true;

-      }

-      if ("v1".equals(parameterName) ) {

-          this.fV1 = (Vertex) newValue;

-          return true;

-      }

-      if ("v2".equals(parameterName) ) {

-          this.fV2 = (Vertex) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS(final Synchronization pS) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS = pS;

-    }

-    

-    public void setV1(final Vertex pV1) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fV1 = pV1;

-    }

-    

-    public void setV2(final Vertex pV2) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fV2 = pV2;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return SynchronizedIncomingInSameRegion.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS, fV1, fV2};

-    }

-    

-    @Override

-    public SynchronizedIncomingInSameRegion.Match toImmutable() {

-      return isMutable() ? newMatch(fS, fV1, fV2) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s\"=" + prettyPrintValue(fS) + ", ");

-      result.append("\"v1\"=" + prettyPrintValue(fV1) + ", ");

-      result.append("\"v2\"=" + prettyPrintValue(fV2));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS, fV1, fV2);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof SynchronizedIncomingInSameRegion.Match)) {

-          SynchronizedIncomingInSameRegion.Match other = (SynchronizedIncomingInSameRegion.Match) obj;

-          return Objects.equals(fS, other.fS) && Objects.equals(fV1, other.fV1) && Objects.equals(fV2, other.fV2);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public SynchronizedIncomingInSameRegion specification() {

-      return SynchronizedIncomingInSameRegion.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static SynchronizedIncomingInSameRegion.Match newEmptyMatch() {

-      return new Mutable(null, null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static SynchronizedIncomingInSameRegion.Match newMutableMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return new Mutable(pS, pV1, pV2);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static SynchronizedIncomingInSameRegion.Match newMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return new Immutable(pS, pV1, pV2);

-    }

-    

-    private static final class Mutable extends SynchronizedIncomingInSameRegion.Match {

-      Mutable(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-        super(pS, pV1, pV2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends SynchronizedIncomingInSameRegion.Match {

-      Immutable(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-        super(pS, pV1, pV2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {s})

-   * pattern SynchronizedIncomingInSameRegion(s : Synchronization, v1 : Vertex, v2 : Vertex) {

-   *    find transition(t1, v1, s);

-   *    find transition(t2, v2, s);

-   *    t1!=t2;

-   *    Region.vertices(r, v1);

-   *    Region.vertices(r, v2);

-   * } or {

-   *    find transition(t1, s, v1);

-   *    find transition(t2, s, v2);

-   *    t1!=t2;

-   *    Region.vertices(r, v1);

-   *    Region.vertices(r, v2);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see SynchronizedIncomingInSameRegion

-   * 

-   */

-  public static class Matcher extends BaseMatcher<SynchronizedIncomingInSameRegion.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static SynchronizedIncomingInSameRegion.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static SynchronizedIncomingInSameRegion.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S = 0;

-    

-    private final static int POSITION_V1 = 1;

-    

-    private final static int POSITION_V2 = 2;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SynchronizedIncomingInSameRegion.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<SynchronizedIncomingInSameRegion.Match> getAllMatches(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllMatches(new Object[]{pS, pV1, pV2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<SynchronizedIncomingInSameRegion.Match> streamAllMatches(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllMatches(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<SynchronizedIncomingInSameRegion.Match> getOneArbitraryMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawGetOneArbitraryMatch(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawHasMatch(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawCountMatches(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2, final Consumer<? super SynchronizedIncomingInSameRegion.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS, pV1, pV2}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public SynchronizedIncomingInSameRegion.Match newMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return SynchronizedIncomingInSameRegion.Match.newMatch(pS, pV1, pV2);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs(final SynchronizedIncomingInSameRegion.Match partialMatch) {

-      return rawStreamAllValuesOfs(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs(final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllValuesOfs(new Object[]{null, pV1, pV2});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs(final SynchronizedIncomingInSameRegion.Match partialMatch) {

-      return rawStreamAllValuesOfs(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs(final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllValuesOfs(new Object[]{null, pV1, pV2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOfv1(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_V1, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv1() {

-      return rawStreamAllValuesOfv1(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv1() {

-      return rawStreamAllValuesOfv1(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv1(final SynchronizedIncomingInSameRegion.Match partialMatch) {

-      return rawStreamAllValuesOfv1(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv1(final Synchronization pS, final Vertex pV2) {

-      return rawStreamAllValuesOfv1(new Object[]{pS, null, pV2});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv1(final SynchronizedIncomingInSameRegion.Match partialMatch) {

-      return rawStreamAllValuesOfv1(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv1(final Synchronization pS, final Vertex pV2) {

-      return rawStreamAllValuesOfv1(new Object[]{pS, null, pV2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOfv2(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_V2, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv2() {

-      return rawStreamAllValuesOfv2(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv2() {

-      return rawStreamAllValuesOfv2(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv2(final SynchronizedIncomingInSameRegion.Match partialMatch) {

-      return rawStreamAllValuesOfv2(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv2(final Synchronization pS, final Vertex pV1) {

-      return rawStreamAllValuesOfv2(new Object[]{pS, pV1, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv2(final SynchronizedIncomingInSameRegion.Match partialMatch) {

-      return rawStreamAllValuesOfv2(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv2(final Synchronization pS, final Vertex pV1) {

-      return rawStreamAllValuesOfv2(new Object[]{pS, pV1, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected SynchronizedIncomingInSameRegion.Match tupleToMatch(final Tuple t) {

-      try {

-          return SynchronizedIncomingInSameRegion.Match.newMatch((Synchronization) t.get(POSITION_S), (Vertex) t.get(POSITION_V1), (Vertex) t.get(POSITION_V2));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchronizedIncomingInSameRegion.Match arrayToMatch(final Object[] match) {

-      try {

-          return SynchronizedIncomingInSameRegion.Match.newMatch((Synchronization) match[POSITION_S], (Vertex) match[POSITION_V1], (Vertex) match[POSITION_V2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchronizedIncomingInSameRegion.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return SynchronizedIncomingInSameRegion.Match.newMutableMatch((Synchronization) match[POSITION_S], (Vertex) match[POSITION_V1], (Vertex) match[POSITION_V2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<SynchronizedIncomingInSameRegion.Matcher> querySpecification() {

-      return SynchronizedIncomingInSameRegion.instance();

-    }

-  }

-  

-  private SynchronizedIncomingInSameRegion() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static SynchronizedIncomingInSameRegion instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected SynchronizedIncomingInSameRegion.Matcher instantiate(final ViatraQueryEngine engine) {

-    return SynchronizedIncomingInSameRegion.Matcher.on(engine);

-  }

-  

-  @Override

-  public SynchronizedIncomingInSameRegion.Matcher instantiate() {

-    return SynchronizedIncomingInSameRegion.Matcher.create();

-  }

-  

-  @Override

-  public SynchronizedIncomingInSameRegion.Match newEmptyMatch() {

-    return SynchronizedIncomingInSameRegion.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public SynchronizedIncomingInSameRegion.Match newMatch(final Object... parameters) {

-    return SynchronizedIncomingInSameRegion.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[1], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[2]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion (visibility: PUBLIC, simpleName: SynchronizedIncomingInSameRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion (visibility: PUBLIC, simpleName: SynchronizedIncomingInSameRegion, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static SynchronizedIncomingInSameRegion INSTANCE = new SynchronizedIncomingInSameRegion();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static SynchronizedIncomingInSameRegion.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s = new PParameter("s", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_v1 = new PParameter("v1", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_v2 = new PParameter("v2", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s, parameter_v1, parameter_v2);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedIncomingInSameRegion";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s","v1","v2");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_v1 = body.getOrCreateVariableByName("v1");

-          PVariable var_v2 = body.getOrCreateVariableByName("v2");

-          PVariable var_t1 = body.getOrCreateVariableByName("t1");

-          PVariable var_t2 = body.getOrCreateVariableByName("t2");

-          PVariable var_r = body.getOrCreateVariableByName("r");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s),

-             new ExportedParameter(body, var_v1, parameter_v1),

-             new ExportedParameter(body, var_v2, parameter_v2)

-          ));

-          //    find transition(t1, v1, s)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_t1, var_v1, var_s), Transition.instance().getInternalQueryRepresentation());

-          //    find transition(t2, v2, s)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_t2, var_v2, var_s), Transition.instance().getInternalQueryRepresentation());

-          //    t1!=t2

-          new Inequality(body, var_t1, var_t2);

-          //    Region.vertices(r, v1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_0_, var_v1);

-          //    Region.vertices(r, v2)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_v2);

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_v1 = body.getOrCreateVariableByName("v1");

-          PVariable var_v2 = body.getOrCreateVariableByName("v2");

-          PVariable var_t1 = body.getOrCreateVariableByName("t1");

-          PVariable var_t2 = body.getOrCreateVariableByName("t2");

-          PVariable var_r = body.getOrCreateVariableByName("r");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s),

-             new ExportedParameter(body, var_v1, parameter_v1),

-             new ExportedParameter(body, var_v2, parameter_v2)

-          ));

-          //    find transition(t1, s, v1)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_t1, var_s, var_v1), Transition.instance().getInternalQueryRepresentation());

-          //    find transition(t2, s, v2)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_t2, var_s, var_v2), Transition.instance().getInternalQueryRepresentation());

-          //    t1!=t2

-          new Inequality(body, var_t1, var_t2);

-          //    Region.vertices(r, v1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_0_, var_v1);

-          //    Region.vertices(r, v2)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_v2);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedRegionDoesNotHaveMultipleRegions.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedRegionDoesNotHaveMultipleRegions.java
deleted file mode 100644
index 28eecf9c..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedRegionDoesNotHaveMultipleRegions.java
+++ /dev/null
@@ -1,744 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Child;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.HasMultipleRegions;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.NegativePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {s})

- *         pattern SynchronizedRegionDoesNotHaveMultipleRegions(s : Synchronization, v : Vertex) {

- *              find transition(_, v, s);

- *              find child(c,v);

- *              neg find hasMultipleRegions(c);

- *         } or {

- *              find transition(_, s, v);

- *              find child(c,v);

- *              neg find hasMultipleRegions(c);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class SynchronizedRegionDoesNotHaveMultipleRegions extends BaseGeneratedEMFQuerySpecification<SynchronizedRegionDoesNotHaveMultipleRegions.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS;

-    

-    private Vertex fV;

-    

-    private static List<String> parameterNames = makeImmutableList("s", "v");

-    

-    private Match(final Synchronization pS, final Vertex pV) {

-      this.fS = pS;

-      this.fV = pV;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s".equals(parameterName)) return this.fS;

-      if ("v".equals(parameterName)) return this.fV;

-      return null;

-    }

-    

-    public Synchronization getS() {

-      return this.fS;

-    }

-    

-    public Vertex getV() {

-      return this.fV;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s".equals(parameterName) ) {

-          this.fS = (Synchronization) newValue;

-          return true;

-      }

-      if ("v".equals(parameterName) ) {

-          this.fV = (Vertex) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS(final Synchronization pS) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS = pS;

-    }

-    

-    public void setV(final Vertex pV) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fV = pV;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return SynchronizedRegionDoesNotHaveMultipleRegions.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS, fV};

-    }

-    

-    @Override

-    public SynchronizedRegionDoesNotHaveMultipleRegions.Match toImmutable() {

-      return isMutable() ? newMatch(fS, fV) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s\"=" + prettyPrintValue(fS) + ", ");

-      result.append("\"v\"=" + prettyPrintValue(fV));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS, fV);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof SynchronizedRegionDoesNotHaveMultipleRegions.Match)) {

-          SynchronizedRegionDoesNotHaveMultipleRegions.Match other = (SynchronizedRegionDoesNotHaveMultipleRegions.Match) obj;

-          return Objects.equals(fS, other.fS) && Objects.equals(fV, other.fV);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public SynchronizedRegionDoesNotHaveMultipleRegions specification() {

-      return SynchronizedRegionDoesNotHaveMultipleRegions.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static SynchronizedRegionDoesNotHaveMultipleRegions.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static SynchronizedRegionDoesNotHaveMultipleRegions.Match newMutableMatch(final Synchronization pS, final Vertex pV) {

-      return new Mutable(pS, pV);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static SynchronizedRegionDoesNotHaveMultipleRegions.Match newMatch(final Synchronization pS, final Vertex pV) {

-      return new Immutable(pS, pV);

-    }

-    

-    private static final class Mutable extends SynchronizedRegionDoesNotHaveMultipleRegions.Match {

-      Mutable(final Synchronization pS, final Vertex pV) {

-        super(pS, pV);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends SynchronizedRegionDoesNotHaveMultipleRegions.Match {

-      Immutable(final Synchronization pS, final Vertex pV) {

-        super(pS, pV);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {s})

-   * pattern SynchronizedRegionDoesNotHaveMultipleRegions(s : Synchronization, v : Vertex) {

-   *    find transition(_, v, s);

-   *    find child(c,v);

-   *    neg find hasMultipleRegions(c);

-   * } or {

-   *    find transition(_, s, v);

-   *    find child(c,v);

-   *    neg find hasMultipleRegions(c);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see SynchronizedRegionDoesNotHaveMultipleRegions

-   * 

-   */

-  public static class Matcher extends BaseMatcher<SynchronizedRegionDoesNotHaveMultipleRegions.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static SynchronizedRegionDoesNotHaveMultipleRegions.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static SynchronizedRegionDoesNotHaveMultipleRegions.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S = 0;

-    

-    private final static int POSITION_V = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SynchronizedRegionDoesNotHaveMultipleRegions.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<SynchronizedRegionDoesNotHaveMultipleRegions.Match> getAllMatches(final Synchronization pS, final Vertex pV) {

-      return rawStreamAllMatches(new Object[]{pS, pV}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<SynchronizedRegionDoesNotHaveMultipleRegions.Match> streamAllMatches(final Synchronization pS, final Vertex pV) {

-      return rawStreamAllMatches(new Object[]{pS, pV});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<SynchronizedRegionDoesNotHaveMultipleRegions.Match> getOneArbitraryMatch(final Synchronization pS, final Vertex pV) {

-      return rawGetOneArbitraryMatch(new Object[]{pS, pV});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS, final Vertex pV) {

-      return rawHasMatch(new Object[]{pS, pV});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS, final Vertex pV) {

-      return rawCountMatches(new Object[]{pS, pV});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS, final Vertex pV, final Consumer<? super SynchronizedRegionDoesNotHaveMultipleRegions.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS, pV}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV the fixed value of pattern parameter v, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public SynchronizedRegionDoesNotHaveMultipleRegions.Match newMatch(final Synchronization pS, final Vertex pV) {

-      return SynchronizedRegionDoesNotHaveMultipleRegions.Match.newMatch(pS, pV);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs(final SynchronizedRegionDoesNotHaveMultipleRegions.Match partialMatch) {

-      return rawStreamAllValuesOfs(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs(final Vertex pV) {

-      return rawStreamAllValuesOfs(new Object[]{null, pV});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs(final SynchronizedRegionDoesNotHaveMultipleRegions.Match partialMatch) {

-      return rawStreamAllValuesOfs(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs(final Vertex pV) {

-      return rawStreamAllValuesOfs(new Object[]{null, pV}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOfv(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_V, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv() {

-      return rawStreamAllValuesOfv(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv() {

-      return rawStreamAllValuesOfv(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv(final SynchronizedRegionDoesNotHaveMultipleRegions.Match partialMatch) {

-      return rawStreamAllValuesOfv(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv(final Synchronization pS) {

-      return rawStreamAllValuesOfv(new Object[]{pS, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv(final SynchronizedRegionDoesNotHaveMultipleRegions.Match partialMatch) {

-      return rawStreamAllValuesOfv(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv(final Synchronization pS) {

-      return rawStreamAllValuesOfv(new Object[]{pS, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected SynchronizedRegionDoesNotHaveMultipleRegions.Match tupleToMatch(final Tuple t) {

-      try {

-          return SynchronizedRegionDoesNotHaveMultipleRegions.Match.newMatch((Synchronization) t.get(POSITION_S), (Vertex) t.get(POSITION_V));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchronizedRegionDoesNotHaveMultipleRegions.Match arrayToMatch(final Object[] match) {

-      try {

-          return SynchronizedRegionDoesNotHaveMultipleRegions.Match.newMatch((Synchronization) match[POSITION_S], (Vertex) match[POSITION_V]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchronizedRegionDoesNotHaveMultipleRegions.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return SynchronizedRegionDoesNotHaveMultipleRegions.Match.newMutableMatch((Synchronization) match[POSITION_S], (Vertex) match[POSITION_V]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<SynchronizedRegionDoesNotHaveMultipleRegions.Matcher> querySpecification() {

-      return SynchronizedRegionDoesNotHaveMultipleRegions.instance();

-    }

-  }

-  

-  private SynchronizedRegionDoesNotHaveMultipleRegions() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static SynchronizedRegionDoesNotHaveMultipleRegions instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected SynchronizedRegionDoesNotHaveMultipleRegions.Matcher instantiate(final ViatraQueryEngine engine) {

-    return SynchronizedRegionDoesNotHaveMultipleRegions.Matcher.on(engine);

-  }

-  

-  @Override

-  public SynchronizedRegionDoesNotHaveMultipleRegions.Matcher instantiate() {

-    return SynchronizedRegionDoesNotHaveMultipleRegions.Matcher.create();

-  }

-  

-  @Override

-  public SynchronizedRegionDoesNotHaveMultipleRegions.Match newEmptyMatch() {

-    return SynchronizedRegionDoesNotHaveMultipleRegions.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public SynchronizedRegionDoesNotHaveMultipleRegions.Match newMatch(final Object... parameters) {

-    return SynchronizedRegionDoesNotHaveMultipleRegions.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions (visibility: PUBLIC, simpleName: SynchronizedRegionDoesNotHaveMultipleRegions, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions (visibility: PUBLIC, simpleName: SynchronizedRegionDoesNotHaveMultipleRegions, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static SynchronizedRegionDoesNotHaveMultipleRegions INSTANCE = new SynchronizedRegionDoesNotHaveMultipleRegions();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static SynchronizedRegionDoesNotHaveMultipleRegions.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s = new PParameter("s", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_v = new PParameter("v", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s, parameter_v);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionDoesNotHaveMultipleRegions";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s","v");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_v = body.getOrCreateVariableByName("v");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var_c = body.getOrCreateVariableByName("c");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s),

-             new ExportedParameter(body, var_v, parameter_v)

-          ));

-          //    find transition(_, v, s)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___0_, var_v, var_s), Transition.instance().getInternalQueryRepresentation());

-          //    find child(c,v)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_c, var_v), Child.instance().getInternalQueryRepresentation());

-          //    neg find hasMultipleRegions(c)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var_c), HasMultipleRegions.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_v = body.getOrCreateVariableByName("v");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var_c = body.getOrCreateVariableByName("c");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s),

-             new ExportedParameter(body, var_v, parameter_v)

-          ));

-          //    find transition(_, s, v)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___0_, var_s, var_v), Transition.instance().getInternalQueryRepresentation());

-          //    find child(c,v)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var_c, var_v), Child.instance().getInternalQueryRepresentation());

-          //    neg find hasMultipleRegions(c)

-          new NegativePatternCall(body, Tuples.flatTupleOf(var_c), HasMultipleRegions.instance().getInternalQueryRepresentation());

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedRegionsAreNotSiblings.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedRegionsAreNotSiblings.java
deleted file mode 100644
index 160c4aa0..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/SynchronizedRegionsAreNotSiblings.java
+++ /dev/null
@@ -1,902 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.PositivePatternCall;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         {@literal @}Constraint(severity="error", message="error", key = {s})

- *         pattern SynchronizedRegionsAreNotSiblings(s : Synchronization, v1 : Vertex, v2 : Vertex) {

- *              find transition(_, v1, s);

- *              find transition(_, v2, s);

- *              CompositeElement.regions.vertices(r1, v1);

- *              CompositeElement.regions.vertices(r2, v2);

- *              r1 != r2;

- *         } or {

- *              find transition(_, s, v1);

- *              find transition(_, s, v2);

- *              CompositeElement.regions.vertices(r1, v1);

- *              CompositeElement.regions.vertices(r2, v2);

- *              r1 != r2;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class SynchronizedRegionsAreNotSiblings extends BaseGeneratedEMFQuerySpecification<SynchronizedRegionsAreNotSiblings.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS;

-    

-    private Vertex fV1;

-    

-    private Vertex fV2;

-    

-    private static List<String> parameterNames = makeImmutableList("s", "v1", "v2");

-    

-    private Match(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      this.fS = pS;

-      this.fV1 = pV1;

-      this.fV2 = pV2;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s".equals(parameterName)) return this.fS;

-      if ("v1".equals(parameterName)) return this.fV1;

-      if ("v2".equals(parameterName)) return this.fV2;

-      return null;

-    }

-    

-    public Synchronization getS() {

-      return this.fS;

-    }

-    

-    public Vertex getV1() {

-      return this.fV1;

-    }

-    

-    public Vertex getV2() {

-      return this.fV2;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s".equals(parameterName) ) {

-          this.fS = (Synchronization) newValue;

-          return true;

-      }

-      if ("v1".equals(parameterName) ) {

-          this.fV1 = (Vertex) newValue;

-          return true;

-      }

-      if ("v2".equals(parameterName) ) {

-          this.fV2 = (Vertex) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS(final Synchronization pS) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS = pS;

-    }

-    

-    public void setV1(final Vertex pV1) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fV1 = pV1;

-    }

-    

-    public void setV2(final Vertex pV2) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fV2 = pV2;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return SynchronizedRegionsAreNotSiblings.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS, fV1, fV2};

-    }

-    

-    @Override

-    public SynchronizedRegionsAreNotSiblings.Match toImmutable() {

-      return isMutable() ? newMatch(fS, fV1, fV2) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s\"=" + prettyPrintValue(fS) + ", ");

-      result.append("\"v1\"=" + prettyPrintValue(fV1) + ", ");

-      result.append("\"v2\"=" + prettyPrintValue(fV2));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS, fV1, fV2);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof SynchronizedRegionsAreNotSiblings.Match)) {

-          SynchronizedRegionsAreNotSiblings.Match other = (SynchronizedRegionsAreNotSiblings.Match) obj;

-          return Objects.equals(fS, other.fS) && Objects.equals(fV1, other.fV1) && Objects.equals(fV2, other.fV2);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public SynchronizedRegionsAreNotSiblings specification() {

-      return SynchronizedRegionsAreNotSiblings.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static SynchronizedRegionsAreNotSiblings.Match newEmptyMatch() {

-      return new Mutable(null, null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static SynchronizedRegionsAreNotSiblings.Match newMutableMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return new Mutable(pS, pV1, pV2);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static SynchronizedRegionsAreNotSiblings.Match newMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return new Immutable(pS, pV1, pV2);

-    }

-    

-    private static final class Mutable extends SynchronizedRegionsAreNotSiblings.Match {

-      Mutable(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-        super(pS, pV1, pV2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends SynchronizedRegionsAreNotSiblings.Match {

-      Immutable(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-        super(pS, pV1, pV2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * {@literal @}Constraint(severity="error", message="error", key = {s})

-   * pattern SynchronizedRegionsAreNotSiblings(s : Synchronization, v1 : Vertex, v2 : Vertex) {

-   *    find transition(_, v1, s);

-   *    find transition(_, v2, s);

-   *    CompositeElement.regions.vertices(r1, v1);

-   *    CompositeElement.regions.vertices(r2, v2);

-   *    r1 != r2;

-   * } or {

-   *    find transition(_, s, v1);

-   *    find transition(_, s, v2);

-   *    CompositeElement.regions.vertices(r1, v1);

-   *    CompositeElement.regions.vertices(r2, v2);

-   *    r1 != r2;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see SynchronizedRegionsAreNotSiblings

-   * 

-   */

-  public static class Matcher extends BaseMatcher<SynchronizedRegionsAreNotSiblings.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static SynchronizedRegionsAreNotSiblings.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static SynchronizedRegionsAreNotSiblings.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S = 0;

-    

-    private final static int POSITION_V1 = 1;

-    

-    private final static int POSITION_V2 = 2;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(SynchronizedRegionsAreNotSiblings.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<SynchronizedRegionsAreNotSiblings.Match> getAllMatches(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllMatches(new Object[]{pS, pV1, pV2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<SynchronizedRegionsAreNotSiblings.Match> streamAllMatches(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllMatches(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<SynchronizedRegionsAreNotSiblings.Match> getOneArbitraryMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawGetOneArbitraryMatch(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawHasMatch(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return rawCountMatches(new Object[]{pS, pV1, pV2});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2, final Consumer<? super SynchronizedRegionsAreNotSiblings.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS, pV1, pV2}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS the fixed value of pattern parameter s, or null if not bound.

-     * @param pV1 the fixed value of pattern parameter v1, or null if not bound.

-     * @param pV2 the fixed value of pattern parameter v2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public SynchronizedRegionsAreNotSiblings.Match newMatch(final Synchronization pS, final Vertex pV1, final Vertex pV2) {

-      return SynchronizedRegionsAreNotSiblings.Match.newMatch(pS, pV1, pV2);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs() {

-      return rawStreamAllValuesOfs(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs(final SynchronizedRegionsAreNotSiblings.Match partialMatch) {

-      return rawStreamAllValuesOfs(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs(final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllValuesOfs(new Object[]{null, pV1, pV2});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs(final SynchronizedRegionsAreNotSiblings.Match partialMatch) {

-      return rawStreamAllValuesOfs(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs(final Vertex pV1, final Vertex pV2) {

-      return rawStreamAllValuesOfs(new Object[]{null, pV1, pV2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOfv1(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_V1, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv1() {

-      return rawStreamAllValuesOfv1(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv1() {

-      return rawStreamAllValuesOfv1(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv1(final SynchronizedRegionsAreNotSiblings.Match partialMatch) {

-      return rawStreamAllValuesOfv1(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv1(final Synchronization pS, final Vertex pV2) {

-      return rawStreamAllValuesOfv1(new Object[]{pS, null, pV2});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv1(final SynchronizedRegionsAreNotSiblings.Match partialMatch) {

-      return rawStreamAllValuesOfv1(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv1(final Synchronization pS, final Vertex pV2) {

-      return rawStreamAllValuesOfv1(new Object[]{pS, null, pV2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOfv2(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_V2, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv2() {

-      return rawStreamAllValuesOfv2(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv2() {

-      return rawStreamAllValuesOfv2(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv2(final SynchronizedRegionsAreNotSiblings.Match partialMatch) {

-      return rawStreamAllValuesOfv2(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfv2(final Synchronization pS, final Vertex pV1) {

-      return rawStreamAllValuesOfv2(new Object[]{pS, pV1, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv2(final SynchronizedRegionsAreNotSiblings.Match partialMatch) {

-      return rawStreamAllValuesOfv2(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for v2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfv2(final Synchronization pS, final Vertex pV1) {

-      return rawStreamAllValuesOfv2(new Object[]{pS, pV1, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected SynchronizedRegionsAreNotSiblings.Match tupleToMatch(final Tuple t) {

-      try {

-          return SynchronizedRegionsAreNotSiblings.Match.newMatch((Synchronization) t.get(POSITION_S), (Vertex) t.get(POSITION_V1), (Vertex) t.get(POSITION_V2));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchronizedRegionsAreNotSiblings.Match arrayToMatch(final Object[] match) {

-      try {

-          return SynchronizedRegionsAreNotSiblings.Match.newMatch((Synchronization) match[POSITION_S], (Vertex) match[POSITION_V1], (Vertex) match[POSITION_V2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected SynchronizedRegionsAreNotSiblings.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return SynchronizedRegionsAreNotSiblings.Match.newMutableMatch((Synchronization) match[POSITION_S], (Vertex) match[POSITION_V1], (Vertex) match[POSITION_V2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<SynchronizedRegionsAreNotSiblings.Matcher> querySpecification() {

-      return SynchronizedRegionsAreNotSiblings.instance();

-    }

-  }

-  

-  private SynchronizedRegionsAreNotSiblings() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static SynchronizedRegionsAreNotSiblings instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected SynchronizedRegionsAreNotSiblings.Matcher instantiate(final ViatraQueryEngine engine) {

-    return SynchronizedRegionsAreNotSiblings.Matcher.on(engine);

-  }

-  

-  @Override

-  public SynchronizedRegionsAreNotSiblings.Matcher instantiate() {

-    return SynchronizedRegionsAreNotSiblings.Matcher.create();

-  }

-  

-  @Override

-  public SynchronizedRegionsAreNotSiblings.Match newEmptyMatch() {

-    return SynchronizedRegionsAreNotSiblings.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public SynchronizedRegionsAreNotSiblings.Match newMatch(final Object... parameters) {

-    return SynchronizedRegionsAreNotSiblings.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[1], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[2]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings (visibility: PUBLIC, simpleName: SynchronizedRegionsAreNotSiblings, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings (visibility: PUBLIC, simpleName: SynchronizedRegionsAreNotSiblings, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static SynchronizedRegionsAreNotSiblings INSTANCE = new SynchronizedRegionsAreNotSiblings();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static SynchronizedRegionsAreNotSiblings.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s = new PParameter("s", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_v1 = new PParameter("v1", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_v2 = new PParameter("v2", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s, parameter_v1, parameter_v2);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.SynchronizedRegionsAreNotSiblings";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s","v1","v2");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_v1 = body.getOrCreateVariableByName("v1");

-          PVariable var_v2 = body.getOrCreateVariableByName("v2");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          PVariable var_r1 = body.getOrCreateVariableByName("r1");

-          PVariable var_r2 = body.getOrCreateVariableByName("r2");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s),

-             new ExportedParameter(body, var_v1, parameter_v1),

-             new ExportedParameter(body, var_v2, parameter_v2)

-          ));

-          //    find transition(_, v1, s)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___0_, var_v1, var_s), Transition.instance().getInternalQueryRepresentation());

-          //    find transition(_, v2, s)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___1_, var_v2, var_s), Transition.instance().getInternalQueryRepresentation());

-          //    CompositeElement.regions.vertices(r1, v1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "CompositeElement", "regions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_v1);

-          //    CompositeElement.regions.vertices(r2, v2)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r2, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "CompositeElement", "regions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_3_, var_v2);

-          //    r1 != r2

-          new Inequality(body, var_r1, var_r2);

-          bodies.add(body);

-      }

-      {

-          PBody body = new PBody(this);

-          PVariable var_s = body.getOrCreateVariableByName("s");

-          PVariable var_v1 = body.getOrCreateVariableByName("v1");

-          PVariable var_v2 = body.getOrCreateVariableByName("v2");

-          PVariable var___0_ = body.getOrCreateVariableByName("_<0>");

-          PVariable var___1_ = body.getOrCreateVariableByName("_<1>");

-          PVariable var_r1 = body.getOrCreateVariableByName("r1");

-          PVariable var_r2 = body.getOrCreateVariableByName("r2");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_v2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s, parameter_s),

-             new ExportedParameter(body, var_v1, parameter_v1),

-             new ExportedParameter(body, var_v2, parameter_v2)

-          ));

-          //    find transition(_, s, v1)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___0_, var_s, var_v1), Transition.instance().getInternalQueryRepresentation());

-          //    find transition(_, s, v2)

-          new PositivePatternCall(body, Tuples.flatTupleOf(var___1_, var_s, var_v2), Transition.instance().getInternalQueryRepresentation());

-          //    CompositeElement.regions.vertices(r1, v1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r1, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "CompositeElement", "regions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_v1);

-          //    CompositeElement.regions.vertices(r2, v2)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "CompositeElement")));

-          PVariable var__virtual_2_ = body.getOrCreateVariableByName(".virtual{2}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_r2, var__virtual_2_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "CompositeElement", "regions")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Region")));

-          PVariable var__virtual_3_ = body.getOrCreateVariableByName(".virtual{3}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_2_, var__virtual_3_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Region", "vertices")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_3_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_3_, var_v2);

-          //    r1 != r2

-          new Inequality(body, var_r1, var_r2);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/Transition.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/Transition.java
deleted file mode 100644
index 185f348e..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/Transition.java
+++ /dev/null
@@ -1,808 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.emf.types.EStructuralFeatureInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Equality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         pattern transition(t : Transition, src : Vertex, trg : Vertex) {

- *              Transition.source(t, src);

- *              Transition.target(t, trg);

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class Transition extends BaseGeneratedEMFQuerySpecification<Transition.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition fT;

-    

-    private Vertex fSrc;

-    

-    private Vertex fTrg;

-    

-    private static List<String> parameterNames = makeImmutableList("t", "src", "trg");

-    

-    private Match(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      this.fT = pT;

-      this.fSrc = pSrc;

-      this.fTrg = pTrg;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("t".equals(parameterName)) return this.fT;

-      if ("src".equals(parameterName)) return this.fSrc;

-      if ("trg".equals(parameterName)) return this.fTrg;

-      return null;

-    }

-    

-    public ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition getT() {

-      return this.fT;

-    }

-    

-    public Vertex getSrc() {

-      return this.fSrc;

-    }

-    

-    public Vertex getTrg() {

-      return this.fTrg;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("t".equals(parameterName) ) {

-          this.fT = (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) newValue;

-          return true;

-      }

-      if ("src".equals(parameterName) ) {

-          this.fSrc = (Vertex) newValue;

-          return true;

-      }

-      if ("trg".equals(parameterName) ) {

-          this.fTrg = (Vertex) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setT(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fT = pT;

-    }

-    

-    public void setSrc(final Vertex pSrc) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fSrc = pSrc;

-    }

-    

-    public void setTrg(final Vertex pTrg) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fTrg = pTrg;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return Transition.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fT, fSrc, fTrg};

-    }

-    

-    @Override

-    public Transition.Match toImmutable() {

-      return isMutable() ? newMatch(fT, fSrc, fTrg) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"t\"=" + prettyPrintValue(fT) + ", ");

-      result.append("\"src\"=" + prettyPrintValue(fSrc) + ", ");

-      result.append("\"trg\"=" + prettyPrintValue(fTrg));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fT, fSrc, fTrg);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof Transition.Match)) {

-          Transition.Match other = (Transition.Match) obj;

-          return Objects.equals(fT, other.fT) && Objects.equals(fSrc, other.fSrc) && Objects.equals(fTrg, other.fTrg);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public Transition specification() {

-      return Transition.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static Transition.Match newEmptyMatch() {

-      return new Mutable(null, null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static Transition.Match newMutableMatch(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return new Mutable(pT, pSrc, pTrg);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static Transition.Match newMatch(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return new Immutable(pT, pSrc, pTrg);

-    }

-    

-    private static final class Mutable extends Transition.Match {

-      Mutable(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-        super(pT, pSrc, pTrg);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends Transition.Match {

-      Immutable(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-        super(pT, pSrc, pTrg);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * pattern transition(t : Transition, src : Vertex, trg : Vertex) {

-   *    Transition.source(t, src);

-   *    Transition.target(t, trg);

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see Transition

-   * 

-   */

-  public static class Matcher extends BaseMatcher<Transition.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static Transition.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static Transition.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_T = 0;

-    

-    private final static int POSITION_SRC = 1;

-    

-    private final static int POSITION_TRG = 2;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(Transition.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<Transition.Match> getAllMatches(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return rawStreamAllMatches(new Object[]{pT, pSrc, pTrg}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<Transition.Match> streamAllMatches(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return rawStreamAllMatches(new Object[]{pT, pSrc, pTrg});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<Transition.Match> getOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return rawGetOneArbitraryMatch(new Object[]{pT, pSrc, pTrg});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return rawHasMatch(new Object[]{pT, pSrc, pTrg});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return rawCountMatches(new Object[]{pT, pSrc, pTrg});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg, final Consumer<? super Transition.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pT, pSrc, pTrg}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pT the fixed value of pattern parameter t, or null if not bound.

-     * @param pSrc the fixed value of pattern parameter src, or null if not bound.

-     * @param pTrg the fixed value of pattern parameter trg, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public Transition.Match newMatch(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc, final Vertex pTrg) {

-      return Transition.Match.newMatch(pT, pSrc, pTrg);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition> rawStreamAllValuesOft(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_T, parameters).map(ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition> getAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition> streamAllValuesOft() {

-      return rawStreamAllValuesOft(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition> streamAllValuesOft(final Transition.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition> streamAllValuesOft(final Vertex pSrc, final Vertex pTrg) {

-      return rawStreamAllValuesOft(new Object[]{null, pSrc, pTrg});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition> getAllValuesOft(final Transition.Match partialMatch) {

-      return rawStreamAllValuesOft(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for t.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition> getAllValuesOft(final Vertex pSrc, final Vertex pTrg) {

-      return rawStreamAllValuesOft(new Object[]{null, pSrc, pTrg}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for src.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOfsrc(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_SRC, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for src.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfsrc() {

-      return rawStreamAllValuesOfsrc(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for src.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfsrc() {

-      return rawStreamAllValuesOfsrc(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for src.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfsrc(final Transition.Match partialMatch) {

-      return rawStreamAllValuesOfsrc(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for src.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOfsrc(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pTrg) {

-      return rawStreamAllValuesOfsrc(new Object[]{pT, null, pTrg});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for src.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfsrc(final Transition.Match partialMatch) {

-      return rawStreamAllValuesOfsrc(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for src.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOfsrc(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pTrg) {

-      return rawStreamAllValuesOfsrc(new Object[]{pT, null, pTrg}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for trg.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Vertex> rawStreamAllValuesOftrg(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_TRG, parameters).map(Vertex.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for trg.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOftrg() {

-      return rawStreamAllValuesOftrg(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for trg.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOftrg() {

-      return rawStreamAllValuesOftrg(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for trg.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOftrg(final Transition.Match partialMatch) {

-      return rawStreamAllValuesOftrg(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for trg.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Vertex> streamAllValuesOftrg(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc) {

-      return rawStreamAllValuesOftrg(new Object[]{pT, pSrc, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for trg.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOftrg(final Transition.Match partialMatch) {

-      return rawStreamAllValuesOftrg(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for trg.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Vertex> getAllValuesOftrg(final ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition pT, final Vertex pSrc) {

-      return rawStreamAllValuesOftrg(new Object[]{pT, pSrc, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected Transition.Match tupleToMatch(final Tuple t) {

-      try {

-          return Transition.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) t.get(POSITION_T), (Vertex) t.get(POSITION_SRC), (Vertex) t.get(POSITION_TRG));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected Transition.Match arrayToMatch(final Object[] match) {

-      try {

-          return Transition.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) match[POSITION_T], (Vertex) match[POSITION_SRC], (Vertex) match[POSITION_TRG]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected Transition.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return Transition.Match.newMutableMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) match[POSITION_T], (Vertex) match[POSITION_SRC], (Vertex) match[POSITION_TRG]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<Transition.Matcher> querySpecification() {

-      return Transition.instance();

-    }

-  }

-  

-  private Transition() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static Transition instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected Transition.Matcher instantiate(final ViatraQueryEngine engine) {

-    return Transition.Matcher.on(engine);

-  }

-  

-  @Override

-  public Transition.Matcher instantiate() {

-    return Transition.Matcher.create();

-  }

-  

-  @Override

-  public Transition.Match newEmptyMatch() {

-    return Transition.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public Transition.Match newMatch(final Object... parameters) {

-    return Transition.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[1], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex) parameters[2]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition (visibility: PUBLIC, simpleName: Transition, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition (visibility: PUBLIC, simpleName: Transition, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.Transition, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static Transition INSTANCE = new Transition();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static Transition.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_t = new PParameter("t", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Transition", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Transition")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_src = new PParameter("src", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_trg = new PParameter("trg", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Vertex", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Vertex")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_t, parameter_src, parameter_trg);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.transition";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("t","src","trg");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_t = body.getOrCreateVariableByName("t");

-          PVariable var_src = body.getOrCreateVariableByName("src");

-          PVariable var_trg = body.getOrCreateVariableByName("trg");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_src), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_trg), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_t, parameter_t),

-             new ExportedParameter(body, var_src, parameter_src),

-             new ExportedParameter(body, var_trg, parameter_trg)

-          ));

-          //    Transition.source(t, src)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_0_ = body.getOrCreateVariableByName(".virtual{0}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t, var__virtual_0_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "source")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_0_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_0_, var_src);

-          //    Transition.target(t, trg)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Transition")));

-          PVariable var__virtual_1_ = body.getOrCreateVariableByName(".virtual{1}");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_t, var__virtual_1_), new EStructuralFeatureInstancesKey(getFeatureLiteral("YakinduMetamodel", "Transition", "target")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var__virtual_1_), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Vertex")));

-          new Equality(body, var__virtual_1_, var_trg);

-          bodies.add(body);

-      }

-      return bodies;

-    }

-  }

-}

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/TwoSynch.java b/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/TwoSynch.java
deleted file mode 100644
index 4595f6bc..00000000
--- a/Tests/ca.mcgill.ecse.dslreasoner.standalone.test/src-gen/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/TwoSynch.java
+++ /dev/null
@@ -1,714 +0,0 @@
-/**

- * Generated from platform:/resource/ca.mcgill.ecse.dslreasoner.standalone.test/queries/ca/mcgill/ecse/dslreasoner/standalone/test/yakindu/queries/yakinduPatterns.vql

- */

-package ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries;

-

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization;

-import java.util.Arrays;

-import java.util.Collection;

-import java.util.LinkedHashSet;

-import java.util.List;

-import java.util.Objects;

-import java.util.Optional;

-import java.util.Set;

-import java.util.function.Consumer;

-import java.util.stream.Collectors;

-import java.util.stream.Stream;

-import org.apache.log4j.Logger;

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

-import org.eclipse.viatra.query.runtime.api.IPatternMatch;

-import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFPQuery;

-import org.eclipse.viatra.query.runtime.api.impl.BaseGeneratedEMFQuerySpecification;

-import org.eclipse.viatra.query.runtime.api.impl.BaseMatcher;

-import org.eclipse.viatra.query.runtime.api.impl.BasePatternMatch;

-import org.eclipse.viatra.query.runtime.emf.types.EClassTransitiveInstancesKey;

-import org.eclipse.viatra.query.runtime.matchers.backend.QueryEvaluationHint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PBody;

-import org.eclipse.viatra.query.runtime.matchers.psystem.PVariable;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

-import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.ParameterReference;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.ExportedParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicdeferred.Inequality;

-import org.eclipse.viatra.query.runtime.matchers.psystem.basicenumerables.TypeConstraint;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameter;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PParameterDirection;

-import org.eclipse.viatra.query.runtime.matchers.psystem.queries.PVisibility;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuple;

-import org.eclipse.viatra.query.runtime.matchers.tuple.Tuples;

-import org.eclipse.viatra.query.runtime.util.ViatraQueryLoggingUtil;

-

-/**

- * A pattern-specific query specification that can instantiate Matcher in a type-safe way.

- * 

- * <p>Original source:

- *         <code><pre>

- *         Simplifying model generation

- *          

- *         {@literal @}Constraint(severity="error", message="error", key = {s1,s2})

- *         pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {

- *              Synchronization(s1);

- *              Synchronization(s2);

- *              s1 != s2;

- *         }

- * </pre></code>

- * 

- * @see Matcher

- * @see Match

- * 

- */

-@SuppressWarnings("all")

-public final class TwoSynch extends BaseGeneratedEMFQuerySpecification<TwoSynch.Matcher> {

-  /**

-   * Pattern-specific match representation of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.twoSynch pattern,

-   * to be used in conjunction with {@link Matcher}.

-   * 

-   * <p>Class fields correspond to parameters of the pattern. Fields with value null are considered unassigned.

-   * Each instance is a (possibly partial) substitution of pattern parameters,

-   * usable to represent a match of the pattern in the result of a query,

-   * or to specify the bound (fixed) input parameters when issuing a query.

-   * 

-   * @see Matcher

-   * 

-   */

-  public static abstract class Match extends BasePatternMatch {

-    private Synchronization fS1;

-    

-    private Synchronization fS2;

-    

-    private static List<String> parameterNames = makeImmutableList("s1", "s2");

-    

-    private Match(final Synchronization pS1, final Synchronization pS2) {

-      this.fS1 = pS1;

-      this.fS2 = pS2;

-    }

-    

-    @Override

-    public Object get(final String parameterName) {

-      if ("s1".equals(parameterName)) return this.fS1;

-      if ("s2".equals(parameterName)) return this.fS2;

-      return null;

-    }

-    

-    public Synchronization getS1() {

-      return this.fS1;

-    }

-    

-    public Synchronization getS2() {

-      return this.fS2;

-    }

-    

-    @Override

-    public boolean set(final String parameterName, final Object newValue) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      if ("s1".equals(parameterName) ) {

-          this.fS1 = (Synchronization) newValue;

-          return true;

-      }

-      if ("s2".equals(parameterName) ) {

-          this.fS2 = (Synchronization) newValue;

-          return true;

-      }

-      return false;

-    }

-    

-    public void setS1(final Synchronization pS1) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS1 = pS1;

-    }

-    

-    public void setS2(final Synchronization pS2) {

-      if (!isMutable()) throw new java.lang.UnsupportedOperationException();

-      this.fS2 = pS2;

-    }

-    

-    @Override

-    public String patternName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.twoSynch";

-    }

-    

-    @Override

-    public List<String> parameterNames() {

-      return TwoSynch.Match.parameterNames;

-    }

-    

-    @Override

-    public Object[] toArray() {

-      return new Object[]{fS1, fS2};

-    }

-    

-    @Override

-    public TwoSynch.Match toImmutable() {

-      return isMutable() ? newMatch(fS1, fS2) : this;

-    }

-    

-    @Override

-    public String prettyPrint() {

-      StringBuilder result = new StringBuilder();

-      result.append("\"s1\"=" + prettyPrintValue(fS1) + ", ");

-      result.append("\"s2\"=" + prettyPrintValue(fS2));

-      return result.toString();

-    }

-    

-    @Override

-    public int hashCode() {

-      return Objects.hash(fS1, fS2);

-    }

-    

-    @Override

-    public boolean equals(final Object obj) {

-      if (this == obj)

-          return true;

-      if (obj == null) {

-          return false;

-      }

-      if ((obj instanceof TwoSynch.Match)) {

-          TwoSynch.Match other = (TwoSynch.Match) obj;

-          return Objects.equals(fS1, other.fS1) && Objects.equals(fS2, other.fS2);

-      } else {

-          // this should be infrequent

-          if (!(obj instanceof IPatternMatch)) {

-              return false;

-          }

-          IPatternMatch otherSig  = (IPatternMatch) obj;

-          return Objects.equals(specification(), otherSig.specification()) && Arrays.deepEquals(toArray(), otherSig.toArray());

-      }

-    }

-    

-    @Override

-    public TwoSynch specification() {

-      return TwoSynch.instance();

-    }

-    

-    /**

-     * Returns an empty, mutable match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @return the empty match.

-     * 

-     */

-    public static TwoSynch.Match newEmptyMatch() {

-      return new Mutable(null, null);

-    }

-    

-    /**

-     * Returns a mutable (partial) match.

-     * Fields of the mutable match can be filled to create a partial match, usable as matcher input.

-     * 

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return the new, mutable (partial) match object.

-     * 

-     */

-    public static TwoSynch.Match newMutableMatch(final Synchronization pS1, final Synchronization pS2) {

-      return new Mutable(pS1, pS2);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public static TwoSynch.Match newMatch(final Synchronization pS1, final Synchronization pS2) {

-      return new Immutable(pS1, pS2);

-    }

-    

-    private static final class Mutable extends TwoSynch.Match {

-      Mutable(final Synchronization pS1, final Synchronization pS2) {

-        super(pS1, pS2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return true;

-      }

-    }

-    

-    private static final class Immutable extends TwoSynch.Match {

-      Immutable(final Synchronization pS1, final Synchronization pS2) {

-        super(pS1, pS2);

-      }

-      

-      @Override

-      public boolean isMutable() {

-        return false;

-      }

-    }

-  }

-  

-  /**

-   * Generated pattern matcher API of the ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.twoSynch pattern,

-   * providing pattern-specific query methods.

-   * 

-   * <p>Use the pattern matcher on a given model via {@link #on(ViatraQueryEngine)},

-   * e.g. in conjunction with {@link ViatraQueryEngine#on(QueryScope)}.

-   * 

-   * <p>Matches of the pattern will be represented as {@link Match}.

-   * 

-   * <p>Original source:

-   * <code><pre>

-   * Simplifying model generation

-   *  

-   * {@literal @}Constraint(severity="error", message="error", key = {s1,s2})

-   * pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {

-   *    Synchronization(s1);

-   *    Synchronization(s2);

-   *    s1 != s2;

-   * }

-   * </pre></code>

-   * 

-   * @see Match

-   * @see TwoSynch

-   * 

-   */

-  public static class Matcher extends BaseMatcher<TwoSynch.Match> {

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    public static TwoSynch.Matcher on(final ViatraQueryEngine engine) {

-      // check if matcher already exists

-      Matcher matcher = engine.getExistingMatcher(querySpecification());

-      if (matcher == null) {

-          matcher = (Matcher)engine.getMatcher(querySpecification());

-      }

-      return matcher;

-    }

-    

-    /**

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * @return an initialized matcher

-     * @noreference This method is for internal matcher initialization by the framework, do not call it manually.

-     * 

-     */

-    public static TwoSynch.Matcher create() {

-      return new Matcher();

-    }

-    

-    private final static int POSITION_S1 = 0;

-    

-    private final static int POSITION_S2 = 1;

-    

-    private final static Logger LOGGER = ViatraQueryLoggingUtil.getLogger(TwoSynch.Matcher.class);

-    

-    /**

-     * Initializes the pattern matcher within an existing VIATRA Query engine.

-     * If the pattern matcher is already constructed in the engine, only a light-weight reference is returned.

-     * 

-     * @param engine the existing VIATRA Query engine in which this matcher will be created.

-     * @throws ViatraQueryRuntimeException if an error occurs during pattern matcher creation

-     * 

-     */

-    private Matcher() {

-      super(querySpecification());

-    }

-    

-    /**

-     * Returns the set of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return matches represented as a Match object.

-     * 

-     */

-    public Collection<TwoSynch.Match> getAllMatches(final Synchronization pS1, final Synchronization pS2) {

-      return rawStreamAllMatches(new Object[]{pS1, pS2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Returns a stream of all matches of the pattern that conform to the given fixed values of some parameters.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return a stream of matches represented as a Match object.

-     * 

-     */

-    public Stream<TwoSynch.Match> streamAllMatches(final Synchronization pS1, final Synchronization pS2) {

-      return rawStreamAllMatches(new Object[]{pS1, pS2});

-    }

-    

-    /**

-     * Returns an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return a match represented as a Match object, or null if no match is found.

-     * 

-     */

-    public Optional<TwoSynch.Match> getOneArbitraryMatch(final Synchronization pS1, final Synchronization pS2) {

-      return rawGetOneArbitraryMatch(new Object[]{pS1, pS2});

-    }

-    

-    /**

-     * Indicates whether the given combination of specified pattern parameters constitute a valid pattern match,

-     * under any possible substitution of the unspecified parameters (if any).

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return true if the input is a valid (partial) match of the pattern.

-     * 

-     */

-    public boolean hasMatch(final Synchronization pS1, final Synchronization pS2) {

-      return rawHasMatch(new Object[]{pS1, pS2});

-    }

-    

-    /**

-     * Returns the number of all matches of the pattern that conform to the given fixed values of some parameters.

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return the number of pattern matches found.

-     * 

-     */

-    public int countMatches(final Synchronization pS1, final Synchronization pS2) {

-      return rawCountMatches(new Object[]{pS1, pS2});

-    }

-    

-    /**

-     * Executes the given processor on an arbitrarily chosen match of the pattern that conforms to the given fixed values of some parameters.

-     * Neither determinism nor randomness of selection is guaranteed.

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @param processor the action that will process the selected match.

-     * @return true if the pattern has at least one match with the given parameter values, false if the processor was not invoked

-     * 

-     */

-    public boolean forOneArbitraryMatch(final Synchronization pS1, final Synchronization pS2, final Consumer<? super TwoSynch.Match> processor) {

-      return rawForOneArbitraryMatch(new Object[]{pS1, pS2}, processor);

-    }

-    

-    /**

-     * Returns a new (partial) match.

-     * This can be used e.g. to call the matcher with a partial match.

-     * <p>The returned match will be immutable. Use {@link #newEmptyMatch()} to obtain a mutable match object.

-     * @param pS1 the fixed value of pattern parameter s1, or null if not bound.

-     * @param pS2 the fixed value of pattern parameter s2, or null if not bound.

-     * @return the (partial) match object.

-     * 

-     */

-    public TwoSynch.Match newMatch(final Synchronization pS1, final Synchronization pS2) {

-      return TwoSynch.Match.newMatch(pS1, pS2);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs1(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S1, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs1() {

-      return rawStreamAllValuesOfs1(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs1() {

-      return rawStreamAllValuesOfs1(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs1(final TwoSynch.Match partialMatch) {

-      return rawStreamAllValuesOfs1(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s1.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs1(final Synchronization pS2) {

-      return rawStreamAllValuesOfs1(new Object[]{null, pS2});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs1(final TwoSynch.Match partialMatch) {

-      return rawStreamAllValuesOfs1(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s1.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs1(final Synchronization pS2) {

-      return rawStreamAllValuesOfs1(new Object[]{null, pS2}).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    protected Stream<Synchronization> rawStreamAllValuesOfs2(final Object[] parameters) {

-      return rawStreamAllValues(POSITION_S2, parameters).map(Synchronization.class::cast);

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs2() {

-      return rawStreamAllValuesOfs2(emptyArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs2() {

-      return rawStreamAllValuesOfs2(emptyArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs2(final TwoSynch.Match partialMatch) {

-      return rawStreamAllValuesOfs2(partialMatch.toArray());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s2.

-     * </p>

-     * <strong>NOTE</strong>: It is important not to modify the source model while the stream is being processed.

-     * If the match set of the pattern changes during processing, the contents of the stream is <strong>undefined</strong>.

-     * In such cases, either rely on {@link #getAllMatches()} or collect the results of the stream in end-user code.

-     *      

-     * @return the Stream of all values or empty set if there are no matches

-     * 

-     */

-    public Stream<Synchronization> streamAllValuesOfs2(final Synchronization pS1) {

-      return rawStreamAllValuesOfs2(new Object[]{pS1, null});

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs2(final TwoSynch.Match partialMatch) {

-      return rawStreamAllValuesOfs2(partialMatch.toArray()).collect(Collectors.toSet());

-    }

-    

-    /**

-     * Retrieve the set of values that occur in matches for s2.

-     * @return the Set of all values or empty set if there are no matches

-     * 

-     */

-    public Set<Synchronization> getAllValuesOfs2(final Synchronization pS1) {

-      return rawStreamAllValuesOfs2(new Object[]{pS1, null}).collect(Collectors.toSet());

-    }

-    

-    @Override

-    protected TwoSynch.Match tupleToMatch(final Tuple t) {

-      try {

-          return TwoSynch.Match.newMatch((Synchronization) t.get(POSITION_S1), (Synchronization) t.get(POSITION_S2));

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in tuple not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected TwoSynch.Match arrayToMatch(final Object[] match) {

-      try {

-          return TwoSynch.Match.newMatch((Synchronization) match[POSITION_S1], (Synchronization) match[POSITION_S2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    @Override

-    protected TwoSynch.Match arrayToMatchMutable(final Object[] match) {

-      try {

-          return TwoSynch.Match.newMutableMatch((Synchronization) match[POSITION_S1], (Synchronization) match[POSITION_S2]);

-      } catch(ClassCastException e) {

-          LOGGER.error("Element(s) in array not properly typed!",e);

-          return null;

-      }

-    }

-    

-    /**

-     * @return the singleton instance of the query specification of this pattern

-     * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-     * 

-     */

-    public static IQuerySpecification<TwoSynch.Matcher> querySpecification() {

-      return TwoSynch.instance();

-    }

-  }

-  

-  private TwoSynch() {

-    super(GeneratedPQuery.INSTANCE);

-  }

-  

-  /**

-   * @return the singleton instance of the query specification

-   * @throws ViatraQueryRuntimeException if the pattern definition could not be loaded

-   * 

-   */

-  public static TwoSynch instance() {

-    try{

-        return LazyHolder.INSTANCE;

-    } catch (ExceptionInInitializerError err) {

-        throw processInitializerError(err);

-    }

-  }

-  

-  @Override

-  protected TwoSynch.Matcher instantiate(final ViatraQueryEngine engine) {

-    return TwoSynch.Matcher.on(engine);

-  }

-  

-  @Override

-  public TwoSynch.Matcher instantiate() {

-    return TwoSynch.Matcher.create();

-  }

-  

-  @Override

-  public TwoSynch.Match newEmptyMatch() {

-    return TwoSynch.Match.newEmptyMatch();

-  }

-  

-  @Override

-  public TwoSynch.Match newMatch(final Object... parameters) {

-    return TwoSynch.Match.newMatch((ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[0], (ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization) parameters[1]);

-  }

-  

-  /**

-   * Inner class allowing the singleton instance of {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.TwoSynch (visibility: PUBLIC, simpleName: TwoSynch, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.TwoSynch, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)} to be created 

-   *     <b>not</b> at the class load time of the outer class, 

-   *     but rather at the first call to {@link JvmGenericType: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.TwoSynch (visibility: PUBLIC, simpleName: TwoSynch, identifier: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.TwoSynch, deprecated: <unset>) (abstract: false, static: false, final: true, packageName: ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries) (interface: false, strictFloatingPoint: false, anonymous: false)#instance()}.

-   * 

-   * <p> This workaround is required e.g. to support recursion.

-   * 

-   */

-  private static class LazyHolder {

-    private final static TwoSynch INSTANCE = new TwoSynch();

-    

-    /**

-     * Statically initializes the query specification <b>after</b> the field {@link #INSTANCE} is assigned.

-     * This initialization order is required to support indirect recursion.

-     * 

-     * <p> The static initializer is defined using a helper field to work around limitations of the code generator.

-     * 

-     */

-    private final static Object STATIC_INITIALIZER = ensureInitialized();

-    

-    public static Object ensureInitialized() {

-      INSTANCE.ensureInitializedInternal();

-      return null;

-    }

-  }

-  

-  private static class GeneratedPQuery extends BaseGeneratedEMFPQuery {

-    private final static TwoSynch.GeneratedPQuery INSTANCE = new GeneratedPQuery();

-    

-    private final PParameter parameter_s1 = new PParameter("s1", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final PParameter parameter_s2 = new PParameter("s2", "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.Synchronization", new EClassTransitiveInstancesKey((EClass)getClassifierLiteralSafe("YakinduMetamodel", "Synchronization")), PParameterDirection.INOUT);

-    

-    private final List<PParameter> parameters = Arrays.asList(parameter_s1, parameter_s2);

-    

-    private GeneratedPQuery() {

-      super(PVisibility.PUBLIC);

-    }

-    

-    @Override

-    public String getFullyQualifiedName() {

-      return "ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.twoSynch";

-    }

-    

-    @Override

-    public List<String> getParameterNames() {

-      return Arrays.asList("s1","s2");

-    }

-    

-    @Override

-    public List<PParameter> getParameters() {

-      return parameters;

-    }

-    

-    @Override

-    public Set<PBody> doGetContainedBodies() {

-      setEvaluationHints(new QueryEvaluationHint(null, QueryEvaluationHint.BackendRequirement.UNSPECIFIED));

-      Set<PBody> bodies = new LinkedHashSet<>();

-      {

-          PBody body = new PBody(this);

-          PVariable var_s1 = body.getOrCreateVariableByName("s1");

-          PVariable var_s2 = body.getOrCreateVariableByName("s2");

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          body.setSymbolicParameters(Arrays.<ExportedParameter>asList(

-             new ExportedParameter(body, var_s1, parameter_s1),

-             new ExportedParameter(body, var_s2, parameter_s2)

-          ));

-          //    Synchronization(s1)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s1), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          //    Synchronization(s2)

-          new TypeConstraint(body, Tuples.flatTupleOf(var_s2), new EClassTransitiveInstancesKey((EClass)getClassifierLiteral("YakinduMetamodel", "Synchronization")));

-          //    s1 != s2

-          new Inequality(body, var_s1, var_s2);

-          bodies.add(body);

-      }

-      {

-          PAnnotation annotation = new PAnnotation("Constraint");

-          annotation.addAttribute("severity", "error");

-          annotation.addAttribute("message", "error");

-          annotation.addAttribute("key", Arrays.asList(new Object[] {

-                              new ParameterReference("s1"), 

-                              new ParameterReference("s2")

-                              }));

-          addAnnotation(annotation);

-      }

-      return bodies;

-    }

-  }

-}

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 1995ee52..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
@@ -4,7 +4,8 @@ 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
-Require-Bundle: org.eclipse.emf.ecore,
+Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
+  org.eclipse.emf.ecore,
   org.eclipse.viatra.query.runtime.rete,
   org.eclipse.viatra.query.runtime.localsearch,
   com.google.guava,
diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
index 85e09a0a..18e58ab0 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/Fam.logicproblem
@@ -557,7 +557,7 @@
   <elements name="Root literal FunctionType" definedInType="//@types.9"/>

   <elements name="Intermediate literal FunctionType" definedInType="//@types.9"/>

   <elements name="Leaf literal FunctionType" definedInType="//@types.9"/>

-  <containmentHierarchies typesOrderedInHierarchy="//@types.3 //@types.8 //@types.0 //@types.4 //@types.2 //@types.1 //@types.6 //@types.7 //@types.5" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/>

+  <containmentHierarchies typesOrderedInHierarchy="//@types.8 //@types.5 //@types.4 //@types.6 //@types.1 //@types.7 //@types.3 //@types.2 //@types.0" containmentRelations="//@relations.0 //@relations.3 //@relations.4 //@relations.8 //@relations.11 //@relations.12"/>

   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.0" relation="//@relations.0" upper="1"/>

   <annotations xsi:type="ecore2logicannotations:LowerMultiplicityAssertion" target="//@assertions.1" relation="//@relations.1" lower="1"/>

   <annotations xsi:type="ecore2logicannotations:UpperMultiplicityAssertion" target="//@assertions.2" relation="//@relations.1" upper="1"/>

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
index b4bb6700..3d49d42c 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/output/FAMTest/vampireProblem.tptp
@@ -4,41 +4,21 @@ fof ( enumScope_FunctionType_Root , axiom , ! [ A ] : ( A = eo1 <=> e_Root_Funct
 fof ( enumScope_FunctionType_Intermediate , axiom , ! [ A ] : ( A = eo2 <=> e_Intermediate_FunctionType ( A ) ) ) .

 fof ( enumScope_FunctionType_Leaf , axiom , ! [ A ] : ( A = eo3 <=> e_Leaf_FunctionType ( A ) ) ) .

 fof ( notObjectHandler , axiom , ! [ A ] : ( ~ object ( A ) <=> ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ~ t_FunctionType ( A ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( inheritanceHierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> ( ( t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FAMTerminator ( A ) & ( t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( t_FunctionalInput ( A ) & ~ t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) | ( ~ t_FAMTerminator ( A ) & ( t_FunctionalData ( A ) & ( ~ t_FunctionalInterface ( A ) & ( ~ t_Function ( A ) & ( ~ t_InformationLink ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalInput ( A ) & t_FunctionalOutput ( A ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

+fof ( inheritanceHierarchyHandler , axiom , ! [ A ] : ( object ( A ) <=> ( ( t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( t_FunctionalOutput ( A ) & ( t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( t_InformationLink ( A ) & ~ t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) | ( ~ t_FunctionalArchitectureModel ( A ) & ( ~ t_FunctionalInput ( A ) & ( ~ t_Function ( A ) & ( ~ t_FAMTerminator ( A ) & ( ~ t_FunctionType ( A ) & ( ~ t_FunctionalElement ( A ) & ( ~ t_FunctionalOutput ( A ) & ( ~ t_FunctionalData ( A ) & ( ~ t_InformationLink ( A ) & t_FunctionalInterface ( A ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

 fof ( typeScope_min_object , axiom , ! [ A ] : ( ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = eo1 | ( A = eo2 | A = eo3 ) ) ) ) ) ) => object ( A ) ) ) .

-fof ( typeScope_max_object , axiom , ! [ A ] : ( object ( A ) => ( A = eo1 | ( A = eo2 | ( A = eo3 | ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | ( A = o5 | ( A = o6 | ( A = o7 | ( A = o8 | ( A = o9 | ( A = o10 | ( A = o11 | ( A = o12 | ( A = o13 | ( A = o14 | ( A = o15 | ( A = o16 | ( A = o17 | ( A = o18 | ( A = o19 | ( A = o20 | ( A = o21 | ( A = o22 | ( A = o23 | ( A = o24 | A = o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( typeScope_min_t_FunctionalInterface , axiom , ! [ A ] : ( ( A = o2 | A = o3 ) => ( t_FunctionalInterface ( A ) & object ( A ) ) ) ) .

-fof ( typeScope_min_t_Function , axiom , ! [ A ] : ( A = o4 => ( t_Function ( A ) & object ( A ) ) ) ) .

-fof ( typeScope_min_t_FunctionalOutput , axiom , ! [ A ] : ( ( A = o5 | ( A = o6 | A = o7 ) ) => ( t_FunctionalOutput ( A ) & object ( A ) ) ) ) .

-fof ( typeScope_max_t_Function , axiom , ! [ A ] : ( ( t_Function ( A ) & object ( A ) ) => ( A = o4 | ( A = o8 | ( A = o9 | ( A = o10 | A = o11 ) ) ) ) ) ) .

-fof ( typeScope_max_t_FunctionalOutput , axiom , ! [ A ] : ( ( t_FunctionalOutput ( A ) & object ( A ) ) => ( A = o5 | ( A = o6 | ( A = o7 | A = o8 ) ) ) ) ) .

-fof ( t_uniqueness_eo1 , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo1 != o1 & ( eo1 != o2 & ( eo1 != o3 & ( eo1 != o4 & ( eo1 != o5 & ( eo1 != o6 & ( eo1 != o7 & ( eo1 != o8 & ( eo1 != o9 & ( eo1 != o10 & ( eo1 != o11 & ( eo1 != o12 & ( eo1 != o13 & ( eo1 != o14 & ( eo1 != o15 & ( eo1 != o16 & ( eo1 != o17 & ( eo1 != o18 & ( eo1 != o19 & ( eo1 != o20 & ( eo1 != o21 & ( eo1 != o22 & ( eo1 != o23 & ( eo1 != o24 & eo1 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_eo2 , axiom , eo2 != eo3 & ( eo2 != o1 & ( eo2 != o2 & ( eo2 != o3 & ( eo2 != o4 & ( eo2 != o5 & ( eo2 != o6 & ( eo2 != o7 & ( eo2 != o8 & ( eo2 != o9 & ( eo2 != o10 & ( eo2 != o11 & ( eo2 != o12 & ( eo2 != o13 & ( eo2 != o14 & ( eo2 != o15 & ( eo2 != o16 & ( eo2 != o17 & ( eo2 != o18 & ( eo2 != o19 & ( eo2 != o20 & ( eo2 != o21 & ( eo2 != o22 & ( eo2 != o23 & ( eo2 != o24 & eo2 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_eo3 , axiom , eo3 != o1 & ( eo3 != o2 & ( eo3 != o3 & ( eo3 != o4 & ( eo3 != o5 & ( eo3 != o6 & ( eo3 != o7 & ( eo3 != o8 & ( eo3 != o9 & ( eo3 != o10 & ( eo3 != o11 & ( eo3 != o12 & ( eo3 != o13 & ( eo3 != o14 & ( eo3 != o15 & ( eo3 != o16 & ( eo3 != o17 & ( eo3 != o18 & ( eo3 != o19 & ( eo3 != o20 & ( eo3 != o21 & ( eo3 != o22 & ( eo3 != o23 & ( eo3 != o24 & eo3 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o1 , axiom , o1 != o2 & ( o1 != o3 & ( o1 != o4 & ( o1 != o5 & ( o1 != o6 & ( o1 != o7 & ( o1 != o8 & ( o1 != o9 & ( o1 != o10 & ( o1 != o11 & ( o1 != o12 & ( o1 != o13 & ( o1 != o14 & ( o1 != o15 & ( o1 != o16 & ( o1 != o17 & ( o1 != o18 & ( o1 != o19 & ( o1 != o20 & ( o1 != o21 & ( o1 != o22 & ( o1 != o23 & ( o1 != o24 & o1 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o2 , axiom , o2 != o3 & ( o2 != o4 & ( o2 != o5 & ( o2 != o6 & ( o2 != o7 & ( o2 != o8 & ( o2 != o9 & ( o2 != o10 & ( o2 != o11 & ( o2 != o12 & ( o2 != o13 & ( o2 != o14 & ( o2 != o15 & ( o2 != o16 & ( o2 != o17 & ( o2 != o18 & ( o2 != o19 & ( o2 != o20 & ( o2 != o21 & ( o2 != o22 & ( o2 != o23 & ( o2 != o24 & o2 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o3 , axiom , o3 != o4 & ( o3 != o5 & ( o3 != o6 & ( o3 != o7 & ( o3 != o8 & ( o3 != o9 & ( o3 != o10 & ( o3 != o11 & ( o3 != o12 & ( o3 != o13 & ( o3 != o14 & ( o3 != o15 & ( o3 != o16 & ( o3 != o17 & ( o3 != o18 & ( o3 != o19 & ( o3 != o20 & ( o3 != o21 & ( o3 != o22 & ( o3 != o23 & ( o3 != o24 & o3 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o4 , axiom , o4 != o5 & ( o4 != o6 & ( o4 != o7 & ( o4 != o8 & ( o4 != o9 & ( o4 != o10 & ( o4 != o11 & ( o4 != o12 & ( o4 != o13 & ( o4 != o14 & ( o4 != o15 & ( o4 != o16 & ( o4 != o17 & ( o4 != o18 & ( o4 != o19 & ( o4 != o20 & ( o4 != o21 & ( o4 != o22 & ( o4 != o23 & ( o4 != o24 & o4 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o5 , axiom , o5 != o6 & ( o5 != o7 & ( o5 != o8 & ( o5 != o9 & ( o5 != o10 & ( o5 != o11 & ( o5 != o12 & ( o5 != o13 & ( o5 != o14 & ( o5 != o15 & ( o5 != o16 & ( o5 != o17 & ( o5 != o18 & ( o5 != o19 & ( o5 != o20 & ( o5 != o21 & ( o5 != o22 & ( o5 != o23 & ( o5 != o24 & o5 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o6 , axiom , o6 != o7 & ( o6 != o8 & ( o6 != o9 & ( o6 != o10 & ( o6 != o11 & ( o6 != o12 & ( o6 != o13 & ( o6 != o14 & ( o6 != o15 & ( o6 != o16 & ( o6 != o17 & ( o6 != o18 & ( o6 != o19 & ( o6 != o20 & ( o6 != o21 & ( o6 != o22 & ( o6 != o23 & ( o6 != o24 & o6 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o7 , axiom , o7 != o8 & ( o7 != o9 & ( o7 != o10 & ( o7 != o11 & ( o7 != o12 & ( o7 != o13 & ( o7 != o14 & ( o7 != o15 & ( o7 != o16 & ( o7 != o17 & ( o7 != o18 & ( o7 != o19 & ( o7 != o20 & ( o7 != o21 & ( o7 != o22 & ( o7 != o23 & ( o7 != o24 & o7 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o8 , axiom , o8 != o9 & ( o8 != o10 & ( o8 != o11 & ( o8 != o12 & ( o8 != o13 & ( o8 != o14 & ( o8 != o15 & ( o8 != o16 & ( o8 != o17 & ( o8 != o18 & ( o8 != o19 & ( o8 != o20 & ( o8 != o21 & ( o8 != o22 & ( o8 != o23 & ( o8 != o24 & o8 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o9 , axiom , o9 != o10 & ( o9 != o11 & ( o9 != o12 & ( o9 != o13 & ( o9 != o14 & ( o9 != o15 & ( o9 != o16 & ( o9 != o17 & ( o9 != o18 & ( o9 != o19 & ( o9 != o20 & ( o9 != o21 & ( o9 != o22 & ( o9 != o23 & ( o9 != o24 & o9 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o10 , axiom , o10 != o11 & ( o10 != o12 & ( o10 != o13 & ( o10 != o14 & ( o10 != o15 & ( o10 != o16 & ( o10 != o17 & ( o10 != o18 & ( o10 != o19 & ( o10 != o20 & ( o10 != o21 & ( o10 != o22 & ( o10 != o23 & ( o10 != o24 & o10 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o11 , axiom , o11 != o12 & ( o11 != o13 & ( o11 != o14 & ( o11 != o15 & ( o11 != o16 & ( o11 != o17 & ( o11 != o18 & ( o11 != o19 & ( o11 != o20 & ( o11 != o21 & ( o11 != o22 & ( o11 != o23 & ( o11 != o24 & o11 != o25 ) ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o12 , axiom , o12 != o13 & ( o12 != o14 & ( o12 != o15 & ( o12 != o16 & ( o12 != o17 & ( o12 != o18 & ( o12 != o19 & ( o12 != o20 & ( o12 != o21 & ( o12 != o22 & ( o12 != o23 & ( o12 != o24 & o12 != o25 ) ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o13 , axiom , o13 != o14 & ( o13 != o15 & ( o13 != o16 & ( o13 != o17 & ( o13 != o18 & ( o13 != o19 & ( o13 != o20 & ( o13 != o21 & ( o13 != o22 & ( o13 != o23 & ( o13 != o24 & o13 != o25 ) ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o14 , axiom , o14 != o15 & ( o14 != o16 & ( o14 != o17 & ( o14 != o18 & ( o14 != o19 & ( o14 != o20 & ( o14 != o21 & ( o14 != o22 & ( o14 != o23 & ( o14 != o24 & o14 != o25 ) ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o15 , axiom , o15 != o16 & ( o15 != o17 & ( o15 != o18 & ( o15 != o19 & ( o15 != o20 & ( o15 != o21 & ( o15 != o22 & ( o15 != o23 & ( o15 != o24 & o15 != o25 ) ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o16 , axiom , o16 != o17 & ( o16 != o18 & ( o16 != o19 & ( o16 != o20 & ( o16 != o21 & ( o16 != o22 & ( o16 != o23 & ( o16 != o24 & o16 != o25 ) ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o17 , axiom , o17 != o18 & ( o17 != o19 & ( o17 != o20 & ( o17 != o21 & ( o17 != o22 & ( o17 != o23 & ( o17 != o24 & o17 != o25 ) ) ) ) ) ) ) .

-fof ( t_uniqueness_o18 , axiom , o18 != o19 & ( o18 != o20 & ( o18 != o21 & ( o18 != o22 & ( o18 != o23 & ( o18 != o24 & o18 != o25 ) ) ) ) ) ) .

-fof ( t_uniqueness_o19 , axiom , o19 != o20 & ( o19 != o21 & ( o19 != o22 & ( o19 != o23 & ( o19 != o24 & o19 != o25 ) ) ) ) ) .

-fof ( t_uniqueness_o20 , axiom , o20 != o21 & ( o20 != o22 & ( o20 != o23 & ( o20 != o24 & o20 != o25 ) ) ) ) .

-fof ( t_uniqueness_o21 , axiom , o21 != o22 & ( o21 != o23 & ( o21 != o24 & o21 != o25 ) ) ) .

-fof ( t_uniqueness_o22 , axiom , o22 != o23 & ( o22 != o24 & o22 != o25 ) ) .

-fof ( t_uniqueness_o23 , axiom , o23 != o24 & o23 != o25 ) .

-fof ( t_uniqueness_o24 , axiom , o24 != o25 ) .

+fof ( typeScope_max_object , axiom , ! [ A ] : ( object ( A ) => ( A = eo1 | ( A = eo2 | ( A = eo3 | ( A = o1 | ( A = o2 | ( A = o3 | ( A = o4 | A = o5 ) ) ) ) ) ) ) ) ) .

+fof ( typeScope_min_t_Function , axiom , ! [ A ] : ( A = o2 => ( t_Function ( A ) & object ( A ) ) ) ) .

+fof ( typeScope_min_t_FunctionalOutput , axiom , ! [ A ] : ( ( A = o3 | ( A = o4 | A = o5 ) ) => ( t_FunctionalOutput ( A ) & object ( A ) ) ) ) .

+fof ( typeScope_min_t_FunctionalInterface , axiom , ! [ A ] : ( ( A = o6 | A = o7 ) => ( t_FunctionalInterface ( A ) & object ( A ) ) ) ) .

+fof ( typeScope_max_t_Function , axiom , ! [ A ] : ( ( t_Function ( A ) & object ( A ) ) => A = o2 ) ) .

+fof ( typeScope_max_t_FunctionalOutput , axiom , ! [ A ] : ( ( t_FunctionalOutput ( A ) & object ( A ) ) => ( A = o3 | ( A = o4 | A = o5 ) ) ) ) .

+fof ( t_uniqueness_eo1 , axiom , eo1 != eo2 & ( eo1 != eo3 & ( eo1 != o1 & ( eo1 != o2 & ( eo1 != o3 & ( eo1 != o4 & eo1 != o5 ) ) ) ) ) ) .

+fof ( t_uniqueness_eo2 , axiom , eo2 != eo3 & ( eo2 != o1 & ( eo2 != o2 & ( eo2 != o3 & ( eo2 != o4 & eo2 != o5 ) ) ) ) ) .

+fof ( t_uniqueness_eo3 , axiom , eo3 != o1 & ( eo3 != o2 & ( eo3 != o3 & ( eo3 != o4 & eo3 != o5 ) ) ) ) .

+fof ( t_uniqueness_o1 , axiom , o1 != o2 & ( o1 != o3 & ( o1 != o4 & o1 != o5 ) ) ) .

+fof ( t_uniqueness_o2 , axiom , o2 != o3 & ( o2 != o4 & o2 != o5 ) ) .

+fof ( t_uniqueness_o3 , axiom , o3 != o4 & o3 != o5 ) .

+fof ( t_uniqueness_o4 , axiom , o4 != o5 ) .

 fof ( compliance_interface_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_interface_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalInterface ( V_1 ) ) ) ) .

 fof ( compliance_model_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_model_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_FunctionalArchitectureModel ( V_1 ) ) ) ) .

 fof ( compliance_parent_FunctionalElement , axiom , ! [ V_0 , V_1 ] : ( r_parent_FunctionalElement ( V_0 , V_1 ) => ( t_FunctionalElement ( V_0 ) & t_Function ( V_1 ) ) ) ) .

@@ -64,8 +44,8 @@ fof ( containment_noDup_r_terminator_FunctionalData , axiom , ? [ A , B ] : ( r_
 fof ( containment_t_FunctionalElement , axiom , ! [ A ] : ( t_FunctionalElement ( A ) => ? [ B ] : ( ( r_rootElements_FunctionalArchitectureModel ( B , A ) & ~ r_subElements_Function ( B , A ) ) | ( ~ r_rootElements_FunctionalArchitectureModel ( B , A ) & r_subElements_Function ( B , A ) ) ) ) ) .

 fof ( containment_t_FunctionalData , axiom , ! [ A ] : ( t_FunctionalData ( A ) => ? [ B ] : r_data_FunctionalInterface ( B , A ) ) ) .

 fof ( containment_t_InformationLink , axiom , ! [ A ] : ( t_InformationLink ( A ) => ? [ B ] : r_outgoingLinks_FunctionalOutput ( B , A ) ) ) .

-fof ( containment_t_FAMTerminator , axiom , ! [ A ] : ( t_FAMTerminator ( A ) => ? [ B ] : r_terminator_FunctionalData ( B , A ) ) ) .

 fof ( containment_t_FunctionalInterface , axiom , ! [ A ] : ( t_FunctionalInterface ( A ) => ? [ B ] : r_interface_FunctionalElement ( B , A ) ) ) .

+fof ( containment_t_FAMTerminator , axiom , ! [ A ] : ( t_FAMTerminator ( A ) => ? [ B ] : r_terminator_FunctionalData ( B , A ) ) ) .

 fof ( containment_noCycle_1 , axiom , ~ ? [ V1 ] : ( r_interface_FunctionalElement ( V1 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V1 ) | ( r_subElements_Function ( V1 , V1 ) | ( r_data_FunctionalInterface ( V1 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V1 ) | r_terminator_FunctionalData ( V1 , V1 ) ) ) ) ) ) ) .

 fof ( containment_noCycle_2 , axiom , ~ ? [ V1 , V2 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V2 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V1 ) | ( r_subElements_Function ( V2 , V1 ) | ( r_data_FunctionalInterface ( V2 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V1 ) | r_terminator_FunctionalData ( V2 , V1 ) ) ) ) ) ) ) ) .

 fof ( containment_noCycle_3 , axiom , ~ ? [ V1 , V2 , V3 ] : ( ( r_interface_FunctionalElement ( V1 , V2 ) | ( r_rootElements_FunctionalArchitectureModel ( V1 , V2 ) | ( r_subElements_Function ( V1 , V2 ) | ( r_data_FunctionalInterface ( V1 , V2 ) | ( r_outgoingLinks_FunctionalOutput ( V1 , V2 ) | r_terminator_FunctionalData ( V1 , V2 ) ) ) ) ) ) & ( ( r_interface_FunctionalElement ( V2 , V3 ) | ( r_rootElements_FunctionalArchitectureModel ( V2 , V3 ) | ( r_subElements_Function ( V2 , V3 ) | ( r_data_FunctionalInterface ( V2 , V3 ) | ( r_outgoingLinks_FunctionalOutput ( V2 , V3 ) | r_terminator_FunctionalData ( V2 , V3 ) ) ) ) ) ) & ( r_interface_FunctionalElement ( V3 , V1 ) | ( r_rootElements_FunctionalArchitectureModel ( V3 , V1 ) | ( r_subElements_Function ( V3 , V1 ) | ( r_data_FunctionalInterface ( V3 , V1 ) | ( r_outgoingLinks_FunctionalOutput ( V3 , V1 ) | r_terminator_FunctionalData ( V3 , V1 ) ) ) ) ) ) ) ) ) .

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
index 38efb459..3770f0af 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/plugin.xml
@@ -4,4 +4,14 @@
       <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="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>

 </plugin>

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 ef2e0c2f..f66ad93c 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
@@ -1,36 +1,115 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

 import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns

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

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

+import functionalarchitecture.Function

+import functionalarchitecture.FunctionalInterface

+import functionalarchitecture.FunctionalOutput

 import functionalarchitecture.FunctionalarchitecturePackage

+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

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

-import java.util.LinkedList

-import org.eclipse.emf.ecore.EObject

+import java.util.HashMap

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

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

 

 class FAMTest {

         def static void main(String[] args) {

-                //Workspace setup

+                val Ecore2Logic ecore2Logic = new Ecore2Logic

+                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

+                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

+

+                // Workspace setup

                 val inputs = new FileSystemWorkspace('''initialModels/''', "")

                 val workspace = new FileSystemWorkspace('''output/FAMTest/''', "")

                 workspace.initAndClear

-                

-                //Logicproblem writing setup

+

+                // Logicproblem writing setup

                 val reg = Resource.Factory.Registry.INSTANCE

                 val map = reg.extensionToFactoryMap

                 map.put("logicproblem", new XMIResourceFactoryImpl)

-                

 

                 println("Input and output workspaces are created")

 

+                // Load DSL

                 val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE)

                 val partialModel = GeneralTest.loadPartialModel(inputs, "FaModel.xmi")

                 val queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance)

 

                 println("DSL loaded")

+

+                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

+                var problem = modelGenerationProblem.output

+//              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

+//              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

+                workspace.writeModel(problem, "Fam.logicproblem")

+

+                println("Problem created")

+                

+                //Start Time

+                var startTime = System.currentTimeMillis

+

+                var LogicReasoner reasoner

+                // *

+                reasoner = new VampireSolver

+

+                // /////////////////////////////////////////////////////

+                // Minimum Scope

+                val classMapMin = new HashMap<Class, Integer>

+                classMapMin.put(Function, 1)

+                classMapMin.put(FunctionalInterface, 2)

+                classMapMin.put(FunctionalOutput, 3)

                 

-                GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace)  

+                val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace)

+                

+                // Maximum Scope

+                val classMapMax = new HashMap<Class, Integer>

+                classMapMax.put(Function, 5)

+                classMapMax.put(FunctionalInterface, 2)

+                classMapMax.put(FunctionalOutput, 4)

+                

+                val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace)

+

+                // Define Config File           

+                val vampireConfig = new VampireSolverConfiguration => [

+                        // add configuration things, in config file first

+                        it.documentationLevel = DocumentationLevel::FULL

+

+                        it.typeScopes.minNewElements = 4

+                        it.typeScopes.maxNewElements = 5

+                        if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

+                        if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

+                        it.contCycleLevel = 5

+                        it.uniquenessDuplicates = false

+                ]

+

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

+

+                /*/

+                 * 

+                 * reasoner = new AlloySolver

+                 * val alloyConfig = new AlloySolverConfiguration => [

+                 *      it.typeScopes.maxNewElements = 7

+                 *      it.typeScopes.minNewElements = 3

+                 *      it.solutionScope.numberOfRequiredSolution = 1

+                 *      it.typeScopes.maxNewIntegers = 0

+                 *      it.documentationLevel = DocumentationLevel::NORMAL

+                 * ]

+                 * solution = reasoner.solve(problem, alloyConfig, workspace)

+                 //*/

+                // /////////////////////////////////////////////////////

+                

+                var totalTimeMin = (System.currentTimeMillis - startTime) / 60000

+                var totalTimeSec = ((System.currentTimeMillis - startTime) / 1000) % 60

+

+                println("Problem solved")

+                println("Time was: " + totalTimeMin + ":" + totalTimeSec)

         }

-        

-        

+

 }

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 363b9356..50639577 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,33 +1,108 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

-import functionalarchitecture.FunctionalarchitecturePackage

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns

+import ca.mcgill.ecse.dslreasoner.vampire.queries

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

+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

 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

 

 class FileSystemTest {

         def static void main(String[] args) {

-                //Workspace setup

+                val Ecore2Logic ecore2Logic = new Ecore2Logic

+                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

+                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

+

+                // Workspace setup

                 val inputs = new FileSystemWorkspace('''initialModels/''', "")

                 val workspace = new FileSystemWorkspace('''output/FAMTest/''', "")

                 workspace.initAndClear

-                

-                //Logicproblem writing setup

+

+                // Logicproblem writing setup

                 val reg = Resource.Factory.Registry.INSTANCE

                 val map = reg.extensionToFactoryMap

                 map.put("logicproblem", new XMIResourceFactoryImpl)

 

                 println("Input and output workspaces are created")

 

-                val metamodel = GeneralTest.loadMetamodel(FunctionalarchitecturePackage.eINSTANCE)

-                val partialModel = GeneralTest.loadPartialModel(inputs, "FunctionalArchitectureModel.xmi")

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

+                val metamodel = GeneralTest.loadMetamodel(filesystemPackage.eINSTANCE)

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

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

 

                 println("DSL loaded")

-                

-                GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace)  

+

+                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

+                var problem = modelGenerationProblem.output

+//              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

+//              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

+                workspace.writeModel(problem, "Fam.logicproblem")

+

+                println("Problem created")

+

+                // Start Time

+                var startTime = System.currentTimeMillis

+

+                var LogicReasoner reasoner

+                // *

+                reasoner = new VampireSolver

+

+                // /////////////////////////////////////////////////////

+                // Minimum Scope

+                val classMapMin = new HashMap<Class, Integer>

+//              classMapMin.put(Function, 1)

+//              classMapMin.put(FunctionalInterface, 2)

+//              classMapMin.put(FunctionalOutput, 3)

+                val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace)

+

+                // Maximum Scope

+                val classMapMax = new HashMap<Class, Integer>

+//              classMapMax.put(Function, 5)

+//              classMapMax.put(FunctionalInterface, 2)

+//              classMapMax.put(FunctionalOutput, 4)

+                val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace)

+

+                // Define Config File           

+                val vampireConfig = new VampireSolverConfiguration => [

+                        // add configuration things, in config file first

+                        it.documentationLevel = DocumentationLevel::FULL

+

+                        it.typeScopes.minNewElements = 4

+                        it.typeScopes.maxNewElements = 5

+                        if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

+                        if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

+                        it.contCycleLevel = 5

+                        it.uniquenessDuplicates = false

+                ]

+

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

+

+                /*/

+                 * 

+                 * reasoner = new AlloySolver

+                 * val alloyConfig = new AlloySolverConfiguration => [

+                 *      it.typeScopes.maxNewElements = 7

+                 *      it.typeScopes.minNewElements = 3

+                 *      it.solutionScope.numberOfRequiredSolution = 1

+                 *      it.typeScopes.maxNewIntegers = 0

+                 *      it.documentationLevel = DocumentationLevel::NORMAL

+                 * ]

+                 * solution = reasoner.solve(problem, alloyConfig, workspace)

+                 //*/

+                // /////////////////////////////////////////////////////

+                var totalTimeMin = (System.currentTimeMillis - startTime) / 60000

+                var totalTimeSec = ((System.currentTimeMillis - startTime) / 1000) % 60

+

+                println("Problem solved")

+                println("Time was: " + totalTimeMin + ":" + totalTimeSec)

         }

-        

-        

+

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
index 949abe87..89375801 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/src/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.xtend
@@ -1,25 +1,14 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

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

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

-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory

-import functionalarchitecture.Function

-import functionalarchitecture.FunctionalInterface

-import functionalarchitecture.FunctionalOutput

 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.LogicReasoner

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

-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.viatra2logic.ViatraQuerySetDescriptor

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

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

 import hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace

 import java.util.HashMap

 import java.util.List

+import java.util.Map

 import org.eclipse.emf.ecore.EAttribute

 import org.eclipse.emf.ecore.EClass

 import org.eclipse.emf.ecore.EEnum

@@ -30,100 +19,18 @@ import org.eclipse.emf.ecore.EReference
 import org.eclipse.emf.ecore.resource.Resource

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

 import org.eclipse.viatra.query.runtime.api.IQueryGroup

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

 

-class GeneralTest {

-        def static String createAndSolveProblem(EcoreMetamodelDescriptor metamodel, List<EObject> partialModel,

-                ViatraQuerySetDescriptor queries, FileSystemWorkspace workspace) {

-                val extension VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE

-                val Ecore2Logic ecore2Logic = new Ecore2Logic

-                val Logic2Ecore logic2Ecore = new Logic2Ecore(ecore2Logic)

-                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

-                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

-

-                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

-                var problem = modelGenerationProblem.output

-//              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

-//              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

-                workspace.writeModel(problem, "Fam.logicproblem")

-

-                println("Problem created")

-                

-                var startTime = System.currentTimeMillis

-

-                var LogicResult solution

-                var LogicReasoner reasoner

-

-                // *

-                reasoner = new VampireSolver

-

-                // Setting up scope

-                val typeMapMin = new HashMap<Type, Integer>

-                val typeMapMax = new HashMap<Type, Integer>

-                val list2MapMin = metamodel.classes.toMap[s|s.name]

-                val list2MapMax = metamodel.classes.toMap[s|s.name]

-

-                // Minimum Scope

-                typeMapMin.put(ecore2Logic.TypeofEClass(modelGenerationProblem.trace, 

-                        list2MapMin.get(Function.simpleName)

-                ), 1)

-                typeMapMin.put(ecore2Logic.TypeofEClass(modelGenerationProblem.trace, 

-                        list2MapMin.get(FunctionalInterface.simpleName)

-                ), 2)

-                typeMapMin.put(ecore2Logic.TypeofEClass(modelGenerationProblem.trace, 

-                        list2MapMin.get(FunctionalOutput.simpleName)

-                ), 3)

-

-                // Maximum Scope

-                typeMapMax.put(ecore2Logic.TypeofEClass(

-                        modelGenerationProblem.trace,

-                        list2MapMax.get(Function.simpleName)

-                ), 5)

-                typeMapMax.put(ecore2Logic.TypeofEClass(

-                        modelGenerationProblem.trace,

-                        list2MapMax.get(FunctionalInterface.simpleName)

-                ), 2)

-                typeMapMax.put(ecore2Logic.TypeofEClass(

-                        modelGenerationProblem.trace,

-                        list2MapMax.get(FunctionalOutput.simpleName)

-                ), 4)

-

-                // Configuration

-                val vampireConfig = new VampireSolverConfiguration => [

-                        // add configuration things, in config file first

-                        it.documentationLevel = DocumentationLevel::FULL

-                        it.typeScopes.minNewElements = 4

-                        it.typeScopes.maxNewElements = 25

-                        it.typeScopes.minNewElementsByType = typeMapMin

-                        it.typeScopes.maxNewElementsByType = typeMapMax

-                        it.contCycleLevel = 5

-                        it.uniquenessDuplicates = false

-                ]

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

-

-                /*/

-                 * 

-                 * reasoner = new AlloySolver

-                 * val alloyConfig = new AlloySolverConfiguration => [

-                 *      it.typeScopes.maxNewElements = 7

-                 *      it.typeScopes.minNewElements = 3

-                 *      it.solutionScope.numberOfRequiredSolution = 1

-                 *      it.typeScopes.maxNewIntegers = 0

-                 *      it.documentationLevel = DocumentationLevel::NORMAL

-                 * ]

-                 * solution = reasoner.solve(problem, alloyConfig, workspace)

-                 //*/

-                 

-                 

-                var totalTimeMin = (System.currentTimeMillis - startTime)/60000

-                var totalTimeSec = ((System.currentTimeMillis - startTime)/1000)% 60

-                 

-                println("Problem solved")

-                println("Time was: " + totalTimeMin + ":" + totalTimeSec)

-                

-                

-                

+class GeneralTest {     

+        def static Map<Type, Integer> getTypeMap(Map<Class, Integer> classMap, EcoreMetamodelDescriptor metamodel, Ecore2Logic e2l, Ecore2Logic_Trace trace) {

+                val typeMap = new HashMap<Type, Integer>

+                val listMap = metamodel.classes.toMap[s|s.name]

                 

+                for (Class  elem : classMap.keySet) {

+                        typeMap.put(e2l.TypeofEClass(

+                        trace, listMap.get(elem.simpleName)

+                ), classMap.get(elem))

+                }

+                return typeMap

         }

 

         def static loadMetamodel(EPackage pckg) {

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 eb3f4b14..1fac968b 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
@@ -1,34 +1,108 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse

 

-import functionalarchitecture.FunctionalarchitecturePackage

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage

+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

 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 hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage

-import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.queries.YakinduPatterns

 

 class YakinduTest {

         def static void main(String[] args) {

-                //Workspace setup

+                val Ecore2Logic ecore2Logic = new Ecore2Logic

+                val Viatra2Logic viatra2Logic = new Viatra2Logic(ecore2Logic)

+                val InstanceModel2Logic instanceModel2Logic = new InstanceModel2Logic

+

+                // Workspace setup

                 val inputs = new FileSystemWorkspace('''initialModels/''', "")

                 val workspace = new FileSystemWorkspace('''output/YakinduTest/''', "")

                 workspace.initAndClear

-                

-                //Logicproblem writing setup

+

+                // Logicproblem writing setup

                 val reg = Resource.Factory.Registry.INSTANCE

                 val map = reg.extensionToFactoryMap

                 map.put("logicproblem", new XMIResourceFactoryImpl)

 

                 println("Input and output workspaces are created")

 

-                val metamodel = GeneralTest.loadMetamodel(YakindummPackage.eINSTANCE)

-                val partialModel = GeneralTest.loadPartialModel(inputs, "Yakindu.xmi")

+                val metamodel = GeneralTest.loadMetamodel(yakinduPackage.eINSTANCE)

+                val partialModel = GeneralTest.loadPartialModel(inputs, "yakindu/yakinduinstance.xmi")

 //              val queries = GeneralTest.loadQueries(metamodel, FamPa

+                val queries = null

 

                 println("DSL loaded")

-                

-//              GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace)  

+

+                val modelGenerationProblem = ecore2Logic.transformMetamodel(metamodel, new Ecore2LogicConfiguration())

+                var problem = modelGenerationProblem.output

+//              problem = instanceModel2Logic.transform(modelGenerationProblem, partialModel).output

+//              problem = viatra2Logic.transformQueries(queries, modelGenerationProblem, new Viatra2LogicConfiguration).output

+                workspace.writeModel(problem, "Yakindu.logicproblem")

+

+                println("Problem created")

+

+                // Start Time

+                var startTime = System.currentTimeMillis

+

+                var LogicReasoner reasoner

+                // *

+                reasoner = new VampireSolver

+

+                // /////////////////////////////////////////////////////

+                // Minimum Scope

+                val classMapMin = new HashMap<Class, Integer>

+//              classMapMin.put(Function, 1)

+//              classMapMin.put(FunctionalInterface, 2)

+//              classMapMin.put(FunctionalOutput, 3)

+                val typeMapMin = GeneralTest.getTypeMap(classMapMin, metamodel, ecore2Logic, modelGenerationProblem.trace)

+

+                // Maximum Scope

+                val classMapMax = new HashMap<Class, Integer>

+//              classMapMax.put(Function, 5)

+//              classMapMax.put(FunctionalInterface, 2)

+//              classMapMax.put(FunctionalOutput, 4)

+                val typeMapMax = GeneralTest.getTypeMap(classMapMax, metamodel, ecore2Logic, modelGenerationProblem.trace)

+

+                // Define Config File           

+                val vampireConfig = new VampireSolverConfiguration => [

+                        // add configuration things, in config file first

+                        it.documentationLevel = DocumentationLevel::FULL

+

+                        it.typeScopes.minNewElements = 20

+                        it.typeScopes.maxNewElements = 30

+                        if(typeMapMin.size != 0) it.typeScopes.minNewElementsByType = typeMapMin

+                        if(typeMapMin.size != 0) it.typeScopes.maxNewElementsByType = typeMapMax

+                        it.contCycleLevel = 5

+                        it.uniquenessDuplicates = false

+                ]

+

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

+

+                /*/

+                 * 

+                 * reasoner = new AlloySolver

+                 * val alloyConfig = new AlloySolverConfiguration => [

+                 *      it.typeScopes.maxNewElements = 7

+                 *      it.typeScopes.minNewElements = 3

+                 *      it.solutionScope.numberOfRequiredSolution = 1

+                 *      it.typeScopes.maxNewIntegers = 0

+                 *      it.documentationLevel = DocumentationLevel::NORMAL

+                 * ]

+                 * solution = reasoner.solve(problem, alloyConfig, workspace)

+                 //*/

+                // /////////////////////////////////////////////////////

+                var totalTimeMin = (System.currentTimeMillis - startTime) / 60000

+                var totalTimeSec = ((System.currentTimeMillis - startTime) / 1000) % 60

+

+                println("Problem solved")

+                println("Time was: " + totalTimeMin + ":" + totalTimeSec)

         }

-        

-        

+

 }

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 7f92eba4..55d90ac7 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 67bf34bd..8eeb2d28 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 093855d8..ab6aaf6e 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 2df2ba62..cd75a66c 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 0c97e8d1..1b920064 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/FAMTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/FAMTest.java
index 7b4bb578..5fc2a391 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
@@ -2,37 +2,110 @@ package ca.mcgill.ecse.dslreasoner.vampire.icse;
 

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

 import ca.mcgill.ecse.dslreasoner.vampire.queries.FamPatterns;

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

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

+import functionalarchitecture.Function;

+import functionalarchitecture.FunctionalOutput;

 import functionalarchitecture.FunctionalarchitecturePackage;

+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.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;

 import java.util.Map;

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

 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;

 

 @SuppressWarnings("all")

 public class FAMTest {

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

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("initialModels/");

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

-    StringConcatenation _builder_1 = new StringConcatenation();

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

-    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(FunctionalarchitecturePackage.eINSTANCE);

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

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

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

-    GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace);

+    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/FAMTest/");

+      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(FunctionalarchitecturePackage.eINSTANCE);

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

+      final ViatraQuerySetDescriptor queries = GeneralTest.loadQueries(metamodel, FamPatterns.instance());

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

+      Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

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

+      LogicProblem problem = modelGenerationProblem.getOutput();

+      workspace.writeModel(problem, "Fam.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(Function.class, Integer.valueOf(1));

+      classMapMin.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2));

+      classMapMin.put(FunctionalOutput.class, Integer.valueOf(3));

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

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

+      classMapMax.put(Function.class, Integer.valueOf(5));

+      classMapMax.put(functionalarchitecture.FunctionalInterface.class, Integer.valueOf(2));

+      classMapMax.put(FunctionalOutput.class, Integer.valueOf(4));

+      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 = 4;

+        it.typeScopes.maxNewElements = 5;

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

+    }

   }

 }

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 5994b4b4..eedec995 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
@@ -1,38 +1,100 @@
 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 functionalarchitecture.FunctionalarchitecturePackage;

-import hu.bme.mit.inf.dslreasoner.domains.transima.fam.FamPatterns;

+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.viatra2logic.ViatraQuerySetDescriptor;

+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.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

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

+import java.util.HashMap;

 import java.util.Map;

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

 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;

 

 @SuppressWarnings("all")

 public class FileSystemTest {

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

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("initialModels/");

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

-    StringConcatenation _builder_1 = new StringConcatenation();

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

-    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(FunctionalarchitecturePackage.eINSTANCE);

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

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

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

-    GeneralTest.createAndSolveProblem(metamodel, partialModel, queries, workspace);

+    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/FAMTest/");

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

+      workspace.writeModel(problem, "Fam.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>();

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

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

+      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 = 4;

+        it.typeScopes.maxNewElements = 5;

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

+    }

   }

 }

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
index 0150ef1d..0bb8f76e 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/GeneralTest.java
@@ -1,27 +1,12 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

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

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

-import ca.mcgill.ecse.dslreasoner.vampireLanguage.VampireLanguageFactory;

 import com.google.common.base.Objects;

 import com.google.common.collect.Iterables;

-import functionalarchitecture.Function;

-import functionalarchitecture.FunctionalOutput;

 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.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.logic2ecore.Logic2Ecore;

-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 hu.bme.mit.inf.dslreasoner.workspace.ReasonerWorkspace;

 import java.util.Collections;

 import java.util.HashMap;

@@ -43,94 +28,24 @@ import org.eclipse.viatra.query.runtime.api.IQueryGroup;
 import org.eclipse.viatra.query.runtime.api.IQuerySpecification;

 import org.eclipse.viatra.query.runtime.matchers.psystem.annotations.PAnnotation;

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

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

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

 import org.eclipse.xtext.xbase.lib.Functions.Function1;

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

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

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

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

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

 

 @SuppressWarnings("all")

 public class GeneralTest {

-  public static String createAndSolveProblem(final EcoreMetamodelDescriptor metamodel, final List<EObject> partialModel, final ViatraQuerySetDescriptor queries, final FileSystemWorkspace workspace) {

-    try {

-      String _xblockexpression = null;

-      {

-        @Extension

-        final VampireLanguageFactory factory = VampireLanguageFactory.eINSTANCE;

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

-        LogicProblem problem = modelGenerationProblem.getOutput();

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

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

-        long startTime = System.currentTimeMillis();

-        LogicResult solution = null;

-        LogicReasoner reasoner = null;

-        VampireSolver _vampireSolver = new VampireSolver();

-        reasoner = _vampireSolver;

-        final HashMap<Type, Integer> typeMapMin = new HashMap<Type, Integer>();

-        final HashMap<Type, Integer> typeMapMax = new HashMap<Type, Integer>();

-        final Function1<EClass, String> _function = (EClass s) -> {

-          return s.getName();

-        };

-        final Map<String, EClass> list2MapMin = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function);

-        final Function1<EClass, String> _function_1 = (EClass s) -> {

-          return s.getName();

-        };

-        final Map<String, EClass> list2MapMax = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function_1);

-        typeMapMin.put(

-          ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(), 

-            list2MapMin.get(Function.class.getSimpleName())), Integer.valueOf(1));

-        typeMapMin.put(

-          ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(), 

-            list2MapMin.get(functionalarchitecture.FunctionalInterface.class.getSimpleName())), Integer.valueOf(2));

-        typeMapMin.put(

-          ecore2Logic.TypeofEClass(modelGenerationProblem.getTrace(), 

-            list2MapMin.get(FunctionalOutput.class.getSimpleName())), Integer.valueOf(3));

-        typeMapMax.put(

-          ecore2Logic.TypeofEClass(

-            modelGenerationProblem.getTrace(), 

-            list2MapMax.get(Function.class.getSimpleName())), Integer.valueOf(5));

-        typeMapMax.put(

-          ecore2Logic.TypeofEClass(

-            modelGenerationProblem.getTrace(), 

-            list2MapMax.get(functionalarchitecture.FunctionalInterface.class.getSimpleName())), Integer.valueOf(2));

-        typeMapMax.put(

-          ecore2Logic.TypeofEClass(

-            modelGenerationProblem.getTrace(), 

-            list2MapMax.get(FunctionalOutput.class.getSimpleName())), Integer.valueOf(4));

-        VampireSolverConfiguration _vampireSolverConfiguration = new VampireSolverConfiguration();

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

-          it.documentationLevel = DocumentationLevel.FULL;

-          it.typeScopes.minNewElements = 4;

-          it.typeScopes.maxNewElements = 25;

-          it.typeScopes.minNewElementsByType = typeMapMin;

-          it.typeScopes.maxNewElementsByType = typeMapMax;

-          it.contCycleLevel = 5;

-          it.uniquenessDuplicates = false;

-        };

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

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

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

-      }

-      return _xblockexpression;

-    } catch (Throwable _e) {

-      throw Exceptions.sneakyThrow(_e);

+  public static Map<Type, Integer> getTypeMap(final Map<Class, Integer> classMap, final EcoreMetamodelDescriptor metamodel, final Ecore2Logic e2l, final Ecore2Logic_Trace trace) {

+    final HashMap<Type, Integer> typeMap = new HashMap<Type, Integer>();

+    final Function1<EClass, String> _function = (EClass s) -> {

+      return s.getName();

+    };

+    final Map<String, EClass> listMap = IterableExtensions.<String, EClass>toMap(metamodel.getClasses(), _function);

+    Set<Class> _keySet = classMap.keySet();

+    for (final Class elem : _keySet) {

+      typeMap.put(

+        e2l.TypeofEClass(trace, listMap.get(elem.getSimpleName())), classMap.get(elem));

     }

+    return typeMap;

   }

   

   public static EcoreMetamodelDescriptor loadMetamodel(final EPackage pckg) {

diff --git a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
index bea4e8a6..81079764 100644
--- a/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
+++ b/Tests/ca.mcgill.ecse.dslreasoner.vampire.test/xtend-gen/ca/mcgill/ecse/dslreasoner/vampire/icse/YakinduTest.java
@@ -1,34 +1,101 @@
 package ca.mcgill.ecse.dslreasoner.vampire.icse;

 

+import ca.mcgill.ecse.dslreasoner.standalone.test.yakindu.yakinduPackage;

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

-import hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.YakindummPackage;

+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.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.viatrasolver.partialinterpretation2logic.InstanceModel2Logic;

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

+import java.util.HashMap;

 import java.util.Map;

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

 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;

 

 @SuppressWarnings("all")

 public class YakinduTest {

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

-    StringConcatenation _builder = new StringConcatenation();

-    _builder.append("initialModels/");

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

-    StringConcatenation _builder_1 = new StringConcatenation();

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

-    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(YakindummPackage.eINSTANCE);

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

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

+    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/YakinduTest/");

+      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(yakinduPackage.eINSTANCE);

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

+      final Object queries = null;

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

+      Ecore2LogicConfiguration _ecore2LogicConfiguration = new Ecore2LogicConfiguration();

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

+      LogicProblem problem = modelGenerationProblem.getOutput();

+      workspace.writeModel(problem, "Yakindu.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>();

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

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

+      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 = 20;

+        it.typeScopes.maxNewElements = 30;

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

+    }

   }

 }

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 c0481fd8..29f8df00 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 53dc2a03..72d33e5d 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 6c84f917..e9c4c0a4 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