Merge remote-tracking branch 'upstream/master'

4 files changed, 315 insertions, 1 deletions

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 3b9d7ecf..4c5ea937 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
@@ -14,6 +14,8 @@ import org.eclipse.emf.ecore.EObject;
  * </p>
  * <ul>
  *   <li>{@link satellite.CommSubsystem#getTarget <em>Target</em>}</li>
+ *   <li>{@link satellite.CommSubsystem#getFrequency <em>Frequency</em>}</li>
+ *   <li>{@link satellite.CommSubsystem#getPathLength <em>Path Length</em>}</li>
  * </ul>
  *
  * @see satellite.SatellitePackage#getCommSubsystem()
@@ -44,4 +46,48 @@ public interface CommSubsystem extends EObject {
          */
         void setTarget(CommSubsystem value);
 
+        /**
+         * Returns the value of the '<em><b>Frequency</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Frequency</em>' attribute.
+         * @see #setFrequency(int)
+         * @see satellite.SatellitePackage#getCommSubsystem_Frequency()
+         * @model required="true"
+         * @generated
+         */
+        int getFrequency();
+
+        /**
+         * Sets the value of the '{@link satellite.CommSubsystem#getFrequency <em>Frequency</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Frequency</em>' attribute.
+         * @see #getFrequency()
+         * @generated
+         */
+        void setFrequency(int value);
+
+        /**
+         * Returns the value of the '<em><b>Path Length</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the value of the '<em>Path Length</em>' attribute.
+         * @see #setPathLength(int)
+         * @see satellite.SatellitePackage#getCommSubsystem_PathLength()
+         * @model required="true"
+         * @generated
+         */
+        int getPathLength();
+
+        /**
+         * Sets the value of the '{@link satellite.CommSubsystem#getPathLength <em>Path Length</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @param value the new value of the '<em>Path Length</em>' attribute.
+         * @see #getPathLength()
+         * @generated
+         */
+        void setPathLength(int value);
+
 } // CommSubsystem
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 9ca99311..173e2388 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,6 +2,7 @@
  */
 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;
@@ -287,13 +288,31 @@ public interface SatellitePackage extends EPackage {
         int COMM_SUBSYSTEM__TARGET = 0;
 
         /**
+         * The feature id for the '<em><b>Frequency</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMM_SUBSYSTEM__FREQUENCY = 1;
+
+        /**
+         * The feature id for the '<em><b>Path Length</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int COMM_SUBSYSTEM__PATH_LENGTH = 2;
+
+        /**
          * 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 = 1;
+        int COMM_SUBSYSTEM_FEATURE_COUNT = 3;
 
         /**
          * The number of operations of the '<em>Comm Subsystem</em>' class.
@@ -564,6 +583,24 @@ public interface SatellitePackage extends EPackage {
         int UHF_COMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
 
         /**
+         * The feature id for the '<em><b>Frequency</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int UHF_COMM_SUBSYSTEM__FREQUENCY = COMM_SUBSYSTEM__FREQUENCY;
+
+        /**
+         * The feature id for the '<em><b>Path Length</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int UHF_COMM_SUBSYSTEM__PATH_LENGTH = COMM_SUBSYSTEM__PATH_LENGTH;
+
+        /**
          * The number of structural features of the '<em>UHF Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -601,6 +638,24 @@ public interface SatellitePackage extends EPackage {
         int XCOMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
 
         /**
+         * The feature id for the '<em><b>Frequency</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int XCOMM_SUBSYSTEM__FREQUENCY = COMM_SUBSYSTEM__FREQUENCY;
+
+        /**
+         * The feature id for the '<em><b>Path Length</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int XCOMM_SUBSYSTEM__PATH_LENGTH = COMM_SUBSYSTEM__PATH_LENGTH;
+
+        /**
          * The number of structural features of the '<em>XComm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -638,6 +693,24 @@ public interface SatellitePackage extends EPackage {
         int KA_COMM_SUBSYSTEM__TARGET = COMM_SUBSYSTEM__TARGET;
 
         /**
+         * The feature id for the '<em><b>Frequency</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KA_COMM_SUBSYSTEM__FREQUENCY = COMM_SUBSYSTEM__FREQUENCY;
+
+        /**
+         * The feature id for the '<em><b>Path Length</b></em>' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         * @ordered
+         */
+        int KA_COMM_SUBSYSTEM__PATH_LENGTH = COMM_SUBSYSTEM__PATH_LENGTH;
+
+        /**
          * The number of structural features of the '<em>Ka Comm Subsystem</em>' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -771,6 +844,28 @@ public interface SatellitePackage extends EPackage {
         EReference getCommSubsystem_Target();
 
         /**
+         * Returns the meta object for the attribute '{@link satellite.CommSubsystem#getFrequency <em>Frequency</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Frequency</em>'.
+         * @see satellite.CommSubsystem#getFrequency()
+         * @see #getCommSubsystem()
+         * @generated
+         */
+        EAttribute getCommSubsystem_Frequency();
+
+        /**
+         * Returns the meta object for the attribute '{@link satellite.CommSubsystem#getPathLength <em>Path Length</em>}'.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @return the meta object for the attribute '<em>Path Length</em>'.
+         * @see satellite.CommSubsystem#getPathLength()
+         * @see #getCommSubsystem()
+         * @generated
+         */
+        EAttribute getCommSubsystem_PathLength();
+
+        /**
          * Returns the meta object for class '{@link satellite.Payload <em>Payload</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -985,6 +1080,22 @@ public interface SatellitePackage extends EPackage {
                 EReference COMM_SUBSYSTEM__TARGET = eINSTANCE.getCommSubsystem_Target();
 
                 /**
+                 * The meta object literal for the '<em><b>Frequency</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute COMM_SUBSYSTEM__FREQUENCY = eINSTANCE.getCommSubsystem_Frequency();
+
+                /**
+                 * The meta object literal for the '<em><b>Path Length</b></em>' attribute feature.
+                 * <!-- begin-user-doc -->
+                 * <!-- end-user-doc -->
+                 * @generated
+                 */
+                EAttribute COMM_SUBSYSTEM__PATH_LENGTH = eINSTANCE.getCommSubsystem_PathLength();
+
+                /**
                  * 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 d39abd4d..96a25d7c 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
@@ -19,6 +19,8 @@ import satellite.SatellitePackage;
  * </p>
  * <ul>
  *   <li>{@link satellite.impl.CommSubsystemImpl#getTarget <em>Target</em>}</li>
+ *   <li>{@link satellite.impl.CommSubsystemImpl#getFrequency <em>Frequency</em>}</li>
+ *   <li>{@link satellite.impl.CommSubsystemImpl#getPathLength <em>Path Length</em>}</li>
  * </ul>
  *
  * @generated
@@ -35,6 +37,45 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
         protected CommSubsystem target;
 
         /**
+         * The default value of the '{@link #getFrequency() <em>Frequency</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getFrequency()
+         * @generated
+         * @ordered
+         */
+        protected static final int FREQUENCY_EDEFAULT = 0;
+        /**
+         * The cached value of the '{@link #getFrequency() <em>Frequency</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getFrequency()
+         * @generated
+         * @ordered
+         */
+        protected int frequency = FREQUENCY_EDEFAULT;
+
+        /**
+         * The default value of the '{@link #getPathLength() <em>Path Length</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getPathLength()
+         * @generated
+         * @ordered
+         */
+        protected static final int PATH_LENGTH_EDEFAULT = 0;
+
+        /**
+         * The cached value of the '{@link #getPathLength() <em>Path Length</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getPathLength()
+         * @generated
+         * @ordered
+         */
+        protected int pathLength = PATH_LENGTH_EDEFAULT;
+
+        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -101,12 +142,64 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
          * @generated
          */
         @Override
+        public int getFrequency() {
+                return frequency;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setFrequency(int newFrequency) {
+                int oldFrequency = frequency;
+                frequency = newFrequency;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__FREQUENCY,
+                                        oldFrequency, frequency));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public int getPathLength() {
+                return pathLength;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setPathLength(int newPathLength) {
+                int oldPathLength = pathLength;
+                pathLength = newPathLength;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH,
+                                        oldPathLength, pathLength));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public Object eGet(int featureID, boolean resolve, boolean coreType) {
                 switch (featureID) {
                 case SatellitePackage.COMM_SUBSYSTEM__TARGET:
                         if (resolve)
                                 return getTarget();
                         return basicGetTarget();
+                case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+                        return getFrequency();
+                case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+                        return getPathLength();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -123,6 +216,12 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
                 case SatellitePackage.COMM_SUBSYSTEM__TARGET:
                         setTarget((CommSubsystem) newValue);
                         return;
+                case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+                        setFrequency((Integer) newValue);
+                        return;
+                case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+                        setPathLength((Integer) newValue);
+                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -138,6 +237,12 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
                 case SatellitePackage.COMM_SUBSYSTEM__TARGET:
                         setTarget((CommSubsystem) null);
                         return;
+                case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+                        setFrequency(FREQUENCY_EDEFAULT);
+                        return;
+                case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+                        setPathLength(PATH_LENGTH_EDEFAULT);
+                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -152,8 +257,31 @@ public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container imp
                 switch (featureID) {
                 case SatellitePackage.COMM_SUBSYSTEM__TARGET:
                         return target != null;
+                case SatellitePackage.COMM_SUBSYSTEM__FREQUENCY:
+                        return frequency != FREQUENCY_EDEFAULT;
+                case SatellitePackage.COMM_SUBSYSTEM__PATH_LENGTH:
+                        return pathLength != PATH_LENGTH_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(" (frequency: ");
+                result.append(frequency);
+                result.append(", pathLength: ");
+                result.append(pathLength);
+                result.append(')');
+                return result.toString();
+        }
+
 } //CommSubsystemImpl
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 f6dc1e30..39a6075f 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,6 +2,7 @@
  */
 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;
@@ -317,6 +318,26 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
+        public EAttribute getCommSubsystem_Frequency() {
+                return (EAttribute) commSubsystemEClass.getEStructuralFeatures().get(1);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EAttribute getCommSubsystem_PathLength() {
+                return (EAttribute) commSubsystemEClass.getEStructuralFeatures().get(2);
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public EClass getPayload() {
                 return payloadEClass;
         }
@@ -447,6 +468,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
                 createEReference(commSubsystemEClass, COMM_SUBSYSTEM__TARGET);
+                createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__FREQUENCY);
+                createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__PATH_LENGTH);
 
                 payloadEClass = createEClass(PAYLOAD);
 
@@ -541,6 +564,12 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 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);
+                initEAttribute(getCommSubsystem_Frequency(), ecorePackage.getEInt(), "frequency", null, 1, 1,
+                                CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
+                initEAttribute(getCommSubsystem_PathLength(), ecorePackage.getEInt(), "pathLength", null, 1, 1,
+                                CommSubsystem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE,
+                                !IS_DERIVED, IS_ORDERED);
 
                 initEClass(payloadEClass, Payload.class, "Payload", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);