Metrics for satellite case study

6 files changed, 126 insertions, 214 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
deleted file mode 100644
index 0057b3d4..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat3UImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cube Sat3 U</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class CubeSat3UImpl extends SpacecraftImpl implements CubeSat3U {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CubeSat3UImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.CUBE_SAT3_U;
-        }
-
-} //CubeSat3UImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
deleted file mode 100644
index 3f34c6ea..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/CubeSat6UImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Cube Sat6 U</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class CubeSat6UImpl extends SpacecraftImpl implements CubeSat6U {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected CubeSat6UImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.CUBE_SAT6_U;
-        }
-
-} //CubeSat6UImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
index 5deb0c05..0cb07cfa 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatelliteFactoryImpl.java
@@ -61,12 +61,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         return createInterferometryMission();
                 case SatellitePackage.GROUND_STATION_NETWORK:
                         return createGroundStationNetwork();
-                case SatellitePackage.CUBE_SAT3_U:
-                        return createCubeSat3U();
-                case SatellitePackage.CUBE_SAT6_U:
-                        return createCubeSat6U();
-                case SatellitePackage.SMALL_SAT:
-                        return createSmallSat();
                 case SatellitePackage.COMM_SUBSYSTEM:
                         return createCommSubsystem();
                 case SatellitePackage.DIRECTED_COMMUNICATION_LINK:
@@ -90,6 +84,8 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         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");
                 }
@@ -107,6 +103,8 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
                         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");
                 }
@@ -140,39 +138,6 @@ public class SatelliteFactoryImpl extends EFactoryImpl implements SatelliteFacto
          * @generated
          */
         @Override
