9 files changed, 134 insertions, 144 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
index 0e298b95..96c642fb 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/CompositeElementImpl.java
@@ -68,6 +68,7 @@ public abstract class CompositeElementImpl extends MinimalEObjectImpl.Container
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Region> getRegions() {

                 if (regions == null) {

                         regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.COMPOSITE_ELEMENT__REGIONS);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
index 232e5ab6..06ae652a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/RegionImpl.java
@@ -68,6 +68,7 @@ public class RegionImpl extends MinimalEObjectImpl.Container implements Region {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Vertex> getVertices() {

                 if (vertices == null) {

                         vertices = new EObjectContainmentEList<Vertex>(Vertex.class, this, YakindummPackage.REGION__VERTICES);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
index 6da0caec..bb1715f8 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/StateImpl.java
@@ -67,6 +67,7 @@ public class StateImpl extends RegularStateImpl implements State {
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Region> getRegions() {

                 if (regions == null) {

                         regions = new EObjectContainmentEList<Region>(Region.class, this, YakindummPackage.STATE__REGIONS);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
index ff957869..1a7a275b 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/TransitionImpl.java
@@ -66,6 +66,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Vertex getTarget() {

                 if (target != null && target.eIsProxy()) {

                         InternalEObject oldTarget = (InternalEObject)target;

@@ -107,6 +108,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setTarget(Vertex newTarget) {

                 if (newTarget != target) {

                         NotificationChain msgs = null;

@@ -126,6 +128,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Vertex getSource() {

                 if (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE) return null;

                 return (Vertex)eInternalContainer();

@@ -146,6 +149,7 @@ public class TransitionImpl extends MinimalEObjectImpl.Container implements Tran
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public void setSource(Vertex newSource) {

                 if (newSource != eInternalContainer() || (eContainerFeatureID() != YakindummPackage.TRANSITION__SOURCE && newSource != null)) {

                         if (EcoreUtil.isAncestor(this, newSource))

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
index 13df20ee..a2989ade 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/VertexImpl.java
@@ -80,6 +80,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Transition> getIncomingTransitions() {

                 if (incomingTransitions == null) {

                         incomingTransitions = new EObjectWithInverseResolvingEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__INCOMING_TRANSITIONS, YakindummPackage.TRANSITION__TARGET);

@@ -92,6 +93,7 @@ public abstract class VertexImpl extends MinimalEObjectImpl.Container implements
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EList<Transition> getOutgoingTransitions() {

                 if (outgoingTransitions == null) {

                         outgoingTransitions = new EObjectContainmentWithInverseEList<Transition>(Transition.class, this, YakindummPackage.VERTEX__OUTGOING_TRANSITIONS, YakindummPackage.TRANSITION__SOURCE);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
index 9c4fc4f1..79dd5b80 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummFactoryImpl.java
@@ -75,6 +75,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Region createRegion() {

                 RegionImpl region = new RegionImpl();

                 return region;

@@ -85,6 +86,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Transition createTransition() {

                 TransitionImpl transition = new TransitionImpl();

                 return transition;

@@ -95,6 +97,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Statechart createStatechart() {

                 StatechartImpl statechart = new StatechartImpl();

                 return statechart;

@@ -105,6 +108,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Entry createEntry() {

                 EntryImpl entry = new EntryImpl();

                 return entry;

@@ -115,6 +119,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Synchronization createSynchronization() {

                 SynchronizationImpl synchronization = new SynchronizationImpl();

                 return synchronization;

@@ -125,6 +130,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public State createState() {

                 StateImpl state = new StateImpl();

                 return state;

@@ -135,6 +141,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Choice createChoice() {

                 ChoiceImpl choice = new ChoiceImpl();

                 return choice;

@@ -145,6 +152,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public Exit createExit() {

                 ExitImpl exit = new ExitImpl();

                 return exit;

@@ -155,6 +163,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public FinalState createFinalState() {

                 FinalStateImpl finalState = new FinalStateImpl();

                 return finalState;

@@ -165,6 +174,7 @@ public class YakindummFactoryImpl extends EFactoryImpl implements YakindummFacto
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public YakindummPackage getYakindummPackage() {

                 return (YakindummPackage)getEPackage();

         }

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
index 77092c17..ccb5cb6a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/yakindu/sgraph/yakindumm/impl/YakindummPackageImpl.java
@@ -150,7 +150,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
 

         /**

          * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.

-         * 

+         *

          * <p>This method is used to initialize {@link YakindummPackage#eINSTANCE} when that field is accessed.

          * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.

          * <!-- begin-user-doc -->

@@ -164,7 +164,8 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 if (isInited) return (YakindummPackage)EPackage.Registry.INSTANCE.getEPackage(YakindummPackage.eNS_URI);

 

                 // Obtain or create and register package

-                YakindummPackageImpl theYakindummPackage = (YakindummPackageImpl)(EPackage.Registry.INSTANCE.get(eNS_URI) instanceof YakindummPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI) : new YakindummPackageImpl());

+                Object registeredYakindummPackage = EPackage.Registry.INSTANCE.get(eNS_URI);

+                YakindummPackageImpl theYakindummPackage = registeredYakindummPackage instanceof YakindummPackageImpl ? (YakindummPackageImpl)registeredYakindummPackage : new YakindummPackageImpl();

 

                 isInited = true;

 

@@ -177,7 +178,6 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
                 // Mark meta-data to indicate it can't be changed

                 theYakindummPackage.freeze();

 

-  

                 // Update the registry and return the package

                 EPackage.Registry.INSTANCE.put(YakindummPackage.eNS_URI, theYakindummPackage);

                 return theYakindummPackage;

@@ -188,6 +188,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getPseudostate() {

                 return pseudostateEClass;

         }

@@ -197,6 +198,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getVertex() {

                 return vertexEClass;

         }

@@ -206,6 +208,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getVertex_IncomingTransitions() {

                 return (EReference)vertexEClass.getEStructuralFeatures().get(0);

         }

@@ -215,6 +218,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getVertex_OutgoingTransitions() {

                 return (EReference)vertexEClass.getEStructuralFeatures().get(1);

         }

@@ -224,6 +228,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getRegion() {

                 return regionEClass;

         }

@@ -233,6 +238,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getRegion_Vertices() {

                 return (EReference)regionEClass.getEStructuralFeatures().get(0);

         }

@@ -242,6 +248,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getTransition() {

                 return transitionEClass;

         }

@@ -251,6 +258,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getTransition_Target() {

                 return (EReference)transitionEClass.getEStructuralFeatures().get(0);

         }

@@ -260,6 +268,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getTransition_Source() {

                 return (EReference)transitionEClass.getEStructuralFeatures().get(1);

         }

@@ -269,6 +278,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getStatechart() {

                 return statechartEClass;

         }

@@ -278,6 +288,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getEntry() {

                 return entryEClass;

         }

@@ -287,6 +298,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getSynchronization() {

                 return synchronizationEClass;

         }

@@ -296,6 +308,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getState() {

                 return stateEClass;

         }

@@ -305,6 +318,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getRegularState() {

                 return regularStateEClass;

         }

@@ -314,6 +328,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getCompositeElement() {

                 return compositeElementEClass;

         }

@@ -323,6 +338,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EReference getCompositeElement_Regions() {

                 return (EReference)compositeElementEClass.getEStructuralFeatures().get(0);

         }

@@ -332,6 +348,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getChoice() {

                 return choiceEClass;

         }

@@ -341,6 +358,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getExit() {

                 return exitEClass;

         }

@@ -350,6 +368,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public EClass getFinalState() {

                 return finalStateEClass;

         }

@@ -359,6 +378,7 @@ public class YakindummPackageImpl extends EPackageImpl implements YakindummPacka
          * <!-- end-user-doc -->

          * @generated

          */

+        @Override

         public YakindummFactory getYakindummFactory() {

                 return (YakindummFactory)getEFactoryInstance();

         }

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 d4ab204e..6941efca 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
@@ -8,10 +8,7 @@
       <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.unsat_multipleEntryInRegion"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transition"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transitionFrom"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.transitionTo"/>
       <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"/>
@@ -21,22 +18,8 @@
       <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.SynchronizedIncomingInSameRegionHelper1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedIncomingInSameRegionHelper2"/>
-      <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.SynchronizedRegionsAreNotSiblingsHelper1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.SynchronizedRegionsAreNotSiblingsHelper2"/>
       <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>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
index 49fb5b2f..82b908b3 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/patterns.vql
@@ -1,5 +1,4 @@
 package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu

-

 import epackage "hu.bme.mit.inf.yakindumm"

 

 /////////

@@ -22,33 +21,19 @@ pattern multipleEntryInRegion(r : Region) {
         e1 != e2;

 }

 

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

-pattern unsat_multipleEntryInRegion(sct : Statechart) {

-        Statechart(sct);

-        neg find multipleEntryInRegion(_);

-}

-

 pattern transition(t : Transition, src : Vertex, trg : Vertex) {

         Transition.source(t, src);

         Transition.target(t, trg);

 }

 

-pattern transitionFrom(t : Transition, src : Vertex) {

-        Transition.source(t, src);

-}

-

-pattern transitionTo(t : Transition, trg : Vertex) {

-        Transition.target(t, trg);

-}

-

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

 pattern incomingToEntry(t : Transition, e : Entry) {

-        find transitionTo(t, e);

+        find transition(t, _, e);

 }

 

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

 pattern noOutgoingTransitionFromEntry(e : Entry) {

-        neg find transitionFrom(_, e);

+        neg find transition(_, e, _);

 }

 

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

@@ -94,87 +79,75 @@ pattern StateInRegion(region: Region, state: State) {
 

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

 pattern choiceHasNoOutgoing(c : Choice) {

-        neg find transitionFrom(_, c);

+        neg find transition(_, c, _);

 }

 

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

 pattern choiceHasNoIncoming(c: Choice) {

-        neg find transitionTo(_, c);

+        neg find transition(_, _, c);

 }

 

 /////////

 // Synchronization

 /////////

 

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

-pattern synchHasNoOutgoing(s : Synchronization) {

-        neg find transitionFrom(_, s);

-}

-

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

-pattern synchHasNoIncoming(s : Synchronization) {

-        neg find transitionTo(_, s);

-}

-

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

-pattern SynchronizedIncomingInSameRegion(s : Synchronization, t1 : Transition, t2 : Transition) {

-        find SynchronizedIncomingInSameRegionHelper1(r, s, t1);

-        find SynchronizedIncomingInSameRegionHelper1(r, s, t2);

-        t1!=t2;

-} or {

-        find SynchronizedIncomingInSameRegionHelper2(r, s, t1);

-        find SynchronizedIncomingInSameRegionHelper2(r, s, t2);

-        t1!=t2;

-}

-

-pattern SynchronizedIncomingInSameRegionHelper1(r : Region, s : Synchronization, t1 : Transition) {

-        find transition(t1, v1, s);

-        Region.vertices(r, v1);

-}

-

-pattern SynchronizedIncomingInSameRegionHelper2(r : Region, s : Synchronization, t1 : Transition) {

-        find transition(t1, s, v1);

-        Region.vertices(r, v1);

-}

-

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

-pattern notSynchronizingStates(s : Synchronization) {

-        neg find hasMultipleOutgoingTrainsition(s);

-        neg find hasMultipleIncomingTrainsition(s);

-}

-

-pattern hasMultipleOutgoingTrainsition(v : Synchronization) {

-        find transition(_, v, trg1);

-        find transition(_, v, trg2);

-        trg1 != trg2;

-}

-

-pattern hasMultipleIncomingTrainsition(v : Synchronization) {

-        find transition(_, src1, v);

-        find transition(_, src2, v);

-        src1 != src2;

-}

-

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

-pattern SynchronizedRegionsAreNotSiblings(s : Synchronization, r1 : CompositeElement, r2 : CompositeElement) {

-        find SynchronizedRegionsAreNotSiblingsHelper1(s, r1);

-        find SynchronizedRegionsAreNotSiblingsHelper1(s, r2);

-        r1 != r2;

-} or {

-        find SynchronizedRegionsAreNotSiblingsHelper2(s, r1);

-        find SynchronizedRegionsAreNotSiblingsHelper2(s, r2);

-        r1 != r2;

-}

-

-pattern SynchronizedRegionsAreNotSiblingsHelper1(s : Synchronization, r1 : CompositeElement) {

-        find transition(_, s, v1);

-        CompositeElement.regions.vertices(r1, v1);

-}

+//@Constraint(severity="error", message="error", key = {s})

+//pattern synchHasNoOutgoing(s : Synchronization) {

+//      neg find transition(_, s, _);

+//}

+//

+//@Constraint(severity="error", message="error", key = {s})

+//pattern synchHasNoIncoming(s : Synchronization) {

+//      neg find transition(_, _, s);

+//}

+//

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

+//}

+//

+//@Constraint(severity="error", message="error", key = {s})

+//pattern notSynchronizingStates(s : Synchronization) {

+//      neg find hasMultipleOutgoingTrainsition(s);

+//      neg find hasMultipleIncomingTrainsition(s);

+//}

 

-pattern SynchronizedRegionsAreNotSiblingsHelper2(s : Synchronization, r1 : CompositeElement) {

-        find transition(_, v1, s);

-        CompositeElement.regions.vertices(r1, v1);

-}

+//pattern hasMultipleOutgoingTrainsition(v : Synchronization) {

+//      find transition(_, v, trg1);

+//      find transition(_, v, trg2);

+//      trg1 != trg2;

+//}

+//

+//pattern hasMultipleIncomingTrainsition(v : Synchronization) {

+//      find transition(_, src1, v);

+//      find transition(_, src2, v);

+//      src1 != src2;

+//}

+//

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

+//}

 

 ///////////////////////////////

 // Extra

@@ -192,23 +165,18 @@ pattern child(parent: CompositeElement, child: Vertex) {
         CompositeElement.regions.vertices(parent, child);

 }

 

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

-}

-

-//@Constraint(severity="error", message="error", key = {sct})

-//pattern unsat_SynchronizedRegionDoesNotHaveMultipleRegions(sct : Statechart) {

-//      Statechart(sct);

-//      neg find SynchronizedRegionDoesNotHaveMultipleRegions(_, _);

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

 //}

 

+

 pattern hasMultipleRegions(composite: CompositeElement) {

         CompositeElement.regions(composite,region1);

         CompositeElement.regions(composite,region2);

@@ -218,32 +186,32 @@ pattern hasMultipleRegions(composite: CompositeElement) {
 /**

  * Simplifying model generation

  */

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

-}

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

+//}

 

 /**

  * Simplifying model generation

  */

-@Constraint(severity="error", message="error", key = {s1,s2})

-pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {

-        Synchronization(s1);

-        Synchronization(s2);

-        s1 != s2;

-}

+//@Constraint(severity="error", message="error", key = {s1,s2})

+//pattern twoSynch(s1 : Synchronization, s2 : Synchronization) {

+//      Synchronization(s1);

+//      Synchronization(s2);

+//      s1 != s2;

+//}

 

 /**

  * Model generation task: at least one synch