Measurements WIP

33 files changed, 90 insertions, 1278 deletions

diff --git a/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql b/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
index f0e48d42..1d9a6b6d 100644
--- a/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
+++ b/Domains/Examples/ModelGenExampleFAM_plugin/src/hu/bme/mit/inf/dslreasoner/domains/transima/fam/FamPatterns.vql
@@ -10,7 +10,7 @@ pattern terminatorAndInformation(T : FAMTerminator, I : InformationLink) = {
         InformationLink.to(I,In);

         FunctionalInput.terminator(In,T);

 }

-

+/*

 @QueryBasedFeature 

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

         find rootElements(_Model, This);

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend
index e4c758f0..503c06ea 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.cps/src/hu/bme/mit/inf/dslreasoner/domains/cps/dse/RuleBasedCpsSolver.xtend
@@ -35,18 +35,18 @@ class RuleBasedCpsSolver {
                 val dse = new DesignSpaceExplorer
                 dse.addMetaModelPackage(CpsPackage.eINSTANCE)
                 dse.initialModel = problem.eResource.resourceSet
-                dse.addTransformationRule(createRule(RequirementNotSatisfied.instance).action [
+                dse.addTransformationRule(createRule.precondition(RequirementNotSatisfied.instance).action [
                         val app = createApplicationInstance
                         req.type.instances += app
                         req.instances += app
                 ].build)
-                dse.addTransformationRule(createRule(Allocate.instance).action [
+                dse.addTransformationRule(createRule.precondition(Allocate.instance).action [
                         app.allocatedTo = host
                 ].build)
 //              dse.addTransformationRule(createRule(UnallocateAppInstance.instance).action [
 //                      app.allocatedTo = null
 //              ].build)
-                dse.addTransformationRule(createRule(CreateHostInstance.instance).action [
+                dse.addTransformationRule(createRule.precondition(CreateHostInstance.instance).action [
                         hostType.instances += createHostInstance
                 ].build)
 //              dse.addTransformationRule(createRule(RemoveHostInstance.instance).action [
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.classpath b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.classpath
index e5e58475..6781ea8f 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.classpath
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.classpath
@@ -3,9 +3,12 @@
         <classpathentry kind="src" path="ecore-gen"/>
         <classpathentry kind="src" path="src"/>
         <classpathentry kind="src" path="xtend-gen"/>
-        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+                <attributes>
+                        <attribute name="module" value="true"/>
+                </attributes>
+        </classpathentry>
         <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
         <classpathentry kind="src" path="src-gen"/>
-        <classpathentry kind="con" path="uk.ac.kcl.inf.mdeoptimiser.languages.ui.Mopt.MDEO_CONTAINER/dsl"/>
         <classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project
index 16db5fc5..e594a173 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.project
@@ -32,6 +32,7 @@
                 </buildCommand>
         </buildSpec>
         <natures>
+                <nature>org.eclipse.sirius.nature.modelingproject</nature>
                 <nature>org.eclipse.jdt.core.javanature</nature>
                 <nature>org.eclipse.pde.PluginNature</nature>
                 <nature>org.eclipse.viatra.query.projectnature</nature>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.settings/org.eclipse.core.resources.prefs b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4a3e59e4..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding//model/satellite.henshin=UTF-8
-encoding//model/satellite.henshin_diagram=UTF-8
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF
index 36d729b4..966fc660 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/META-INF/MANIFEST.MF
@@ -7,6 +7,7 @@ Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.domains.satellite.queries,
+ hu.bme.mit.inf.dslreasoner.domains.satellite.queries.internal,
  satellite,
  satellite.impl,
  satellite.util
@@ -22,20 +23,7 @@ Require-Bundle: org.eclipse.viatra.addon.querybasedfeatures.runtime,
  org.eclipse.viatra.dse.genetic,
  hu.bme.mit.inf.dslreasoner.viatrasolver.reasoner;bundle-version="1.0.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.15.0",
- uk.ac.kcl.inf.mdeoptimiser.libraries.core;bundle-version="1.0.0",
- uk.ac.kcl.inf.mdeoptimiser.interfaces.cli;bundle-version="1.0.0",
- org.eclipse.emf.henshin.interpreter;bundle-version="1.5.0",
- uk.ac.kcl.inf.mdeoptimiser.libraries.rulegen;bundle-version="1.0.0",
- org.sidiff.common;bundle-version="1.0.0",
- org.sidiff.common.emf;bundle-version="1.0.0",
- org.sidiff.common.emf.extensions;bundle-version="1.0.0",
- org.moeaframework;bundle-version="2.13.0",
- org.apache.commons.math3;bundle-version="3.6.1",
- org.apache.commons.lang3;bundle-version="3.8.1",
- com.google.inject;bundle-version="3.0.0",
- org.sidiff.common.henshin;bundle-version="1.0.0",
- org.sidiff.serge;bundle-version="1.0.0",
- org.eclipse.viatra.query.runtime.rete;bundle-version="2.2.0"
+ org.eclipse.viatra.query.runtime.rete;bundle-version="2.0.0"
 Import-Package: org.apache.log4j
 Automatic-Module-Name: hu.bme.mit.inf.dslreasoner.domains.satellite
 Bundle-ActivationPolicy: lazy
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
index 66c468d0..2fb246c9 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/configs/generation.vsconfig
@@ -2,7 +2,7 @@ import epackage "model/satellite.ecore"
 import viatra "src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql"

 

 generate {

-        metamodel = { package satellite excluding { InterferometryMission.observationTime } }

+        metamodel = { package satellite }

         constraints = { package hu.bme.mit.inf.dslreasoner.domains.satellite.queries }

         partial-model = { "inputs/SatelliteInstance.xmi"}

         solver = ViatraSolver

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
index 90bca78c..3b9d7ecf 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/CommSubsystem.java
@@ -2,7 +2,6 @@
  */
 package satellite;
 
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EObject;
 
 /**
@@ -15,7 +14,6 @@ import org.eclipse.emf.ecore.EObject;
  * </p>
  * <ul>
  *   <li>{@link satellite.CommSubsystem#getTarget <em>Target</em>}</li>
- *   <li>{@link satellite.CommSubsystem#getSource <em>Source</em>}</li>
  * </ul>
  *
  * @see satellite.SatellitePackage#getCommSubsystem()
@@ -26,14 +24,12 @@ public interface CommSubsystem extends EObject {
 
         /**
          * Returns the value of the '<em><b>Target</b></em>' reference.
-         * It is bidirectional and its opposite is '{@link satellite.CommSubsystem#getSource <em>Source</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @return the value of the '<em>Target</em>' reference.
          * @see #setTarget(CommSubsystem)
          * @see satellite.SatellitePackage#getCommSubsystem_Target()
-         * @see satellite.CommSubsystem#getSource
-         * @model opposite="source"
+         * @model
          * @generated
          */
         CommSubsystem getTarget();
