Trying to simplify Satellite case study

1 files changed, 4 insertions, 28 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 ae9197da..3e5cdafb 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
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ecore:EPackage xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="satellite" nsURI="http://www.example.org/satellite" nsPrefix="satellite">
-  <eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
-    <details key="settingDelegates" value="org.eclipse.viatra.query.querybasedfeature"/>
-  </eAnnotations>
   <eClassifiers xsi:type="ecore:EClass" name="ConstellationMission" abstract="true">
     <eStructuralFeatures xsi:type="ecore:EReference" name="groundStationNetwork" lowerBound="1"
         eType="#//GroundStationNetwork" containment="true"/>
@@ -24,42 +21,21 @@
   <eClassifiers xsi:type="ecore:EClass" name="Spacecraft" abstract="true" eSuperTypes="#//CommunicatingElement">
     <eStructuralFeatures xsi:type="ecore:EReference" name="payload" eType="#//Payload"
         containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" lowerBound="1" eType="#//SpacecraftKind"
-        changeable="false" volatile="true" transient="true" derived="true">
-      <eAnnotations source="org.eclipse.viatra.query.querybasedfeature">
-        <details key="patternFQN" value="hu.bme.mit.inf.dslreasoner.domains.satellite.queries.spacecraftOfKind"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="CommSubsystem">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="band" lowerBound="1" eType="#//TransceiverBand"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="gain" lowerBound="1" eType="#//AntennaGain"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="TransceiverBand">
-    <eLiterals name="UHF"/>
-    <eLiterals name="X" value="1"/>
-    <eLiterals name="Ka" value="2"/>
   </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>
-  <eClassifiers xsi:type="ecore:EEnum" name="AntennaGain">
-    <eLiterals name="LOW"/>
-    <eLiterals name="MEDIUM" value="1"/>
-    <eLiterals name="HIGH" value="2"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="Payload" abstract="true"/>
   <eClassifiers xsi:type="ecore:EClass" name="InterferometryPayload" eSuperTypes="#//Payload"/>
-  <eClassifiers xsi:type="ecore:EEnum" name="SpacecraftKind">
-    <eLiterals name="CubeSat3U"/>
-    <eLiterals name="CubeSat6U" value="1"/>
-    <eLiterals name="SmallSat" value="2"/>
-  </eClassifiers>
   <eClassifiers xsi:type="ecore:EClass" name="CubeSat3U" eSuperTypes="#//CubeSat"/>
   <eClassifiers xsi:type="ecore:EClass" name="CubeSat6U" eSuperTypes="#//CubeSat"/>
   <eClassifiers xsi:type="ecore:EClass" name="SmallSat" eSuperTypes="#//Spacecraft"/>
   <eClassifiers xsi:type="ecore:EClass" name="CubeSat" abstract="true" eSuperTypes="#//Spacecraft"/>
+  <eClassifiers xsi:type="ecore:EClass" name="UHFCommSubsystem" eSuperTypes="#//CommSubsystem"/>
+  <eClassifiers xsi:type="ecore:EClass" name="XCommSubsystem" eSuperTypes="#//CommSubsystem"/>
+  <eClassifiers xsi:type="ecore:EClass" name="KaCommSubsystem" eSuperTypes="#//CommSubsystem"/>
 </ecore:EPackage>