Trying to simplify Satellite case study

10 files changed, 221 insertions, 419 deletions

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 cf8f1fe8..cae35a0c 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,73 +2,19 @@
  */
 package satellite.impl;
 
-import org.eclipse.emf.common.notify.Notification;
-
 import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;
-
-import satellite.AntennaGain;
 import satellite.CommSubsystem;
 import satellite.SatellitePackage;
-import satellite.TransceiverBand;
 
 /**
  * <!-- begin-user-doc -->
  * An implementation of the model object '<em><b>Comm Subsystem</b></em>'.
  * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * </p>
- * <ul>
- *   <li>{@link satellite.impl.CommSubsystemImpl#getBand <em>Band</em>}</li>
- *   <li>{@link satellite.impl.CommSubsystemImpl#getGain <em>Gain</em>}</li>
- * </ul>
  *
  * @generated
  */
-public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements CommSubsystem {
-        /**
-         * The default value of the '{@link #getBand() <em>Band</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getBand()
-         * @generated
-         * @ordered
-         */
-        protected static final TransceiverBand BAND_EDEFAULT = TransceiverBand.UHF;
-
-        /**
-         * The cached value of the '{@link #getBand() <em>Band</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getBand()
-         * @generated
-         * @ordered
-         */
-        protected TransceiverBand band = BAND_EDEFAULT;
-
-        /**
-         * The default value of the '{@link #getGain() <em>Gain</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getGain()
-         * @generated
-         * @ordered
-         */
-        protected static final AntennaGain GAIN_EDEFAULT = AntennaGain.LOW;
-
-        /**
-         * The cached value of the '{@link #getGain() <em>Gain</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getGain()
-         * @generated
-         * @ordered
-         */
-        protected AntennaGain gain = GAIN_EDEFAULT;
-
+public abstract class CommSubsystemImpl extends MinimalEObjectImpl.Container implements CommSubsystem {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
@@ -88,139 +34,4 @@ public class CommSubsystemImpl extends MinimalEObjectImpl.Container implements C
                 return SatellitePackage.Literals.COMM_SUBSYSTEM;
         }
 
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public TransceiverBand getBand() {
-                return band;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setBand(TransceiverBand newBand) {
-                TransceiverBand oldBand = band;
-                band = newBand == null ? BAND_EDEFAULT : newBand;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__BAND, oldBand,
-                                        band));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public AntennaGain getGain() {
-                return gain;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void setGain(AntennaGain newGain) {
-                AntennaGain oldGain = gain;
-                gain = newGain == null ? GAIN_EDEFAULT : newGain;
-                if (eNotificationRequired())
-                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.COMM_SUBSYSTEM__GAIN, oldGain,
-                                        gain));
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public Object eGet(int featureID, boolean resolve, boolean coreType) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__BAND:
-                        return getBand();
-                case SatellitePackage.COMM_SUBSYSTEM__GAIN:
-                        return getGain();
-                }
-                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.COMM_SUBSYSTEM__BAND:
-                        setBand((TransceiverBand) newValue);
-                        return;
-                case SatellitePackage.COMM_SUBSYSTEM__GAIN:
-                        setGain((AntennaGain) newValue);
-                        return;
-                }
-                super.eSet(featureID, newValue);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public void eUnset(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__BAND:
-                        setBand(BAND_EDEFAULT);
-                        return;
-                case SatellitePackage.COMM_SUBSYSTEM__GAIN:
-                        setGain(GAIN_EDEFAULT);
-                        return;
-                }
-                super.eUnset(featureID);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public boolean eIsSet(int featureID) {
-                switch (featureID) {
-                case SatellitePackage.COMM_SUBSYSTEM__BAND:
-                        return band != BAND_EDEFAULT;
-                case SatellitePackage.COMM_SUBSYSTEM__GAIN:
-                        return gain != GAIN_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(" (band: ");
-                result.append(band);
-                result.append(", gain: ");
-                result.append(gain);
-                result.append(')');
-                return result.toString();
-        }
-
 } //CommSubsystemImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
index a7ba37a7..350a9bcc 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat3UImpl.java
@@ -14,7 +14,7 @@ import satellite.SatellitePackage;
  *
  * @generated
  */