@@ -48,18 +44,4 @@ public interface CommSubsystem extends EObject {
          */
         void setTarget(CommSubsystem value);
 
-        /**
-         * Returns the value of the '<em><b>Source</b></em>' reference list.
-         * The list contents are of type {@link satellite.CommSubsystem}.
-         * It is bidirectional and its opposite is '{@link satellite.CommSubsystem#getTarget <em>Target</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Source</em>' reference list.
-         * @see satellite.SatellitePackage#getCommSubsystem_Source()
-         * @see satellite.CommSubsystem#getTarget
-         * @model opposite="target"
-         * @generated
-         */
-        EList<CommSubsystem> getSource();
-
 } // CommSubsystem
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
index 6182d7ad..8ff69955 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/ConstellationMission.java
@@ -53,7 +53,7 @@ public interface ConstellationMission extends EObject {
          * <!-- end-user-doc -->
          * @return the value of the '<em>Spacecraft</em>' containment reference list.
          * @see satellite.SatellitePackage#getConstellationMission_Spacecraft()
-         * @model containment="true" lower="2" upper="50"
+         * @model containment="true" lower="2"
          * @generated
          */
         EList<Spacecraft> getSpacecraft();
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
index eb4ea064..4e28df38 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/InterferometryMission.java
@@ -7,39 +7,11 @@ package satellite;
  * A representation of the model object '<em><b>Interferometry Mission</b></em>'.
  * <!-- end-user-doc -->
  *
- * <p>
- * The following features are supported:
- * </p>
- * <ul>
- *   <li>{@link satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}</li>
- * </ul>
  *
  * @see satellite.SatellitePackage#getInterferometryMission()
  * @model
  * @generated
  */
 public interface InterferometryMission extends ConstellationMission {
-        /**
-         * Returns the value of the '<em><b>Observation Time</b></em>' attribute.
-         * The default value is <code>"2.0"</code>.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the value of the '<em>Observation Time</em>' attribute.
-         * @see #setObservationTime(float)
-         * @see satellite.SatellitePackage#getInterferometryMission_ObservationTime()
-         * @model default="2.0" required="true"
-         * @generated
-         */
-        float getObservationTime();
-
-        /**
-         * Sets the value of the '{@link satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @param value the new value of the '<em>Observation Time</em>' attribute.
-         * @see #getObservationTime()
-         * @generated
-         */
-        void setObservationTime(float value);
 
 } // InterferometryMission
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
index 7be4ef84..9ca99311 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/SatellitePackage.java
@@ -2,7 +2,6 @@
  */
 package satellite;
 
-import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
@@ -131,22 +130,13 @@ public interface SatellitePackage extends EPackage {
         int INTERFEROMETRY_MISSION__SPACECRAFT = CONSTELLATION_MISSION__SPACECRAFT;
 
         /**
-         * The feature id for the '<em><b>Observation Time</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int INTERFEROMETRY_MISSION__OBSERVATION_TIME = CONSTELLATION_MISSION_FEATURE_COUNT + 0;
-
-        /**
          * The number of structural features of the '<em>Interferometry Mission</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int INTERFEROMETRY_MISSION_FEATURE_COUNT = CONSTELLATION_MISSION_FEATURE_COUNT + 1;
+        int INTERFEROMETRY_MISSION_FEATURE_COUNT = CONSTELLATION_MISSION_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Interferometry Mission</em>' class.
@@ -297,22 +287,13 @@ public interface SatellitePackage extends EPackage {
         int COMM_SUBSYSTEM__TARGET = 0;
 
         /**
-         * The feature id for the '<em><b>Source</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMM_SUBSYSTEM__SOURCE = 1;
-
-        /**
          * The number of structural features of the '<em>Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int COMM_SUBSYSTEM_FEATURE_COUNT = 2;
+        int COMM_SUBSYSTEM_FEATURE_COUNT = 1;
 
         /**
          * The number of operations of the '<em>Comm Subsystem</em>' class.
@@ -583,15 +564,6 @@ public interface SatellitePackage extends EPackage {
         int UHF_COMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
 
         /**
-         * The feature id for the '<em><b>Source</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int UHF_COMM_SUBSYSTEM__SOURCE = COMM_SUBSYSTEM__SOURCE;
-
-        /**
          * The number of structural features of the '<em>UHF Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -629,15 +601,6 @@ public interface SatellitePackage extends EPackage {
         int XCOMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
 
         /**
-         * The feature id for the '<em><b>Source</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int XCOMM_SUBSYSTEM__SOURCE = COMM_SUBSYSTEM__SOURCE;
-
-        /**
          * The number of structural features of the '<em>XComm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -675,15 +638,6 @@ public interface SatellitePackage extends EPackage {
         int KA_COMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
 
         /**
-         * The feature id for the '<em><b>Source</b></em>' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int KA_COMM_SUBSYSTEM__SOURCE = COMM_SUBSYSTEM__SOURCE;
-
-        /**
          * The number of structural features of the '<em>Ka Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -744,17 +698,6 @@ public interface SatellitePackage extends EPackage {
         EClass getInterferometryMission();
 
         /**
-         * Returns the meta object for the attribute '{@link satellite.InterferometryMission#getObservationTime <em>Observation Time</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the attribute '<em>Observation Time</em>'.
-         * @see satellite.InterferometryMission#getObservationTime()
-         * @see #getInterferometryMission()
-         * @generated
-         */
-        EAttribute getInterferometryMission_ObservationTime();
-
-        /**
          * Returns the meta object for class '{@link satellite.CommunicatingElement <em>Communicating Element</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -828,17 +771,6 @@ public interface SatellitePackage extends EPackage {
         EReference getCommSubsystem_Target();
 
         /**
-         * Returns the meta object for the reference list '{@link satellite.CommSubsystem#getSource <em>Source</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the reference list '<em>Source</em>'.
-         * @see satellite.CommSubsystem#getSource()
-         * @see #getCommSubsystem()
-         * @generated
-         */
-        EReference getCommSubsystem_Source();
-
-        /**
          * Returns the meta object for class '{@link satellite.Payload <em>Payload</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -989,14 +921,6 @@ public interface SatellitePackage extends EPackage {
                 EClass INTERFEROMETRY_MISSION = eINSTANCE.getInterferometryMission();
 
                 /**
-                 * The meta object literal for the '<em><b>Observation Time</b></em>' attribute feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EAttribute INTERFEROMETRY_MISSION__OBSERVATION_TIME = eINSTANCE.getInterferometryMission_ObservationTime();
-
-                /**
                  * The meta object literal for the '{@link satellite.impl.CommunicatingElementImpl <em>Communicating Element</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -1061,14 +985,6 @@ public interface SatellitePackage extends EPackage {
                 EReference COMM_SUBSYSTEM__TARGET = eINSTANCE.getCommSubsystem_Target();
 
                 /**
-                 * The meta object literal for the '<em><b>Source</b></em>' reference list feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference COMM_SUBSYSTEM__SOURCE = eINSTANCE.getCommSubsystem_Source();
-
-                /**
                  * The meta object literal for the '{@link satellite.impl.PayloadImpl <em>Payload</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
index 21e385a8..d39abd4d 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CommSubsystemImpl.java
@@ -2,16 +2,11 @@
  */
 package satellite.impl;
 
-import java.util.Collection;
 import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.InternalEObject;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-import org.eclipse.emf.ecore.util.EObjectWithInverseResolvingEList;
-import org.eclipse.emf.ecore.util.InternalEList;
 import satellite.CommSubsystem;
 import satellite.SatellitePackage;
 
@@ -24,7 +19,6 @@ import satellite.SatellitePackage;
  * </p>
  * <ul>
  *   <li>{@link satellite.impl.CommSubsystemImpl#getTarget <em>Target</em>}</li>
- *   <li>{@link satellite.impl.CommSubsystemImpl#getSource <em>Source</em>}</li>
  * </ul>
  *
  * @generated
@@ -41,16 +35,6 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
         protected CommSubsystem target;
 
         /**
-         * The cached value of the '{@link #getSource() <em>Source</em>}' reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getSource()
-         * @generated
-         * @ordered
-         */
-        protected EList<CommSubsystem> source;
-
-        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -102,91 +86,13 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
          * <!-- end-user-doc -->
          * @generated
          */
-        public NotificationChain basicSetTarget(CommSubsystem newTarget, NotificationChain msgs) {
-                CommSubsystem oldTarget = target;
-                target = newTarget;
-                if (eNotificationRequired()) {
-                        ENotificationImpl notification = new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.COMM_SUBSYSTEM__TARGET, oldTarget, newTarget);
-                        if (msgs == null)
-                                msgs = notification;
-                        else
-                                msgs.add(notification);
-                }
-                return msgs;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
         @Override
         public void setTarget(CommSubsystem newTarget) {
-                if (newTarget != target) {
-                        NotificationChain msgs = null;
-                        if (target != null)
-                                msgs = ((InternalEObject) target).eInverseRemove(this, SatellitePackage.COMM_SUBSYSTEM__SOURCE,
-                                                CommSubsystem.class, msgs);
-                        if (newTarget != null)
-                                msgs = ((InternalEObject) newTarget).eInverseAdd(this, SatellitePackage.COMM_SUBSYSTEM__SOURCE,
-                                                CommSubsystem.class, msgs);
-                        msgs = basicSetTarget(newTarget, msgs);
-                        if (msgs != null)
-                                msgs.dispatch();
-                } else if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__TARGET, newTarget,
-                                        newTarget));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EList<CommSubsystem> getSource() {
-                if (source == null) {
-                        source = new EObjectWithInverseResolvingEList<CommSubsystem>(CommSubsystem.class, this,
-                                        SatellitePackage.COMM_SUBSYSTEM__SOURCE, SatellitePackage.COMM_SUBSYSTEM__TARGET);
-                }
-                return source;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @SuppressWarnings("unchecked")
-        @Override
-        public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__TARGET:
-                        if (target != null)
-                                msgs = ((InternalEObject) target).eInverseRemove(this, SatellitePackage.COMM_SUBSYSTEM__SOURCE,
-                                                CommSubsystem.class, msgs);
-                        return basicSetTarget((CommSubsystem) otherEnd, msgs);
-                case SatellitePackage.COMM_SUBSYSTEM__SOURCE:
-                        return ((InternalEList<InternalEObject>) (InternalEList<?>) getSource()).basicAdd(otherEnd, msgs);
-                }
-                return super.eInverseAdd(otherEnd, featureID, msgs);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__TARGET:
-                        return basicSetTarget(null, msgs);
-                case SatellitePackage.COMM_SUBSYSTEM__SOURCE:
-                        return ((InternalEList<?>) getSource()).basicRemove(otherEnd, msgs);
-                }
-                return super.eInverseRemove(otherEnd, featureID, msgs);
+                CommSubsystem oldTarget = target;
+                target = newTarget;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__TARGET, oldTarget,
+                                        target));
         }
 
         /**
@@ -201,8 +107,6 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
                         if (resolve)
                                 return getTarget();
                         return basicGetTarget();
-                case SatellitePackage.COMM_SUBSYSTEM__SOURCE:
-                        return getSource();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -219,10 +123,6 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
                 case SatellitePackage.COMM_SUBSYSTEM__TARGET:
                         setTarget((CommSubsystem) newValue);
                         return;
-                case SatellitePackage.COMM_SUBSYSTEM__SOURCE:
-                        getSource().clear();
-                        getSource().addAll((Collection<? extends CommSubsystem>) newValue);
-                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -238,9 +138,6 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
                 case SatellitePackage.COMM_SUBSYSTEM__TARGET:
                         setTarget((CommSubsystem) null);
                         return;
-                case SatellitePackage.COMM_SUBSYSTEM__SOURCE:
-                        getSource().clear();
-                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -255,8 +152,6 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
                 switch (featureID) {
                 case SatellitePackage.COMM_SUBSYSTEM__TARGET:
                         return target != null;
-                case SatellitePackage.COMM_SUBSYSTEM__SOURCE:
-                        return source != null && !source.isEmpty();
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryMissionImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryMissionImpl.java
index 3401ad51..450f8a9a 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryMissionImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/InterferometryMissionImpl.java
@@ -2,12 +2,7 @@
  */
 package satellite.impl;
 
