1 files changed, 25 insertions, 137 deletions

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 6e8723ae..f0d80ac2 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
@@ -179,7 +179,7 @@ public interface SatellitePackage extends EPackage {
         int COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = 0;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -225,7 +225,7 @@ public interface SatellitePackage extends EPackage {
         int GROUND_STATION_NETWORK__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -271,7 +271,7 @@ public interface SatellitePackage extends EPackage {
         int SPACECRAFT__COMM_SUBSYSTEM = COMMUNICATING_ELEMENT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -344,22 +344,13 @@ public interface SatellitePackage extends EPackage {
         int COMM_SUBSYSTEM__GAIN = 1;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int COMM_SUBSYSTEM__COMMUNICATION_LINK = 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 = 3;
+        int COMM_SUBSYSTEM_FEATURE_COUNT = 2;
 
         /**
          * The number of operations of the '<em>Comm Subsystem</em>' class.
@@ -473,70 +464,6 @@ public interface SatellitePackage extends EPackage {
         int INTERFEROMETRY_PAYLOAD_OPERATION_COUNT = PAYLOAD_OPERATION_COUNT + 0;
 
         /**
-         * The meta object id for the '{@link satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see satellite.impl.CubeSatImpl
-         * @see satellite.impl.SatellitePackageImpl#getCubeSat()
-         * @generated
-         */
-        int CUBE_SAT = 12;
-
-        /**
-         * The feature id for the '<em><b>Comm Subsystem</b></em>' containment reference list.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
-
-        /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
-
-        /**
-         * The feature id for the '<em><b>Payload</b></em>' containment reference.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__PAYLOAD = SPACECRAFT__PAYLOAD;
-
-        /**
-         * The feature id for the '<em><b>Kind</b></em>' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT__KIND = SPACECRAFT__KIND;
-
-        /**
-         * The number of structural features of the '<em>Cube Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
-
-        /**
-         * The number of operations of the '<em>Cube Sat</em>' class.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         * @ordered
-         */
-        int CUBE_SAT_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
-
-        /**
          * The meta object id for the '{@link satellite.impl.CubeSat3UImpl <em>Cube Sat3 U</em>}' class.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -553,16 +480,16 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
+        int CUBE_SAT3_U__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__COMMUNICATION_LINK = CUBE_SAT__COMMUNICATION_LINK;
+        int CUBE_SAT3_U__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
 
         /**
          * The feature id for the '<em><b>Payload</b></em>' containment reference.
@@ -571,7 +498,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__PAYLOAD = CUBE_SAT__PAYLOAD;
+        int CUBE_SAT3_U__PAYLOAD = SPACECRAFT__PAYLOAD;
 
         /**
          * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -580,7 +507,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U__KIND = CUBE_SAT__KIND;
+        int CUBE_SAT3_U__KIND = SPACECRAFT__KIND;
 
         /**
          * The number of structural features of the '<em>Cube Sat3 U</em>' class.
@@ -589,7 +516,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
+        int CUBE_SAT3_U_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Cube Sat3 U</em>' class.
@@ -598,7 +525,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT3_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
+        int CUBE_SAT3_U_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link satellite.impl.CubeSat6UImpl <em>Cube Sat6 U</em>}' class.
@@ -617,16 +544,16 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__COMM_SUBSYSTEM = CUBE_SAT__COMM_SUBSYSTEM;
+        int CUBE_SAT6_U__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__COMMUNICATION_LINK = CUBE_SAT__COMMUNICATION_LINK;
+        int CUBE_SAT6_U__COMMUNICATION_LINK = SPACECRAFT__COMMUNICATION_LINK;
 
         /**
          * The feature id for the '<em><b>Payload</b></em>' containment reference.
@@ -635,7 +562,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__PAYLOAD = CUBE_SAT__PAYLOAD;
+        int CUBE_SAT6_U__PAYLOAD = SPACECRAFT__PAYLOAD;
 
         /**
          * The feature id for the '<em><b>Kind</b></em>' attribute.
@@ -644,7 +571,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U__KIND = CUBE_SAT__KIND;
+        int CUBE_SAT6_U__KIND = SPACECRAFT__KIND;
 
         /**
          * The number of structural features of the '<em>Cube Sat6 U</em>' class.
@@ -653,7 +580,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U_FEATURE_COUNT = CUBE_SAT_FEATURE_COUNT + 0;
+        int CUBE_SAT6_U_FEATURE_COUNT = SPACECRAFT_FEATURE_COUNT + 0;
 
         /**
          * The number of operations of the '<em>Cube Sat6 U</em>' class.
@@ -662,7 +589,7 @@ public interface SatellitePackage extends EPackage {
          * @generated
          * @ordered
          */
-        int CUBE_SAT6_U_OPERATION_COUNT = CUBE_SAT_OPERATION_COUNT + 0;
+        int CUBE_SAT6_U_OPERATION_COUNT = SPACECRAFT_OPERATION_COUNT + 0;
 
         /**
          * The meta object id for the '{@link satellite.impl.SmallSatImpl <em>Small Sat</em>}' class.
@@ -684,7 +611,7 @@ public interface SatellitePackage extends EPackage {
         int SMALL_SAT__COMM_SUBSYSTEM = SPACECRAFT__COMM_SUBSYSTEM;
 
         /**
-         * The feature id for the '<em><b>Communication Link</b></em>' reference.
+         * The feature id for the '<em><b>Communication Link</b></em>' containment reference.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -736,7 +663,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getTransceiverBand()
          * @generated
          */
-        int TRANSCEIVER_BAND = 13;
+        int TRANSCEIVER_BAND = 12;
 
         /**
          * The meta object id for the '{@link satellite.AntennaGain <em>Antenna Gain</em>}' enum.
@@ -746,7 +673,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getAntennaGain()
          * @generated
          */
-        int ANTENNA_GAIN = 14;
+        int ANTENNA_GAIN = 13;
 
         /**
          * The meta object id for the '{@link satellite.SpacecraftKind <em>Spacecraft Kind</em>}' enum.
@@ -756,7 +683,7 @@ public interface SatellitePackage extends EPackage {
          * @see satellite.impl.SatellitePackageImpl#getSpacecraftKind()
          * @generated
          */
-        int SPACECRAFT_KIND = 15;
+        int SPACECRAFT_KIND = 14;
 
         /**
          * Returns the meta object for class '{@link satellite.ConstellationMission <em>Constellation Mission</em>}'.
@@ -833,10 +760,10 @@ public interface SatellitePackage extends EPackage {
         EReference getCommunicatingElement_CommSubsystem();
 
         /**
-         * Returns the meta object for the reference '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
+         * Returns the meta object for the containment reference '{@link satellite.CommunicatingElement#getCommunicationLink <em>Communication Link</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
-         * @return the meta object for the reference '<em>Communication Link</em>'.
+         * @return the meta object for the containment reference '<em>Communication Link</em>'.
          * @see satellite.CommunicatingElement#getCommunicationLink()
          * @see #getCommunicatingElement()
          * @generated
@@ -918,17 +845,6 @@ public interface SatellitePackage extends EPackage {
         EAttribute getCommSubsystem_Gain();
 
         /**
-         * Returns the meta object for the containment reference '{@link satellite.CommSubsystem#getCommunicationLink <em>Communication Link</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for the containment reference '<em>Communication Link</em>'.
-         * @see satellite.CommSubsystem#getCommunicationLink()
-         * @see #getCommSubsystem()
-         * @generated
-         */
-        EReference getCommSubsystem_CommunicationLink();
-
-        /**
          * Returns the meta object for class '{@link satellite.DirectedCommunicationLink <em>Directed Communication Link</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1011,16 +927,6 @@ public interface SatellitePackage extends EPackage {
         EClass getSmallSat();
 
         /**
-         * Returns the meta object for class '{@link satellite.CubeSat <em>Cube Sat</em>}'.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @return the meta object for class '<em>Cube Sat</em>'.
-         * @see satellite.CubeSat
-         * @generated
-         */
-        EClass getCubeSat();
-
-        /**
          * Returns the meta object for enum '{@link satellite.TransceiverBand <em>Transceiver Band</em>}'.
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -1137,7 +1043,7 @@ public interface SatellitePackage extends EPackage {
                 EReference COMMUNICATING_ELEMENT__COMM_SUBSYSTEM = eINSTANCE.getCommunicatingElement_CommSubsystem();
 
                 /**
-                 * The meta object literal for the '<em><b>Communication Link</b></em>' reference feature.
+                 * The meta object literal for the '<em><b>Communication Link</b></em>' containment reference feature.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
                  * @generated
@@ -1207,14 +1113,6 @@ public interface SatellitePackage extends EPackage {
                 EAttribute COMM_SUBSYSTEM__GAIN = eINSTANCE.getCommSubsystem_Gain();
 
                 /**
-                 * The meta object literal for the '<em><b>Communication Link</b></em>' containment reference feature.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @generated
-                 */
-                EReference COMM_SUBSYSTEM__COMMUNICATION_LINK = eINSTANCE.getCommSubsystem_CommunicationLink();
-
-                /**
                  * The meta object literal for the '{@link satellite.impl.DirectedCommunicationLinkImpl <em>Directed Communication Link</em>}' class.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->
@@ -1291,16 +1189,6 @@ public interface SatellitePackage extends EPackage {
                 EClass SMALL_SAT = eINSTANCE.getSmallSat();
 
                 /**
-                 * The meta object literal for the '{@link satellite.impl.CubeSatImpl <em>Cube Sat</em>}' class.
-                 * <!-- begin-user-doc -->
-                 * <!-- end-user-doc -->
-                 * @see satellite.impl.CubeSatImpl
-                 * @see satellite.impl.SatellitePackageImpl#getCubeSat()
-                 * @generated
-                 */
-                EClass CUBE_SAT = eINSTANCE.getCubeSat();
-
-                /**
                  * The meta object literal for the '{@link satellite.TransceiverBand <em>Transceiver Band</em>}' enum.
                  * <!-- begin-user-doc -->
                  * <!-- end-user-doc -->