-public class CubeSat3UImpl extends SpacecraftImpl implements CubeSat3U {
+public class CubeSat3UImpl extends CubeSatImpl implements CubeSat3U {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
index d4f42e6c..3b9c5988 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSat6UImpl.java
@@ -14,7 +14,7 @@ import satellite.SatellitePackage;
  *
  * @generated
  */
-public class CubeSat6UImpl extends SpacecraftImpl implements CubeSat6U {
+public class CubeSat6UImpl extends CubeSatImpl implements CubeSat6U {
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
new file mode 100644
index 00000000..660bd062
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/CubeSatImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.CubeSat;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Cube Sat</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public abstract class CubeSatImpl extends SpacecraftImpl implements CubeSat {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected CubeSatImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.CUBE_SAT;
+        }
+
+} //CubeSatImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/KaCommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/KaCommSubsystemImpl.java
new file mode 100644
index 00000000..3f4fc432
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/KaCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.KaCommSubsystem;
+import satellite.SatellitePackage;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>Ka Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class KaCommSubsystemImpl extends CommSubsystemImpl implements KaCommSubsystem {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected KaCommSubsystemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.KA_COMM_SUBSYSTEM;
+        }
+
+} //KaCommSubsystemImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
index e899dc79..135527c6 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SatelliteFactoryImpl.java
@@ -3,7 +3,6 @@
 package satellite.impl;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EDataType;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 
@@ -61,8 +60,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         return createInterferometryMission();
                 case SatellitePackage.GROUND_STATION_NETWORK:
                         return createGroundStationNetwork();
-                case SatellitePackage.COMM_SUBSYSTEM:
-                        return createCommSubsystem();
                 case SatellitePackage.DIRECTED_COMMUNICATION_LINK:
                         return createDirectedCommunicationLink();
                 case SatellitePackage.INTERFEROMETRY_PAYLOAD:
@@ -73,6 +70,12 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         return createCubeSat6U();
                 case SatellitePackage.SMALL_SAT:
                         return createSmallSat();
+                case SatellitePackage.UHF_COMM_SUBSYSTEM:
+                        return createUHFCommSubsystem();
+                case SatellitePackage.XCOMM_SUBSYSTEM:
+                        return createXCommSubsystem();
+                case SatellitePackage.KA_COMM_SUBSYSTEM:
+                        return createKaCommSubsystem();
                 default:
                         throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
                 }
@@ -84,44 +87,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * @generated
          */
         @Override
-        public Object createFromString(EDataType eDataType, String initialValue) {
-                switch (eDataType.getClassifierID()) {
-                case SatellitePackage.TRANSCEIVER_BAND:
-                        return createTransceiverBandFromString(eDataType, initialValue);
-                case SatellitePackage.ANTENNA_GAIN:
-                        return createAntennaGainFromString(eDataType, initialValue);
-                case SatellitePackage.SPACECRAFT_KIND:
-                        return createSpacecraftKindFromString(eDataType, initialValue);
-                default:
-                        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-                }
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public String convertToString(EDataType eDataType, Object instanceValue) {
-                switch (eDataType.getClassifierID()) {
-                case SatellitePackage.TRANSCEIVER_BAND:
-                        return convertTransceiverBandToString(eDataType, instanceValue);
-                case SatellitePackage.ANTENNA_GAIN:
-                        return convertAntennaGainToString(eDataType, instanceValue);
-                case SatellitePackage.SPACECRAFT_KIND:
-                        return convertSpacecraftKindToString(eDataType, instanceValue);
-                default:
-                        throw new IllegalArgumentException("The datatype '" + eDataType.getName() + "' is not a valid classifier");
-                }
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public InterferometryMission createInterferometryMission() {
                 InterferometryMissionImpl interferometryMission = new InterferometryMissionImpl();
                 return interferometryMission;
@@ -144,17 +109,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * @generated
          */
         @Override
-        public CommSubsystem createCommSubsystem() {
-                CommSubsystemImpl commSubsystem = new CommSubsystemImpl();
-                return commSubsystem;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public DirectedCommunicationLink createDirectedCommunicationLink() {
                 DirectedCommunicationLinkImpl directedCommunicationLink = new DirectedCommunicationLinkImpl();
                 return directedCommunicationLink;
@@ -209,43 +163,10 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * <!-- end-user-doc -->
          * @generated
          */
-        public TransceiverBand createTransceiverBandFromString(EDataType eDataType, String initialValue) {
-                TransceiverBand result = TransceiverBand.get(initialValue);
-                if (result == null)
-                        throw new IllegalArgumentException(
-                                        "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-                return result;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public String convertTransceiverBandToString(EDataType eDataType, Object instanceValue) {
-                return instanceValue == null ? null : instanceValue.toString();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public AntennaGain createAntennaGainFromString(EDataType eDataType, String initialValue) {
-                AntennaGain result = AntennaGain.get(initialValue);
-                if (result == null)
-                        throw new IllegalArgumentException(
-                                        "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-                return result;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        public String convertAntennaGainToString(EDataType eDataType, Object instanceValue) {
-                return instanceValue == null ? null : instanceValue.toString();
+        @Override
+        public UHFCommSubsystem createUHFCommSubsystem() {
+                UHFCommSubsystemImpl uhfCommSubsystem = new UHFCommSubsystemImpl();
+                return uhfCommSubsystem;
         }
 
         /**
@@ -253,12 +174,10 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * <!-- end-user-doc -->
          * @generated
          */
-        public SpacecraftKind createSpacecraftKindFromString(EDataType eDataType, String initialValue) {
-                SpacecraftKind result = SpacecraftKind.get(initialValue);
-                if (result == null)
-                        throw new IllegalArgumentException(
-                                        "The value '" + initialValue + "' is not a valid enumerator of '" + eDataType.getName() + "'");
-                return result;
+        @Override
+        public XCommSubsystem createXCommSubsystem() {
+                XCommSubsystemImpl xCommSubsystem = new XCommSubsystemImpl();
+                return xCommSubsystem;
         }
 
         /**
@@ -266,8 +185,10 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * <!-- end-user-doc -->
          * @generated
          */
-        public String convertSpacecraftKindToString(EDataType eDataType, Object instanceValue) {
-                return instanceValue == null ? null : instanceValue.toString();
+        @Override
+        public KaCommSubsystem createKaCommSubsystem() {
+                KaCommSubsystemImpl kaCommSubsystem = new KaCommSubsystemImpl();
+                return kaCommSubsystem;
         }
 
         /**
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 2347fe07..daec68a9 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
@@ -4,29 +4,28 @@ package satellite.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
 
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import satellite.AntennaGain;
 import satellite.CommSubsystem;
 import satellite.CommunicatingElement;
 import satellite.ConstellationMission;
+import satellite.CubeSat;
 import satellite.CubeSat3U;
 import satellite.CubeSat6U;
 import satellite.DirectedCommunicationLink;
 import satellite.GroundStationNetwork;
 import satellite.InterferometryMission;
 import satellite.InterferometryPayload;
+import satellite.KaCommSubsystem;
 import satellite.Payload;
 import satellite.SatelliteFactory;
 import satellite.SatellitePackage;
 import satellite.SmallSat;
 import satellite.Spacecraft;
-import satellite.SpacecraftKind;
-import satellite.TransceiverBand;
+import satellite.UHFCommSubsystem;
+import satellite.XCommSubsystem;
 
 /**
  * <!-- begin-user-doc -->
@@ -124,21 +123,28 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * <!-- end-user-doc -->
          * @generated
          */
-        private EEnum transceiverBandEEnum = null;
+        private EClass cubeSatEClass = null;
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EClass uhfCommSubsystemEClass = null;
 
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          */
-        private EEnum antennaGainEEnum = null;
+        private EClass xCommSubsystemEClass = null;
 
         /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
          */
-        private EEnum spacecraftKindEEnum = null;
+        private EClass kaCommSubsystemEClass = null;
 
         /**
          * Creates an instance of the model <b>Package</b>, registered with
@@ -320,16 +326,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EAttribute getSpacecraft_Kind() {
-                return (EAttribute) spacecraftEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getCommSubsystem() {
                 return commSubsystemEClass;
         }
@@ -340,26 +336,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EAttribute getCommSubsystem_Band() {
-                return (EAttribute) commSubsystemEClass.getEStructuralFeatures().get(0);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EAttribute getCommSubsystem_Gain() {
-                return (EAttribute) commSubsystemEClass.getEStructuralFeatures().get(1);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public EClass getDirectedCommunicationLink() {
                 return directedCommunicationLinkEClass;
         }
@@ -440,8 +416,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EEnum getTransceiverBand() {
-                return transceiverBandEEnum;
+        public EClass getCubeSat() {
+                return cubeSatEClass;
         }
 
         /**
@@ -450,8 +426,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EEnum getAntennaGain() {
-                return antennaGainEEnum;
+        public EClass getUHFCommSubsystem() {
+                return uhfCommSubsystemEClass;
         }
 
         /**
@@ -460,8 +436,18 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EEnum getSpacecraftKind() {
-                return spacecraftKindEEnum;
+        public EClass getXCommSubsystem() {
+                return xCommSubsystemEClass;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public EClass getKaCommSubsystem() {
+                return kaCommSubsystemEClass;
         }
 
         /**
@@ -509,11 +495,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 spacecraftEClass = createEClass(SPACECRAFT);
                 createEReference(spacecraftEClass, SPACECRAFT__PAYLOAD);
-                createEAttribute(spacecraftEClass, SPACECRAFT__KIND);
 
                 commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
-                createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__BAND);
-                createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__GAIN);
 
                 directedCommunicationLinkEClass = createEClass(DIRECTED_COMMUNICATION_LINK);
                 createEReference(directedCommunicationLinkEClass, DIRECTED_COMMUNICATION_LINK__SOURCE);
@@ -529,10 +512,13 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 smallSatEClass = createEClass(SMALL_SAT);
 
-                // Create enums
-                transceiverBandEEnum = createEEnum(TRANSCEIVER_BAND);
-                antennaGainEEnum = createEEnum(ANTENNA_GAIN);
-                spacecraftKindEEnum = createEEnum(SPACECRAFT_KIND);
+                cubeSatEClass = createEClass(CUBE_SAT);
+
+                uhfCommSubsystemEClass = createEClass(UHF_COMM_SUBSYSTEM);
+
+                xCommSubsystemEClass = createEClass(XCOMM_SUBSYSTEM);
+
+                kaCommSubsystemEClass = createEClass(KA_COMM_SUBSYSTEM);
         }
 
         /**
@@ -568,9 +554,13 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 groundStationNetworkEClass.getESuperTypes().add(this.getCommunicatingElement());
                 spacecraftEClass.getESuperTypes().add(this.getCommunicatingElement());
                 interferometryPayloadEClass.getESuperTypes().add(this.getPayload());
-                cubeSat3UEClass.getESuperTypes().add(this.getSpacecraft());
-                cubeSat6UEClass.getESuperTypes().add(this.getSpacecraft());
+                cubeSat3UEClass.getESuperTypes().add(this.getCubeSat());
+                cubeSat6UEClass.getESuperTypes().add(this.getCubeSat());
                 smallSatEClass.getESuperTypes().add(this.getSpacecraft());
+                cubeSatEClass.getESuperTypes().add(this.getSpacecraft());
+                uhfCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
+                xCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
+                kaCommSubsystemEClass.getESuperTypes().add(this.getCommSubsystem());
 
                 // Initialize classes, features, and operations; add parameters
                 initEClass(constellationMissionEClass, ConstellationMission.class, "ConstellationMission", IS_ABSTRACT,
@@ -605,15 +595,9 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEReference(getSpacecraft_Payload(), this.getPayload(), null, "payload", null, 0, 1, Spacecraft.class,
                                 !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE,
                                 IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEAttribute(getSpacecraft_Kind(), this.getSpacecraftKind(), "kind", null, 1, 1, Spacecraft.class,
-                                IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);
 
-                initEClass(commSubsystemEClass, CommSubsystem.class, "CommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                initEClass(commSubsystemEClass, CommSubsystem.class, "CommSubsystem", IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
-                initEAttribute(getCommSubsystem_Band(), this.getTransceiverBand(), "band", null, 1, 1, CommSubsystem.class,
-                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-                initEAttribute(getCommSubsystem_Gain(), this.getAntennaGain(), "gain", null, 1, 1, CommSubsystem.class,
-                                !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
 
                 initEClass(directedCommunicationLinkEClass, DirectedCommunicationLink.class, "DirectedCommunicationLink",
                                 !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -638,53 +622,19 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 initEClass(smallSatEClass, SmallSat.class, "SmallSat", !IS_ABSTRACT, !IS_INTERFACE,
                                 IS_GENERATED_INSTANCE_CLASS);
 
-                // Initialize enums and add enum literals
-                initEEnum(transceiverBandEEnum, TransceiverBand.class, "TransceiverBand");
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.UHF);
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.X);
-                addEEnumLiteral(transceiverBandEEnum, TransceiverBand.KA);
+                initEClass(cubeSatEClass, CubeSat.class, "CubeSat", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
 
-                initEEnum(antennaGainEEnum, AntennaGain.class, "AntennaGain");
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.LOW);
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.MEDIUM);
-                addEEnumLiteral(antennaGainEEnum, AntennaGain.HIGH);
+                initEClass(uhfCommSubsystemEClass, UHFCommSubsystem.class, "UHFCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
 
-                initEEnum(spacecraftKindEEnum, SpacecraftKind.class, "SpacecraftKind");
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT3_U);
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT6_U);
-                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.SMALL_SAT);
+                initEClass(xCommSubsystemEClass, XCommSubsystem.class, "XCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
+
+                initEClass(kaCommSubsystemEClass, KaCommSubsystem.class, "KaCommSubsystem", !IS_ABSTRACT, !IS_INTERFACE,
+                                IS_GENERATED_INSTANCE_CLASS);
 
                 // Create resource
                 createResource(eNS_URI);
-
-                // Create annotations
-                // http://www.eclipse.org/emf/2002/Ecore
-                createEcoreAnnotations();
-                // org.eclipse.viatra.query.querybasedfeature
-                createOrgAnnotations();
-        }
-
-        /**
-         * Initializes the annotations for <b>http://www.eclipse.org/emf/2002/Ecore</b>.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected void createEcoreAnnotations() {
-                String source = "http://www.eclipse.org/emf/2002/Ecore";
-                addAnnotation(this, source, new String[] { "settingDelegates", "org.eclipse.viatra.query.querybasedfeature" });
-        }
-
-        /**
-         * Initializes the annotations for <b>org.eclipse.viatra.query.querybasedfeature</b>.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected void createOrgAnnotations() {
-                String source = "org.eclipse.viatra.query.querybasedfeature";
-                addAnnotation(getSpacecraft_Kind(), source,
-                                new String[] { "patternFQN", "hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind" });
         }
 
 } //SatellitePackageImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
index 73609fbd..58f5d069 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/SpacecraftImpl.java
@@ -6,7 +6,6 @@ import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
 import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
 
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
@@ -14,7 +13,6 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import satellite.Payload;
 import satellite.SatellitePackage;
 import satellite.Spacecraft;
-import satellite.SpacecraftKind;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,7 +23,6 @@ import satellite.SpacecraftKind;
  * </p>
  * <ul>
  *   <li>{@link satellite.impl.SpacecraftImpl#getPayload <em>Payload</em>}</li>
- *   <li>{@link satellite.impl.SpacecraftImpl#getKind <em>Kind</em>}</li>
  * </ul>
  *
  * @generated
@@ -42,17 +39,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
         protected Payload payload;
 
         /**
-         * The cached setting delegate for the '{@link #getKind() <em>Kind</em>}' attribute.
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @see #getKind()
-         * @generated
-         * @ordered
-         */
-        protected EStructuralFeature.Internal.SettingDelegate KIND__ESETTING_DELEGATE = ((EStructuralFeature.Internal) SatellitePackage.Literals.SPACECRAFT__KIND)
-                        .getSettingDelegate();
-
-        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -129,16 +115,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          * @generated
          */
         @Override
-        public SpacecraftKind getKind() {
-                return (SpacecraftKind) KIND__ESETTING_DELEGATE.dynamicGet(this, null, 0, true, false);
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
@@ -157,8 +133,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return getPayload();
-                case SatellitePackage.SPACECRAFT__KIND:
-                        return getKind();
                 }
                 return super.eGet(featureID, resolve, coreType);
         }
@@ -203,8 +177,6 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return payload != null;
-                case SatellitePackage.SPACECRAFT__KIND:
-                        return KIND__ESETTING_DELEGATE.dynamicIsSet(this, null, 0);
                 }
                 return super.eIsSet(featureID);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/UHFCommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/UHFCommSubsystemImpl.java
new file mode 100644
index 00000000..df21b9e1
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/UHFCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.UHFCommSubsystem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>UHF Comm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class UHFCommSubsystemImpl extends CommSubsystemImpl implements UHFCommSubsystem {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected UHFCommSubsystemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.UHF_COMM_SUBSYSTEM;
+        }
+
+} //UHFCommSubsystemImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/XCommSubsystemImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/XCommSubsystemImpl.java
new file mode 100644
index 00000000..c686a50e
--- /dev/null
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/satellite/impl/XCommSubsystemImpl.java
@@ -0,0 +1,37 @@
+/**
+ */
+package satellite.impl;
+
+import org.eclipse.emf.ecore.EClass;
+
+import satellite.SatellitePackage;
+import satellite.XCommSubsystem;
+
+/**
+ * <!-- begin-user-doc -->
+ * An implementation of the model object '<em><b>XComm Subsystem</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * @generated
+ */
+public class XCommSubsystemImpl extends CommSubsystemImpl implements XCommSubsystem {
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        protected XCommSubsystemImpl() {
+                super();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        protected EClass eStaticClass() {
+                return SatellitePackage.Literals.XCOMM_SUBSYSTEM;
+        }
+
+} //XCommSubsystemImpl