-import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-
 import satellite.InterferometryMission;
 import satellite.SatellitePackage;
 
@@ -15,37 +10,11 @@ import satellite.SatellitePackage;
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Interferometry Mission</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link satellite.impl.InterferometryMissionImpl#getObservationTime <em>Observation Time</em>}</li>
- * </ul>
  *
  * @generated
  */
 public class InterferometryMissionImpl extends ConstellationMissionImpl implements InterferometryMission {
         /**
-         * The default value of the '{@link #getObservationTime() <em>Observation Time</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getObservationTime()
-         * @generated
-         * @ordered
-         */
-        protected static final float OBSERVATION_TIME_EDEFAULT = 2.0F;
-
-        /**
-         * The cached value of the '{@link #getObservationTime() <em>Observation Time</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getObservationTime()
-         * @generated
-         * @ordered
-         */
-        protected float observationTime = OBSERVATION_TIME_EDEFAULT;
-
-        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -64,103 +33,4 @@ public class InterferometryMissionImpl extends ConstellationMissionImpl implemen
                 return SatellitePackage.Literals.INTERFEROMETRY_MISSION;
         }
 
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public float getObservationTime() {
-                return observationTime;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setObservationTime(float newObservationTime) {
-                float oldObservationTime = observationTime;
-                observationTime = newObservationTime;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET,
-                                        SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME, oldObservationTime, observationTime));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        return getObservationTime();
-                }
-                return super.eGet(featureID, resolve, coreType);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eSet(int featureID, Object newValue) {
-                switch (featureID) {
-                case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        setObservationTime((Float) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        setObservationTime(OBSERVATION_TIME_EDEFAULT);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.INTERFEROMETRY_MISSION__OBSERVATION_TIME:
-                        return observationTime != OBSERVATION_TIME_EDEFAULT;
-                }
-                return super.eIsSet(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String toString() {
-                if (eIsProxy())
-                        return super.toString();
-
-                StringBuilder result = new StringBuilder(super.toString());
-                result.append(" (observationTime: ");
-                result.append(observationTime);
-                result.append(')');
-                return result.toString();
-        }
-
 } //InterferometryMissionImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
index 17212a96..f6dc1e30 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatellitePackageImpl.java
@@ -2,7 +2,6 @@
  */
 package satellite.impl;
 
-import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
@@ -248,16 +247,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EAttribute getInterferometryMission_ObservationTime() {
-                return (EAttribute) interferometryMissionEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getCommunicatingElement() {
                 return communicatingElementEClass;
         }
@@ -328,16 +317,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EReference getCommSubsystem_Source() {
-                return (EReference) commSubsystemEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getPayload() {
                 return payloadEClass;
         }
@@ -457,7 +436,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 createEReference(constellationMissionEClass, CONSTELLATION_MISSION__SPACECRAFT);
 
                 interferometryMissionEClass = createEClass(INTERFEROMETRY_MISSION);
-                createEAttribute(interferometryMissionEClass, INTERFEROMETRY_MISSION__OBSERVATION_TIME);
 
                 communicatingElementEClass = createEClass(COMMUNICATING_ELEMENT);
                 createEReference(communicatingElementEClass, COMMUNICATING_ELEMENT__COMM_SUBSYSTEM);
@@ -469,7 +447,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
                 createEReference(commSubsystemEClass, COMM_SUBSYSTEM__TARGET);
-                createEReference(commSubsystemEClass, COMM_SUBSYSTEM__SOURCE);
 
                 payloadEClass = createEClass(PAYLOAD);
 
@@ -537,15 +514,12 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEReference(getConstellationMission_GroundStationNetwork(), this.getGroundStationNetwork(), null,
                                 "groundStationNetwork", null, 1, 1, ConstellationMission.class, !IS_TRANSIENT, !IS_VOLATILE,
                                 IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getConstellationMission_Spacecraft(), this.getSpacecraft(), null, "spacecraft", null, 2, 50,
+                initEReference(getConstellationMission_Spacecraft(), this.getSpacecraft(), null, "spacecraft", null, 2, -1,
                                 ConstellationMission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE,
                                 !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(interferometryMissionEClass, InterferometryMission.class, "InterferometryMission", !IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-                initEAttribute(getInterferometryMission_ObservationTime(), ecorePackage.getEFloat(), "observationTime", "2.0",
-                                1, 1, InterferometryMission.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID,
-                                IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(communicatingElementEClass, CommunicatingElement.class, "CommunicatingElement", IS_ABSTRACT,
                                 !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -564,12 +538,9 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 initEClass(commSubsystemEClass, CommSubsystem.class, "CommSubsystem", IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
-                initEReference(getCommSubsystem_Target(), this.getCommSubsystem(), this.getCommSubsystem_Source(), "target",
-                                null, 0, 1, CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEReference(getCommSubsystem_Source(), this.getCommSubsystem(), this.getCommSubsystem_Target(), "source",
-                                null, 0, -1, CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE,
-                                IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+                initEReference(getCommSubsystem_Target(), this.getCommSubsystem(), null, "target", null, 0, 1,
+                                CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES,
+                                !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(payloadEClass, Payload.class, "Payload", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/inputs/SatelliteInstance.xmi b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/inputs/SatelliteInstance.xmi
index 7b8e355a..3d07a199 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/inputs/SatelliteInstance.xmi
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/inputs/SatelliteInstance.xmi
@@ -4,11 +4,4 @@
     xmlns:xmi="http://www.omg.org/XMI"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:satellite="http://www.example.org/satellite"
-    xsi:schemaLocation="http://www.example.org/satellite ../model/satellite.ecore">
-  <groundStationNetwork>
-    <commSubsystem
-        xsi:type="satellite:XCommSubsystem"/>
-    <commSubsystem
-        xsi:type="satellite:KaCommSubsystem"/>
-  </groundStationNetwork>
-</satellite:InterferometryMission>
+    xsi:schemaLocation="http://www.example.org/satellite ../model/satellite.ecore"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
index 1685c756..9f17d43c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
@@ -5,12 +5,9 @@
     <eStructuralFeatures xsi:type="ecore:EReference" name="groundStationNetwork" lowerBound="1"
         eType="#//GroundStationNetwork" containment="true"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="spacecraft" lowerBound="2"
-        upperBound="50" eType="#//Spacecraft" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="InterferometryMission" eSuperTypes="#//ConstellationMission">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="observationTime" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat" defaultValueLiteral="2.0"/>
+        upperBound="-1" eType="#//Spacecraft" containment="true"/>
   </eClassifiers>
+  <eClassifiers xsi:type="ecore:EClass" name="InterferometryMission" eSuperTypes="#//ConstellationMission"/>
   <eClassifiers xsi:type="ecore:EClass" name="CommunicatingElement" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="commSubsystem" lowerBound="1"
         upperBound="2" eType="#//CommSubsystem" containment="true"/>
@@ -21,10 +18,7 @@
         containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CommSubsystem" abstract="true">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//CommSubsystem"
-        eOpposite="#//CommSubsystem/source"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" upperBound="-1"
-        eType="#//CommSubsystem" eOpposite="#//CommSubsystem/target"/>
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//CommSubsystem"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Payload" abstract="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="InterferometryPayload" eSuperTypes="#//Payload"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
index 09b5f64c..bc98abd6 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
@@ -15,9 +15,7 @@
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//ConstellationMission/groundStationNetwork"/>
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//ConstellationMission/spacecraft"/>
     </genClasses>
-    <genClasses ecoreClass="satellite.ecore#//InterferometryMission">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute satellite.ecore#//InterferometryMission/observationTime"/>
-    </genClasses>
+    <genClasses ecoreClass="satellite.ecore#//InterferometryMission"/>
     <genClasses image="false" ecoreClass="satellite.ecore#//CommunicatingElement">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/commSubsystem"/>
     </genClasses>
@@ -27,7 +25,6 @@
     </genClasses>
     <genClasses ecoreClass="satellite.ecore#//CommSubsystem">
       <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//CommSubsystem/target"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//CommSubsystem/source"/>
     </genClasses>
     <genClasses image="false" ecoreClass="satellite.ecore#//Payload"/>
     <genClasses ecoreClass="satellite.ecore#//InterferometryPayload"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.henshin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.henshin
deleted file mode 100644
index 33059424..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.henshin
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<henshin:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:henshin="http://www.eclipse.org/emf/2011/Henshin" xmi:id="_4hnG4H9CEemiUoPdWqOlQg">
-  <imports href="satellite.ecore#/"/>
-  <units xsi:type="henshin:Rule" xmi:id="_I7PyUH9EEemiUoPdWqOlQg" name="addCubeSat3U">
-    <lhs xmi:id="_I7YVMH9EEemiUoPdWqOlQg" name="Lhs">
-      <nodes xmi:id="_Qn3fwH9EEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//InterferometryMission"/>
-      </nodes>
-    </lhs>
-    <rhs xmi:id="_I9zXEH9EEemiUoPdWqOlQg" name="Rhs">
-      <nodes xmi:id="_Qn4G0H9EEemiUoPdWqOlQg" outgoing="_W5hEAH9EEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//InterferometryMission"/>
-      </nodes>
-      <nodes xmi:id="_TD7SgH9EEemiUoPdWqOlQg" incoming="_W5hEAH9EEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//CubeSat3U"/>
-      </nodes>
-      <edges xmi:id="_W5hEAH9EEemiUoPdWqOlQg" source="_Qn4G0H9EEemiUoPdWqOlQg" target="_TD7SgH9EEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//ConstellationMission/spacecraft"/>
-      </edges>
-    </rhs>
-    <mappings xmi:id="_Qn4G0X9EEemiUoPdWqOlQg" origin="_Qn3fwH9EEemiUoPdWqOlQg" image="_Qn4G0H9EEemiUoPdWqOlQg"/>
-  </units>
-  <units xsi:type="henshin:Rule" xmi:id="_kgBHMH9KEemiUoPdWqOlQg" name="addCubeSat6U">
-    <lhs xmi:id="_kgHN0H9KEemiUoPdWqOlQg" name="Lhs">
-      <nodes xmi:id="_obHq0H9KEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//InterferometryMission"/>
-      </nodes>
-    </lhs>
-    <rhs xmi:id="_kgIb8H9KEemiUoPdWqOlQg" name="Rhs">
-      <nodes xmi:id="_obIR4H9KEemiUoPdWqOlQg" outgoing="_skabcH9KEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//InterferometryMission"/>
-      </nodes>
-      <nodes xmi:id="_qHno4H9KEemiUoPdWqOlQg" incoming="_skabcH9KEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//CubeSat6U"/>
-      </nodes>
-      <edges xmi:id="_skabcH9KEemiUoPdWqOlQg" source="_obIR4H9KEemiUoPdWqOlQg" target="_qHno4H9KEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//ConstellationMission/spacecraft"/>
-      </edges>
-    </rhs>
-    <mappings xmi:id="_obIR4X9KEemiUoPdWqOlQg" origin="_obHq0H9KEemiUoPdWqOlQg" image="_obIR4H9KEemiUoPdWqOlQg"/>
-  </units>
-  <units xsi:type="henshin:Rule" xmi:id="_xFdIQH9LEemiUoPdWqOlQg" name="addSmallSat">
-    <lhs xmi:id="_xFiAwH9LEemiUoPdWqOlQg" name="Lhs">
-      <nodes xmi:id="_a7r_UH9MEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//InterferometryMission"/>
-      </nodes>
-    </lhs>
-    <rhs xmi:id="_xFjO4H9LEemiUoPdWqOlQg" name="Rhs">
-      <nodes xmi:id="_a7w30H9MEemiUoPdWqOlQg" outgoing="_hORXsH9MEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//InterferometryMission"/>
-      </nodes>
-      <nodes xmi:id="_dt0vwH9MEemiUoPdWqOlQg" incoming="_hORXsH9MEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//SmallSat"/>
-      </nodes>
-      <edges xmi:id="_hORXsH9MEemiUoPdWqOlQg" source="_a7w30H9MEemiUoPdWqOlQg" target="_dt0vwH9MEemiUoPdWqOlQg">
-        <type href="satellite.ecore#//ConstellationMission/spacecraft"/>
-      </edges>
-    </rhs>
-    <mappings xmi:id="_a7xe4H9MEemiUoPdWqOlQg" origin="_a7r_UH9MEemiUoPdWqOlQg" image="_a7w30H9MEemiUoPdWqOlQg"/>
-  </units>
-</henshin:Module>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.henshin_diagram b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.henshin_diagram
deleted file mode 100644
index a5c675d8..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.henshin_diagram
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:henshin="http://www.eclipse.org/emf/2011/Henshin" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmi:id="_4huboH9CEemiUoPdWqOlQg" type="Henshin" name="satellite.henshin_diagram" measurementUnit="Pixel">
-  <children xmi:type="notation:Shape" xmi:id="_I7V48H9EEemiUoPdWqOlQg" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_Qn4G0n9EEemiUoPdWqOlQg" source="defaultAction">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_Qn4G039EEemiUoPdWqOlQg" key="value" value="preserve"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_I7WgAH9EEemiUoPdWqOlQg" type="5001"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_I7WgAX9EEemiUoPdWqOlQg" type="7001">
-      <children xmi:type="notation:Shape" xmi:id="_Qn5U8H9EEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
-        <children xmi:type="notation:DecorationNode" xmi:id="_Qn58AH9EEemiUoPdWqOlQg" type="5002"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_Qn58AX9EEemiUoPdWqOlQg" type="5003"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_Qn58An9EEemiUoPdWqOlQg" type="7002">
-          <styles xmi:type="notation:SortingStyle" xmi:id="_Qn58A39EEemiUoPdWqOlQg"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_Qn58BH9EEemiUoPdWqOlQg"/>
-        </children>
-        <element xmi:type="henshin:Node" href="satellite.henshin#_Qn3fwH9EEemiUoPdWqOlQg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qn5U8X9EEemiUoPdWqOlQg" x="11" y="6"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_TD9HsH9EEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
-        <children xmi:type="notation:DecorationNode" xmi:id="_TD9Hsn9EEemiUoPdWqOlQg" type="5002"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_TD9Hs39EEemiUoPdWqOlQg" type="5003"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_TD9HtH9EEemiUoPdWqOlQg" type="7002">
-          <styles xmi:type="notation:SortingStyle" xmi:id="_TD9HtX9EEemiUoPdWqOlQg"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_TD9Htn9EEemiUoPdWqOlQg"/>
-        </children>
-        <element xmi:type="henshin:Node" href="satellite.henshin#_TD7SgH9EEemiUoPdWqOlQg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TD9HsX9EEemiUoPdWqOlQg" x="43" y="113"/>
-      </children>
-    </children>
-    <element xmi:type="henshin:Rule" href="satellite.henshin#_I7PyUH9EEemiUoPdWqOlQg"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_I7V48X9EEemiUoPdWqOlQg" x="35" y="18" width="171"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_kgGmwH9KEemiUoPdWqOlQg" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_obIR4n9KEemiUoPdWqOlQg" source="defaultAction">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_obI48H9KEemiUoPdWqOlQg" key="value" value="preserve"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_kgGmwn9KEemiUoPdWqOlQg" type="5001"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_kgGmw39KEemiUoPdWqOlQg" type="7001">
-      <children xmi:type="notation:Shape" xmi:id="_obKuIH9KEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
-        <children xmi:type="notation:DecorationNode" xmi:id="_obLVMH9KEemiUoPdWqOlQg" type="5002"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_obLVMX9KEemiUoPdWqOlQg" type="5003"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_obLVMn9KEemiUoPdWqOlQg" type="7002">
-          <styles xmi:type="notation:SortingStyle" xmi:id="_obLVM39KEemiUoPdWqOlQg"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_obLVNH9KEemiUoPdWqOlQg"/>
-        </children>
-        <element xmi:type="henshin:Node" href="satellite.henshin#_obHq0H9KEemiUoPdWqOlQg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_obKuIX9KEemiUoPdWqOlQg" x="15" y="8"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_qHpeEH9KEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
-        <children xmi:type="notation:DecorationNode" xmi:id="_qHpeEn9KEemiUoPdWqOlQg" type="5002"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_qHpeE39KEemiUoPdWqOlQg" type="5003"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_qHpeFH9KEemiUoPdWqOlQg" type="7002">
-          <styles xmi:type="notation:SortingStyle" xmi:id="_qHpeFX9KEemiUoPdWqOlQg"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_qHpeFn9KEemiUoPdWqOlQg"/>
-        </children>
-        <element xmi:type="henshin:Node" href="satellite.henshin#_qHno4H9KEemiUoPdWqOlQg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_qHpeEX9KEemiUoPdWqOlQg" x="42" y="109"/>
-      </children>
-    </children>
-    <element xmi:type="henshin:Rule" href="satellite.henshin#_kgBHMH9KEemiUoPdWqOlQg"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_kgGmwX9KEemiUoPdWqOlQg" x="225" y="18" width="174"/>
-  </children>
-  <children xmi:type="notation:Shape" xmi:id="_xFhZsH9LEemiUoPdWqOlQg" type="2001" fontName="Noto Sans" italic="true" lineColor="0">
-    <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_a7xe4X9MEemiUoPdWqOlQg" source="defaultAction">
-      <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_a7xe4n9MEemiUoPdWqOlQg" key="value" value="preserve"/>
-    </eAnnotations>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xFhZsn9LEemiUoPdWqOlQg" type="5001"/>
-    <children xmi:type="notation:DecorationNode" xmi:id="_xFhZs39LEemiUoPdWqOlQg" type="7001">
-      <children xmi:type="notation:Shape" xmi:id="_a7z7IH9MEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
-        <children xmi:type="notation:DecorationNode" xmi:id="_a7z7In9MEemiUoPdWqOlQg" type="5002"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_a7z7I39MEemiUoPdWqOlQg" type="5003"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_a7z7JH9MEemiUoPdWqOlQg" type="7002">
-          <styles xmi:type="notation:SortingStyle" xmi:id="_a7z7JX9MEemiUoPdWqOlQg"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_a7z7Jn9MEemiUoPdWqOlQg"/>
-        </children>
-        <element xmi:type="henshin:Node" href="satellite.henshin#_a7r_UH9MEemiUoPdWqOlQg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_a7z7IX9MEemiUoPdWqOlQg" x="12" y="8"/>
-      </children>
-      <children xmi:type="notation:Shape" xmi:id="_dt194H9MEemiUoPdWqOlQg" type="3001" fontName="Noto Sans">
-        <children xmi:type="notation:DecorationNode" xmi:id="_dt194n9MEemiUoPdWqOlQg" type="5002"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_dt19439MEemiUoPdWqOlQg" type="5003"/>
-        <children xmi:type="notation:DecorationNode" xmi:id="_dt195H9MEemiUoPdWqOlQg" type="7002">
-          <styles xmi:type="notation:SortingStyle" xmi:id="_dt195X9MEemiUoPdWqOlQg"/>
-          <styles xmi:type="notation:FilteringStyle" xmi:id="_dt195n9MEemiUoPdWqOlQg"/>
-        </children>
-        <element xmi:type="henshin:Node" href="satellite.henshin#_dt0vwH9MEemiUoPdWqOlQg"/>
-        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_dt194X9MEemiUoPdWqOlQg" x="37" y="111"/>
-      </children>
-    </children>
-    <element xmi:type="henshin:Rule" href="satellite.henshin#_xFdIQH9LEemiUoPdWqOlQg"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_xFhZsX9LEemiUoPdWqOlQg" x="418" y="18" width="172"/>
-  </children>
-  <styles xmi:type="notation:DiagramStyle" xmi:id="_4huboX9CEemiUoPdWqOlQg"/>
-  <element xmi:type="henshin:Module" href="satellite.henshin#_4hnG4H9CEemiUoPdWqOlQg"/>
-  <edges xmi:type="notation:Connector" xmi:id="_W5i5MH9EEemiUoPdWqOlQg" type="4001" source="_Qn5U8H9EEemiUoPdWqOlQg" target="_TD9HsH9EEemiUoPdWqOlQg">
-    <children xmi:type="notation:DecorationNode" xmi:id="_W5i5M39EEemiUoPdWqOlQg" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_W5jgQH9EEemiUoPdWqOlQg" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_W5jgQX9EEemiUoPdWqOlQg" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_W5jgQn9EEemiUoPdWqOlQg" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_W5i5MX9EEemiUoPdWqOlQg" fontName="Noto Sans"/>
-    <element xmi:type="henshin:Edge" href="satellite.henshin#_W5hEAH9EEemiUoPdWqOlQg"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_W5i5Mn9EEemiUoPdWqOlQg" points="[2, 35, -1, -84]$[10, 96, 7, -23]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_W5nKoH9EEemiUoPdWqOlQg" id="(0.48120300751879697,0.2391304347826087)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_skbpkH9KEemiUoPdWqOlQg" type="4001" source="_obKuIH9KEemiUoPdWqOlQg" target="_qHpeEH9KEemiUoPdWqOlQg">
-    <children xmi:type="notation:DecorationNode" xmi:id="_skbpk39KEemiUoPdWqOlQg" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_skbplH9KEemiUoPdWqOlQg" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_skbplX9KEemiUoPdWqOlQg" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_skbpln9KEemiUoPdWqOlQg" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_skbpkX9KEemiUoPdWqOlQg" fontName="Noto Sans"/>
-    <element xmi:type="henshin:Edge" href="satellite.henshin#_skabcH9KEemiUoPdWqOlQg"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_skbpkn9KEemiUoPdWqOlQg" points="[-4, 23, 0, -66]$[-4, 78, 0, -11]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_skc3sH9KEemiUoPdWqOlQg" id="(0.5,0.2391304347826087)"/>
-  </edges>
-  <edges xmi:type="notation:Connector" xmi:id="_hOR-wH9MEemiUoPdWqOlQg" type="4001" source="_a7z7IH9MEemiUoPdWqOlQg" target="_dt194H9MEemiUoPdWqOlQg">
-    <children xmi:type="notation:DecorationNode" xmi:id="_hOSl0H9MEemiUoPdWqOlQg" type="6001">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hOSl0X9MEemiUoPdWqOlQg" y="40"/>
-    </children>
-    <children xmi:type="notation:DecorationNode" xmi:id="_hOSl0n9MEemiUoPdWqOlQg" type="6002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_hOSl039MEemiUoPdWqOlQg" y="60"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_hOR-wX9MEemiUoPdWqOlQg" fontName="Noto Sans"/>
-    <element xmi:type="henshin:Edge" href="satellite.henshin#_hORXsH9MEemiUoPdWqOlQg"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_hOR-wn9MEemiUoPdWqOlQg" points="[-5, 23, 0, -96]$[-4, 126, 1, 7]"/>
-    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_hOVCEH9MEemiUoPdWqOlQg" id="(0.5454545454545454,0.8478260869565217)"/>
-  </edges>
-</notation:Diagram>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite_fixup.henshin b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite_fixup.henshin
deleted file mode 100644
index 224ced8f..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite_fixup.henshin
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<henshin:Module xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:henshin="http://www.eclipse.org/emf/2011/Henshin" xmi:id="_4hnG4H9CEemiUoPdWqOlQg">
-  <imports href="http://www.example.org/satellite#/"/>
-  <units xsi:type="henshin:Rule" xmi:id="_I7PyUH9EEemiUoPdWqOlQg" name="addCubeSat3U">
-    <lhs xmi:id="_I7YVMH9EEemiUoPdWqOlQg" name="Lhs">
-      <nodes xmi:id="_Qn3fwH9EEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//InterferometryMission"/>
-      </nodes>
-    </lhs>
-    <rhs xmi:id="_I9zXEH9EEemiUoPdWqOlQg" name="Rhs">
-      <nodes xmi:id="_Qn4G0H9EEemiUoPdWqOlQg" outgoing="_W5hEAH9EEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//InterferometryMission"/>
-      </nodes>
-      <nodes xmi:id="_TD7SgH9EEemiUoPdWqOlQg" incoming="_W5hEAH9EEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//CubeSat3U"/>
-      </nodes>
-      <edges xmi:id="_W5hEAH9EEemiUoPdWqOlQg" source="_Qn4G0H9EEemiUoPdWqOlQg" target="_TD7SgH9EEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//ConstellationMission/spacecraft"/>
-      </edges>
-    </rhs>
-    <mappings xmi:id="_Qn4G0X9EEemiUoPdWqOlQg" origin="_Qn3fwH9EEemiUoPdWqOlQg" image="_Qn4G0H9EEemiUoPdWqOlQg"/>
-  </units>
-  <units xsi:type="henshin:Rule" xmi:id="_kgBHMH9KEemiUoPdWqOlQg" name="addCubeSat6U">
-    <lhs xmi:id="_kgHN0H9KEemiUoPdWqOlQg" name="Lhs">
-      <nodes xmi:id="_obHq0H9KEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//InterferometryMission"/>
-      </nodes>
-    </lhs>
-    <rhs xmi:id="_kgIb8H9KEemiUoPdWqOlQg" name="Rhs">
-      <nodes xmi:id="_obIR4H9KEemiUoPdWqOlQg" outgoing="_skabcH9KEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//InterferometryMission"/>
-      </nodes>
-      <nodes xmi:id="_qHno4H9KEemiUoPdWqOlQg" incoming="_skabcH9KEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//CubeSat6U"/>
-      </nodes>
-      <edges xmi:id="_skabcH9KEemiUoPdWqOlQg" source="_obIR4H9KEemiUoPdWqOlQg" target="_qHno4H9KEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//ConstellationMission/spacecraft"/>
-      </edges>
-    </rhs>
-    <mappings xmi:id="_obIR4X9KEemiUoPdWqOlQg" origin="_obHq0H9KEemiUoPdWqOlQg" image="_obIR4H9KEemiUoPdWqOlQg"/>
-  </units>
-  <units xsi:type="henshin:Rule" xmi:id="_xFdIQH9LEemiUoPdWqOlQg" name="addSmallSat">
-    <lhs xmi:id="_xFiAwH9LEemiUoPdWqOlQg" name="Lhs">
-      <nodes xmi:id="_a7r_UH9MEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//InterferometryMission"/>
-      </nodes>
-    </lhs>
-    <rhs xmi:id="_xFjO4H9LEemiUoPdWqOlQg" name="Rhs">
-      <nodes xmi:id="_a7w30H9MEemiUoPdWqOlQg" outgoing="_hORXsH9MEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//InterferometryMission"/>
-      </nodes>
-      <nodes xmi:id="_dt0vwH9MEemiUoPdWqOlQg" incoming="_hORXsH9MEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//SmallSat"/>
-      </nodes>
-      <edges xmi:id="_hORXsH9MEemiUoPdWqOlQg" source="_a7w30H9MEemiUoPdWqOlQg" target="_dt0vwH9MEemiUoPdWqOlQg">
-        <type href="http://www.example.org/satellite#//ConstellationMission/spacecraft"/>
-      </edges>
-    </rhs>
-    <mappings xmi:id="_a7xe4H9MEemiUoPdWqOlQg" origin="_a7r_UH9MEemiUoPdWqOlQg" image="_a7w30H9MEemiUoPdWqOlQg"/>
-  </units>
-</henshin:Module>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
index a07867dc..b0b77996 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/plugin.xml
@@ -8,6 +8,7 @@
     <group group="org.eclipse.viatra.query.runtime.extensibility.SingletonExtensionFactory:hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries" id="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries">
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.communicationLinkDoesNotStartAtContainingElement"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.transmittingGroundStationNetwork"/>
+      <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.roundStationNetworkUHF"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.notEnoughInterferometryPayloads"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noLinkToGroundStation"/>
       <query-specification fqn="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.noPotentialLinkToGroundStation"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/representations.aird b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/representations.aird
new file mode 100644
index 00000000..efa8e366
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/representations.aird
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<viewpoint:DAnalysis xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:viewpoint="http://www.eclipse.org/sirius/1.1.0" uid="_HbzhML6wEemt9IEpCgcgZA" version="14.1.0.201810161215"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.xtend
deleted file mode 100644
index 43b2902f..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/CostObjective.xtend
+++ /dev/null
@@ -1,13 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo
-
-//import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.CostMetric
-//
-//class CostObjective extends MetricBasedGuidanceFunction {
-//      new() {
-//              super(CostMetric.instance)
-//      }
-//
-//      override getName() {
-//              "Cost"
-//      }
-//}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/LocalSearchEngineManager.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/LocalSearchEngineManager.xtend
deleted file mode 100644
index ee7f0060..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/LocalSearchEngineManager.xtend
+++ /dev/null
@@ -1,31 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries
-import java.util.WeakHashMap
-import org.eclipse.emf.ecore.EObject
-import org.eclipse.viatra.query.runtime.api.AdvancedViatraQueryEngine
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngine
-import org.eclipse.viatra.query.runtime.api.ViatraQueryEngineOptions
-import org.eclipse.viatra.query.runtime.emf.EMFScope
-import org.eclipse.viatra.query.runtime.localsearch.matcher.integration.LocalSearchHints
-
-class LocalSearchEngineManager {
-        public static val INSTANCE = new LocalSearchEngineManager
-
-        val WeakHashMap<EObject, ViatraQueryEngine> engineMap = new WeakHashMap
-
-        private new() {
-        }
-
-        def getEngine(EObject eObject) {
-                engineMap.computeIfAbsent(eObject) [
-                        val scope = new EMFScope(it)
-                        val localSearchHints = LocalSearchHints.^default.build
-                        val options = ViatraQueryEngineOptions.defineOptions.withDefaultHint(localSearchHints).withDefaultBackend(
-                                localSearchHints.queryBackendFactory).build
-                        val engine = AdvancedViatraQueryEngine.on(scope, options)
-                        SatelliteQueries.instance.prepare(engine)
-                        engine
-                ]
-        }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/MetricBasedGuidanceFunction.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/MetricBasedGuidanceFunction.xtend
deleted file mode 100644
index 1529794f..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/MetricBasedGuidanceFunction.xtend
+++ /dev/null
@@ -1,47 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo
-
-import org.eclipse.viatra.query.runtime.api.IPatternMatch
-import org.eclipse.viatra.query.runtime.api.IQuerySpecification
-import org.eclipse.viatra.query.runtime.api.ViatraQueryMatcher
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.IGuidanceFunction
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.interpreter.guidance.Solution
-
-abstract class MetricBasedGuidanceFunction implements IGuidanceFunction {
-        val IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> querySpecification
-
-        protected new(IQuerySpecification<? extends ViatraQueryMatcher<? extends IPatternMatch>> querySpecification) {
-                this.querySpecification = querySpecification
-                if (querySpecification.parameters.size != 1) {
-                        throw new IllegalArgumentException("Metric must have a single parameter")
-                }
-        }
-
-        override computeFitness(Solution model) {
-                val value = getMetricValue(model)
-                computeFitness(value)
-        }
-
-        protected def double computeFitness(double metricValue) {
-                metricValue
-        }
-
-        private def getMetricValue(Solution solution) {
-                val model = solution.model
-                val queryEngine = LocalSearchEngineManager.INSTANCE.getEngine(model)
-                val matcher = querySpecification.getMatcher(queryEngine)
-                val iterator = matcher.allMatches.iterator
-                if (!iterator.hasNext) {
-                        throw new IllegalStateException("Too few matches")
-                }
-                val objectValue = iterator.next.get(0)
-                if (objectValue instanceof Number) {
-                        val doubleValue = objectValue.doubleValue
-                        if (iterator.hasNext) {
-                                throw new IllegalStateException("Too many matches")
-                        }
-                        doubleValue
-                } else {
-                        throw new IllegalStateException("Metric value must be a number")
-                }
-        }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/PatternMatchConstraint.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/PatternMatchConstraint.xtend
deleted file mode 100644
index b238e64f..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/PatternMatchConstraint.xtend
+++ /dev/null
@@ -1,29 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo
-
-import com.google.common.collect.ImmutableList
-import hu.bme.mit.inf.dslreasoner.domains.satellite.queries.SatelliteQueries
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.IGuidanceFunction
-import uk.ac.kcl.inf.mdeoptimiser.libraries.core.optimisation.interpreter.guidance.Solution
-
-class PatternMatchConstraint implements IGuidanceFunction {
-        static val CONSTRAINT_ANNOTATION_NAME = "Constraint"
-
-        val queries = ImmutableList.copyOf(SatelliteQueries.instance.specifications.filter [
-                allAnnotations.exists[name == CONSTRAINT_ANNOTATION_NAME]
-        ])
-
-        override getName() {
-                "PatternMatch"
-        }
-
-        override computeFitness(Solution solution) {
-                val model = solution.model
-                val queryEngine = LocalSearchEngineManager.INSTANCE.getEngine(model)
-                var int matchCount = 0
-                for (query : queries) {
-                        val matcher = query.getMatcher(queryEngine)
-                        matchCount += matcher.countMatches
-                }
-                matchCount
-        }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.xtend b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.xtend
deleted file mode 100644
index 58034c43..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/SatelliteMdeOptimiserMain.xtend
+++ /dev/null
@@ -1,51 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo
-
-import java.io.BufferedReader
-import java.io.BufferedWriter
-import java.io.FileReader
-import java.io.FileWriter
-import java.util.Map
-import org.eclipse.emf.ecore.EPackage
-import org.eclipse.emf.ecore.resource.Resource
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl
-import satellite.SatellitePackage
-import uk.ac.kcl.inf.mdeoptimiser.interfaces.cli.Run
-
-class SatelliteMdeOptimiserMain {
-        static val PROJECT_PATH = "."
-        static val MOPT_PATH = "src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt"
-
-        private new() {
-                new IllegalStateException("This is a static utility class and should not be instantiated directly.")
-        }
-
-        public static def void main(String[] args) {
-                Resource.Factory.Registry.INSTANCE.extensionToFactoryMap.put(Resource.Factory.Registry.DEFAULT_EXTENSION,
-                        new XMIResourceFactoryImpl)
-                EPackage.Registry.INSTANCE.put(SatellitePackage.eNS_URI, SatellitePackage.eINSTANCE)
-                fixupHenshinModel("model/satellite.henshin", "model/satellite_fixup.henshin",
-                        #{"satellite.ecore" -> SatellitePackage.eNS_URI})
-                Run.main(#["-p", PROJECT_PATH, "-m", MOPT_PATH])
-        }
-
-        private def static void fixupHenshinModel(String originalPath, String outputPath, Map<String, String> remapMap) {
-                val reader = new BufferedReader(new FileReader(originalPath))
-                try {
-                        val writer = new BufferedWriter(new FileWriter(outputPath))
-                        try {
-                                var String line
-                                while ((line = reader.readLine) !== null) {
-                                        for (entry : remapMap.entrySet) {
-                                                line = line.replace(entry.key, entry.value)
-                                        }
-                                        writer.write(line)
-                                        writer.write("\n")
-                                }
-                        } finally {
-                                writer.close
-                        }
-                } finally {
-                        reader.close
-                }
-        }
-}
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt
deleted file mode 100644
index e9bd1a64..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/mdeo/satellite.mopt
+++ /dev/null
@@ -1,36 +0,0 @@
-problem {
-        basepath <model>
-        metamodel <satellite.SatellitePackage>
-        model <../inputs/SatelliteInstance.xmi>
-}
-
-goal {
-        objective Cost minimise java { "hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo.CostObjective" }
-        constraint PatternMatch java { "hu.bme.mit.inf.dslreasoner.domains.satellite.mdeo.PatternMatchConstraint" }
-}
-
-search {
-//      mutate using <satellite_fixup.henshin> unit "addCubeSat3U"
-        mutate { "CubeSat3U" }
-        mutate { "CubeSat6U" }
-        mutate { "SmallSat" }
-        mutate { "InterferometryPayload" }
-        mutate { "UHFCommSubsystem" }
-        mutate { "XCommSubsystem" }
-        mutate { "KaCommSubsystem" }
-}
-
-solver {
-        optimisation provider moea algorithm NSGAII {
-                variation: mutation
-                population: 25
-                mutation.step: 3
-                mutation.strategy: random
-        }
-
-        termination {
-                time: 120
-        }
-
-        batches 1
-}
\ No newline at end of file
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
index c1d3f7d3..1f83a3b0 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
@@ -21,6 +21,13 @@ pattern transmittingGroundStationNetwork(Station : GroundStationNetwork) {
         find transmittingCommSubsystem(Station, _);
 }
 
+@Constraint(severity = "error", key = {Station},
+        message = "The ground station network may not have UHF communication subsystems.")
+pattern roundStationNetworkUHF(Station : GroundStationNetwork) {
+        CommunicatingElement.commSubsystem(Station, Comm);
+        UHFCommSubsystem(Comm);
+}
+
 // At least two spacecraft must have the interferometry payload configured
 
 @Constraint(severity = "error", key = {Mission},
@@ -97,10 +104,6 @@ private pattern cubeSat3U(Sat : CubeSat3U) {
         CubeSat3U(Sat);
 }
 
-private pattern cubeSat6U(Sat : CubeSat6U) {
-        CubeSat6U(Sat);
-}
-
 // No communication loops may exist
 // No spacecraft may directly communicate with itself
 
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
index 81ee8677..2666dc5e 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/META-INF/MANIFEST.MF
@@ -9,8 +9,7 @@ Bundle-Localization: plugin
 Export-Package: hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm,
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.impl,
  hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph.yakindumm.util,
- hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu,
- hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated
+ hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu
 Require-Bundle: org.eclipse.viatra.query.runtime,
  org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
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 993ec75d..7bf4a20b 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
@@ -9,6 +9,8 @@
       <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.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,10 +23,14 @@
       <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"/>
@@ -32,72 +38,4 @@
       <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"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.entryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noEntryInRegion_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleEntryInRegion_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.transition_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.incomingToEntry_5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noOutgoingTransitionFromEntry_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.multipleTransitionFromEntry_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromExit_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.outgoingFromFinal_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.noStateInRegion_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.StateInRegion_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoOutgoing_M6"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M0"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M1"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M2"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M3"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M4"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M5"/>
-      <query-specification fqn="hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated.choiceHasNoIncoming_M6"/>
-    </group>
-  </extension>
 </plugin>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/mutated/mutated.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/mutated/mutated.vql
deleted file mode 100644
index 58f66fe2..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.yakindu.sgraph/queries/hu/bme/mit/inf/dslreasoner/partialsnapshot_mavo/yakindu/mutated/mutated.vql
+++ /dev/null
@@ -1,270 +0,0 @@
-package hu.bme.mit.inf.dslreasoner.partialsnapshot_mavo.yakindu.mutated

-

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

-

-/////////

-// Entry

-/////////

-

-pattern entryInRegion_M0(r1 : Region, e1 : Entry) {

-        Region.vertices(r1, e1);

-}

-pattern entryInRegion_M1(r1 : Region, e1) {

-        Region.vertices(r1, e1);

-}

-pattern entryInRegion_M2(r1 : Region, e1: Entry) {

-        // For positive constraint

-        Region(r1);Entry(e1);

-}

-

-

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

-pattern noEntryInRegion_M0(r1 : Region) {

-        neg find entryInRegion_M0(r1, _);

-}

-pattern noEntryInRegion_M1(r1 : Region) {

-        neg find entryInRegion_M1(r1, _);

-}

-pattern noEntryInRegion_M2(r1 : Region) {

-        neg find entryInRegion_M2(r1, _);

-}

-pattern noEntryInRegion_M3(r1 : Region) {

-        find entryInRegion_M0(r1, _);

-}

-pattern noEntryInRegion_M4(r1 : Region) {

-        find entryInRegion_M1(r1, _);

-}

-pattern noEntryInRegion_M5(r1 : Region) {

-        find entryInRegion_M2(r1, _);

-}

-

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

-pattern multipleEntryInRegion_M0(r : Region) {

-        find entryInRegion_M0(r, e1);

-        find entryInRegion_M0(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M1(r : Region) {

-        find entryInRegion_M1(r, e1);

-        find entryInRegion_M0(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M2(r : Region) {

-        find entryInRegion_M2(r, e1);

-        find entryInRegion_M0(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M3(r : Region) {

-        find entryInRegion_M0(r, e1);

-        find entryInRegion_M1(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M4(r : Region) {

-        find entryInRegion_M2(r, e1);

-        find entryInRegion_M2(r, e2);

-        e1 != e2;

-}

-pattern multipleEntryInRegion_M5(r : Region) {

-        find entryInRegion_M0(r, e1);

-        find entryInRegion_M0(r, e2);

-}

-

-

-pattern transition_M0(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t, src);

-        Transition.target(t, trg);

-}

-pattern transition_M1(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t, src);

-        Vertex(trg);

-}

-pattern transition_M2(t : Transition, src : Vertex, trg : Vertex) {

-        Vertex(src);

-        Transition.target(t, trg);

-}

-pattern transition_M3(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t_x, src);

-        Transition.target(t, trg);

-}

-pattern transition_M4(t : Transition, src : Vertex, trg : Vertex) {

-        Transition.source(t, src);

-        Transition.target(t_x, trg);

-}

-

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

-pattern incomingToEntry_M0(t : Transition, e : Entry) {

-        find transition_M0(t, _, e);

-}

-pattern incomingToEntry_1(t : Transition, e) {

-        find transition_M0(t, _, e);

-}

-pattern incomingToEntry_2(t : Transition, e : Entry) {

-        find transition_M1(t, _, e);

-}

-pattern incomingToEntry_3(t : Transition, e : Entry) {

-        find transition_M2(t, _, e);

-}

-pattern incomingToEntry_4(t : Transition, e : Entry) {

-        find transition_M3(t, _, e);

-}

-pattern incomingToEntry_5(t : Transition, e : Entry) {

-        find transition_M4(t, _, e);

-}

-

-pattern noOutgoingTransitionFromEntry_M0(e : Entry) {

-        neg find transition_M0(_, e, _);

-}

-

-pattern noOutgoingTransitionFromEntry_M1(e) {

-        Vertex(e);

-        neg find transition_M0(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M2(e : Entry) {

-        neg find transition_M1(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M3(e : Entry) {

-        neg find transition_M2(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M4(e : Entry) {

-        neg find transition_M3(_, e, _);

-}

-pattern noOutgoingTransitionFromEntry_M5(e : Entry) {

-        neg find transition_M4(_, e, _);

-}

-

-

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

-pattern multipleTransitionFromEntry_M0(e : Entry, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Entry.outgoingTransitions(e,t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M1(e, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Entry.outgoingTransitions(e,t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M2(e : Entry, t1 : Transition, t2: Transition) {

-        Transition(t1);

-        Entry.outgoingTransitions(e,t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M3(e : Entry, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Transition(t2);

-        t1!=t2;

-}

-pattern multipleTransitionFromEntry_M4(e : Entry, t1 : Transition, t2: Transition) {

-        Entry.outgoingTransitions(e,t1);

-        Entry.outgoingTransitions(e,t2);

-}

-

-/////////

-// Exit

-/////////

-

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

-pattern outgoingFromExit_M0(t : Transition, e : Exit) {

-        Exit.outgoingTransitions(e,t);

-}

-pattern outgoingFromExit_M1(t : Transition, e) {

-        Vertex.outgoingTransitions(e,t);

-}

-pattern outgoingFromExit_M2(t : Transition, e : Exit) {

-        Transition(t);

-        Exit(e);

-}

-

-/////////

-// Final

-/////////

-

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

-pattern outgoingFromFinal_M0(t : Transition, f : FinalState) {

-        FinalState.outgoingTransitions(f,t);

-}

-pattern outgoingFromFinal_M1(t : Transition, f) {

-        Vertex.outgoingTransitions(f,t);

-}

-pattern outgoingFromFinal_M2(t : Transition, f : FinalState) {

-        Transition(t);

-        FinalState(f);

-}

-

-/////////

-// State vs Region

-/////////

-

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

-pattern noStateInRegion_M0(region: Region) {

-        neg find StateInRegion_M0(region,_);

-}

-pattern noStateInRegion_M1(region: Region) {

-        neg find StateInRegion_M1(region,_);

-}

-pattern noStateInRegion_M2(region: Region) {

-        neg find StateInRegion_M2(region,_);

-}

-pattern noStateInRegion_M3(region: Region) {

-        find StateInRegion_M0(region,_);

-}

-

-pattern StateInRegion_M0(region: Region, state: State) {

-        Region.vertices(region,state);

-}

-pattern StateInRegion_M1(region: Region, state) {

-        Region.vertices(region,state);

-}

-pattern StateInRegion_M2(region: Region, state:State) {

-        Region(region);State(state);

-}

-

-/////////

-// Choice

-/////////

-

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

-pattern choiceHasNoOutgoing_M0(c : Choice) {

-        neg find transition_M0(_, c, _);

-}

-pattern choiceHasNoOutgoing_M1(c:Vertex) {

-        neg find transition_M0(_, c, _);

-}

-pattern choiceHasNoOutgoing_M2(c : Choice) {

-        neg find transition_M1(_, c, _);

-}

-pattern choiceHasNoOutgoing_M3(c : Choice) {

-        neg find transition_M2(_, c, _);

-}

-pattern choiceHasNoOutgoing_M4(c : Choice) {

-        neg find transition_M3(_, c, _);

-}

-pattern choiceHasNoOutgoing_M5(c : Choice) {

-        neg find transition_M4(_, c, _);

-}

-pattern choiceHasNoOutgoing_M6(c : Choice) {

-        find transition_M0(_, c, _);

-}

-

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

-pattern choiceHasNoIncoming_M0(c: Choice) {

-        neg find transition_M0(_, _, c);

-}

-pattern choiceHasNoIncoming_M1(c:Vertex) {

-        neg find transition_M0(_, _, c);

-}

-pattern choiceHasNoIncoming_M2(c: Choice) {

-        neg find transition_M1(_, _, c);

-}

-pattern choiceHasNoIncoming_M3(c: Choice) {

-        neg find transition_M2(_, _, c);

-}

-pattern choiceHasNoIncoming_M4(c: Choice) {

-        neg find transition_M3(_, _, c);

-}

-pattern choiceHasNoIncoming_M5(c: Choice) {

-        neg find transition_M4(_, _, c);

-}

-pattern choiceHasNoIncoming_M6(c: Choice) {

-        find transition_M0(_, _, c);

-}

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 f4bfa3c1..98a10cde 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
@@ -27,14 +27,22 @@ pattern transition(t : Transition, src : Vertex, trg : Vertex) {
         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 transition(t, _, e);

+        find transitionTo(t, e);

 }

 

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

 pattern noOutgoingTransitionFromEntry(e : Entry) {

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

+        neg find transitionFrom(_, e);

 }

 

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

@@ -80,12 +88,12 @@ pattern StateInRegion(region: Region, state: State) {
 

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

 pattern choiceHasNoOutgoing(c : Choice) {

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

+        neg find transitionFrom(_, c);

 }

 

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

 pattern choiceHasNoIncoming(c: Choice) {

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

+        neg find transitionTo(_, c);

 }

 

 /////////

@@ -94,27 +102,33 @@ pattern choiceHasNoIncoming(c: Choice) {
 

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

 pattern synchHasNoOutgoing(s : Synchronization) {

-        neg find transition(_, s, _);

+        neg find transitionFrom(_, s);

 }

 

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

 pattern synchHasNoIncoming(s : Synchronization) {

-        neg find transition(_, _, s);

+        neg find transitionTo(_, 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);

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

+        find SynchronizedIncomingInSameRegionHelper1(r, s, t1);

+        find SynchronizedIncomingInSameRegionHelper1(r, s, t2);

         t1!=t2;

-        Region.vertices(r, v1);

-        Region.vertices(r, v2);

 } or {

-        find transition(t1, s, v1);

-        find transition(t2, s, v2);

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

-        Region.vertices(r, v2);

 }

 

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

@@ -136,18 +150,24 @@ pattern hasMultipleIncomingTrainsition(v : Synchronization) {
 }

 

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

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

-        find transition(_, s, v2);

         CompositeElement.regions.vertices(r1, v1);

-        CompositeElement.regions.vertices(r2, v2);

-        r1 != r2;

+}

+

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

+        find transition(_, v1, s);

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

 }

 

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