-        public CubeSat3U createCubeSat3U() {
-                CubeSat3UImpl cubeSat3U = new CubeSat3UImpl();
-                return cubeSat3U;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public CubeSat6U createCubeSat6U() {
-                CubeSat6UImpl cubeSat6U = new CubeSat6UImpl();
-                return cubeSat6U;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public SmallSat createSmallSat() {
-                SmallSatImpl smallSat = new SmallSatImpl();
-                return smallSat;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
         public CommSubsystem createCommSubsystem() {
                 CommSubsystemImpl commSubsystem = new CommSubsystemImpl();
                 return commSubsystem;
@@ -249,6 +214,28 @@ 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;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        public String convertSpacecraftKindToString(EDataType eDataType, Object instanceValue) {
+                return instanceValue == null ? null : instanceValue.toString();
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
         @Override
         public SatellitePackage getSatellitePackage() {
                 return (SatellitePackage) getEPackage();
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
index 067eabd4..48ba32b8 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SatellitePackageImpl.java
@@ -6,8 +6,6 @@ import hu.bme.mit.inf.dslreasoner.domains.satellite.AntennaGain;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.CommSubsystem;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.CommunicatingElement;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.ConstellationMission;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat3U;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.CubeSat6U;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.DirectedCommunicationLink;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.GroundStationNetwork;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryMission;
@@ -15,8 +13,8 @@ import hu.bme.mit.inf.dslreasoner.domains.satellite.InterferometryPayload;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.Payload;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.SatelliteFactory;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.TransceiverBand;
 
 import org.eclipse.emf.ecore.EAttribute;
@@ -74,27 +72,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * <!-- end-user-doc -->
          * @generated
          */
-        private EClass cubeSat3UEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass cubeSat6UEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        private EClass smallSatEClass = null;
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
         private EClass commSubsystemEClass = null;
 
         /**
@@ -133,6 +110,13 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
         private EEnum antennaGainEEnum = null;
 
         /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        private EEnum spacecraftKindEEnum = null;
+
+        /**
          * Creates an instance of the model <b>Package</b>, registered with
          * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
          * package URI value.
@@ -312,28 +296,8 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
-        public EClass getCubeSat3U() {
-                return cubeSat3UEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getCubeSat6U() {
-                return cubeSat6UEClass;
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        public EClass getSmallSat() {
-                return smallSatEClass;
+        public EAttribute getSpacecraft_Kind() {
+                return (EAttribute) spacecraftEClass.getEStructuralFeatures().get(1);
         }
 
         /**
@@ -442,6 +406,16 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
          * @generated
          */
         @Override
+        public EEnum getSpacecraftKind() {
+                return spacecraftKindEEnum;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public SatelliteFactory getSatelliteFactory() {
                 return (SatelliteFactory) getEFactoryInstance();
         }
@@ -481,12 +455,7 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
 
                 spacecraftEClass = createEClass(SPACECRAFT);
                 createEReference(spacecraftEClass, SPACECRAFT__PAYLOAD);
-
-                cubeSat3UEClass = createEClass(CUBE_SAT3_U);
-
-                cubeSat6UEClass = createEClass(CUBE_SAT6_U);
-
-                smallSatEClass = createEClass(SMALL_SAT);
+                createEAttribute(spacecraftEClass, SPACECRAFT__KIND);
 
                 commSubsystemEClass = createEClass(COMM_SUBSYSTEM);
                 createEAttribute(commSubsystemEClass, COMM_SUBSYSTEM__BAND);
@@ -503,6 +472,7 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 // Create enums
                 transceiverBandEEnum = createEEnum(TRANSCEIVER_BAND);
                 antennaGainEEnum = createEEnum(ANTENNA_GAIN);
+                spacecraftKindEEnum = createEEnum(SPACECRAFT_KIND);
         }
 
         /**
@@ -537,9 +507,6 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 interferometryMissionEClass.getESuperTypes().add(this.getConstellationMission());
                 groundStationNetworkEClass.getESuperTypes().add(this.getCommunicatingElement());
                 spacecraftEClass.getESuperTypes().add(this.getCommunicatingElement());
-                cubeSat3UEClass.getESuperTypes().add(this.getSpacecraft());
-                cubeSat6UEClass.getESuperTypes().add(this.getSpacecraft());
-                smallSatEClass.getESuperTypes().add(this.getSpacecraft());
                 interferometryPayloadEClass.getESuperTypes().add(this.getPayload());
 
                 // Initialize classes, features, and operations; add parameters
@@ -575,15 +542,8 @@ 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);
-
-                initEClass(cubeSat3UEClass, CubeSat3U.class, "CubeSat3U", !IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(cubeSat6UEClass, CubeSat6U.class, "CubeSat6U", !IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
-
-                initEClass(smallSatEClass, SmallSat.class, "SmallSat", !IS_ABSTRACT, !IS_INTERFACE,
-                                IS_GENERATED_INSTANCE_CLASS);
+                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,
                                 IS_GENERATED_INSTANCE_CLASS);
@@ -617,6 +577,11 @@ public class SatellitePackageImpl extends EPackageImpl implements SatellitePacka
                 addEEnumLiteral(antennaGainEEnum, AntennaGain.MEDIUM);
                 addEEnumLiteral(antennaGainEEnum, AntennaGain.HIGH);
 
+                initEEnum(spacecraftKindEEnum, SpacecraftKind.class, "SpacecraftKind");
+                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT3_U);
+                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.CUBE_SAT6_U);
+                addEEnumLiteral(spacecraftKindEEnum, SpacecraftKind.SMALL_SAT);
+
                 // Create resource
                 createResource(eNS_URI);
         }
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
deleted file mode 100644
index 522991ad..00000000
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SmallSatImpl.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- */
-package hu.bme.mit.inf.dslreasoner.domains.satellite.impl;
-
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
-import hu.bme.mit.inf.dslreasoner.domains.satellite.SmallSat;
-
-import org.eclipse.emf.ecore.EClass;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Small Sat</b></em>'.
- * <!-- end-user-doc -->
- *
- * @generated
- */
-public class SmallSatImpl extends SpacecraftImpl implements SmallSat {
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        protected SmallSatImpl() {
-                super();
-        }
-
-        /**
-         * <!-- begin-user-doc -->
-         * <!-- end-user-doc -->
-         * @generated
-         */
-        @Override
-        protected EClass eStaticClass() {
-                return SatellitePackage.Literals.SMALL_SAT;
-        }
-
-} //SmallSatImpl
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
index caefd377..2135af2c 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/ecore-gen/hu/bme/mit/inf/dslreasoner/domains/satellite/impl/SpacecraftImpl.java
@@ -6,6 +6,7 @@ import hu.bme.mit.inf.dslreasoner.domains.satellite.Payload;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.SatellitePackage;
 import hu.bme.mit.inf.dslreasoner.domains.satellite.Spacecraft;
 
+import hu.bme.mit.inf.dslreasoner.domains.satellite.SpacecraftKind;
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.NotificationChain;
 
@@ -23,6 +24,7 @@ import org.eclipse.emf.ecore.impl.ENotificationImpl;
  * </p>
  * <ul>
  *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl#getPayload <em>Payload</em>}</li>
+ *   <li>{@link hu.bme.mit.inf.dslreasoner.domains.satellite.impl.SpacecraftImpl#getKind <em>Kind</em>}</li>
  * </ul>
  *
  * @generated
@@ -39,6 +41,25 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
         protected Payload payload;
 
         /**
+         * The default value of the '{@link #getKind() <em>Kind</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getKind()
+         * @generated
+         * @ordered
+         */
+        protected static final SpacecraftKind KIND_EDEFAULT = SpacecraftKind.CUBE_SAT3_U;
+        /**
+         * The cached value of the '{@link #getKind() <em>Kind</em>}' attribute.
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @see #getKind()
+         * @generated
+         * @ordered
+         */
+        protected SpacecraftKind kind = KIND_EDEFAULT;
+
+        /**
          * <!-- begin-user-doc -->
          * <!-- end-user-doc -->
          * @generated
@@ -115,6 +136,29 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
          * @generated
          */
         @Override
+        public SpacecraftKind getKind() {
+                return kind;
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
+        public void setKind(SpacecraftKind newKind) {
+                SpacecraftKind oldKind = kind;
+                kind = newKind == null ? KIND_EDEFAULT : newKind;
+                if (eNotificationRequired())
+                        eNotify(new ENotificationImpl(this, Notification.SET, SatellitePackage.SPACECRAFT__KIND, oldKind, kind));
+        }
+
+        /**
+         * <!-- begin-user-doc -->
+         * <!-- end-user-doc -->
+         * @generated
+         */
+        @Override
         public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
@@ -133,6 +177,8 @@ 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);
         }
@@ -148,6 +194,9 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         setPayload((Payload) newValue);
                         return;
+                case SatellitePackage.SPACECRAFT__KIND:
+                        setKind((SpacecraftKind) newValue);
+                        return;
                 }
                 super.eSet(featureID, newValue);
         }
@@ -163,6 +212,9 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         setPayload((Payload) null);
                         return;
+                case SatellitePackage.SPACECRAFT__KIND:
+                        setKind(KIND_EDEFAULT);
+                        return;
                 }
                 super.eUnset(featureID);
         }
@@ -177,8 +229,27 @@ public abstract class SpacecraftImpl extends CommunicatingElementImpl implements
                 switch (featureID) {
                 case SatellitePackage.SPACECRAFT__PAYLOAD:
                         return payload != null;
+                case SatellitePackage.SPACECRAFT__KIND:
+                        return kind != KIND_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(" (kind: ");
+                result.append(kind);
+                result.append(')');
+                return result.toString();
+        }
+
 } //SpacecraftImpl