Revert "Try to restructure satellite case study"

This reverts commit 9b83e33c055660f6de218d1b672f67734675f1f6.

1 files changed, 7 insertions, 11 deletions

diff --git a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
index edffd941..40553e29 100644
--- a/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
+++ b/Domains/hu.bme.mit.inf.dslreasoner.domains.satellite/src/hu/bme/mit/inf/dslreasoner/domains/satellite/queries/SatelliteQueries.vql
@@ -2,17 +2,13 @@ package hu.bme.mit.inf.dslreasoner.domains.satellite.queries
 
 import "http://www.example.org/satellite"
 
-@Constraint(severity = "error", key = {Element},
-        message = "Only one communication link is allowed per element.")
-pattern multipleCommunicationLinks(Element : CommunicatingElement) {
-        CommunicatingElement.commSubsystem.communicationLink(Element, Link1);
-        CommunicatingElement.commSubsystem.communicationLink(Element, Link2);
-        Link1 != Link2;
-}
-
-@QueryBasedFeature(feature = "communicationLink")
-pattern communicationLinkOfElement(Element : CommunicatingElement, Link : DirectedCommunicationLink) {
-        CommunicatingElement.commSubsystem.communicationLink(Element, Link);
+@Constraint(severity = "error", key = {Link},
+        message = "Communication links must start from the containing element.")
+pattern communicationLinkDoesNotStartAtContainingElement(Link : DirectedCommunicationLink) {
+        CommunicatingElement.communicationLink(Element, Link);
+        DirectedCommunicationLink.source(Link, SourceComm);
+        CommunicatingElement.commSubsystem(SourceElement, SourceComm);
+        Element != SourceElement;
 }
 
 // At least two spacecraft must have the interferometry payload configured