Simplify satellite metamodel further

2 files changed, 4 insertions, 13 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
index 3e5cdafb..74f09388 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.ecore
@@ -14,20 +14,14 @@
   <eClassifiers xsi:type="ecore:EClass" name="CommunicatingElement" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="commSubsystem" lowerBound="1"
         upperBound="2" eType="#//CommSubsystem" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="communicationLink" eType="#//DirectedCommunicationLink"
-        containment="true"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="GroundStationNetwork" eSuperTypes="#//CommunicatingElement"/>
   <eClassifiers xsi:type="ecore:EClass" name="Spacecraft" abstract="true" eSuperTypes="#//CommunicatingElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="payload" eType="#//Payload"
         containment="true"/>
   </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CommSubsystem" abstract="true"/>
-  <eClassifiers xsi:type="ecore:EClass" name="DirectedCommunicationLink">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="source" lowerBound="1"
-        eType="#//CommSubsystem"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="target" lowerBound="1"
-        eType="#//CommSubsystem"/>
+  <eClassifiers xsi:type="ecore:EClass" name="CommSubsystem" abstract="true">
+    <eStructuralFeatures xsi:type="ecore:EReference" name="target" eType="#//CommSubsystem"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Payload" abstract="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="InterferometryPayload" eSuperTypes="#//Payload"/>
diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
index 2d538c06..e315e0ec 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/model/satellite.genmodel
@@ -20,16 +20,13 @@
     </genClasses>
     <genClasses image="false" ecoreClass="satellite.ecore#//CommunicatingElement">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/commSubsystem"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//CommunicatingElement/communicationLink"/>
     </genClasses>
     <genClasses ecoreClass="satellite.ecore#//GroundStationNetwork"/>
     <genClasses image="false" ecoreClass="satellite.ecore#//Spacecraft">
       <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference satellite.ecore#//Spacecraft/payload"/>
     </genClasses>
-    <genClasses ecoreClass="satellite.ecore#//CommSubsystem"/>
-    <genClasses ecoreClass="satellite.ecore#//DirectedCommunicationLink">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//DirectedCommunicationLink/source"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//DirectedCommunicationLink/target"/>
+    <genClasses ecoreClass="satellite.ecore#//CommSubsystem">
+      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference satellite.ecore#//CommSubsystem/target"/>
     </genClasses>
     <genClasses image="false" ecoreClass="satellite.ecore#//Payload"/>
     <genClasses ecoreClass="satellite.ecore#//InterferometryPayload"/>