Merge pull request #470 from Systems-Modeling/ST6RI-658

ST6RI-658 spaceTimeCoincidentOccurrences should subset timeCoincidentOccurrences

Author: seidewitz

sysml.library/Kernel Libraries/Kernel Semantic Library/Occurrences.kerml

@@ -151,11 +151,12 @@ standard library package Occurrences {
 			 */
 
 			/* timeCoincidentOccurrences occurrences happen during each other. */
-			feature thisOccurrence: Occurrence[1] subsets that;
-			feature thatOccurrence: Occurrence[1] subsets self;
+			feature thatOccurrence: Occurrence[1] subsets longerOccurrence;
+			feature thisOccurrence: Occurrence[1] subsets shorterOccurrence;
+
 			connector :HappensDuring
-				from shorterOccurrence references thatOccurrence [1]
-				to longerOccurrence references thisOccurrence [1];
+				from shorterOccurrence references thisOccurrence [1]
+				to longerOccurrence references thatOccurrence [1];
 		}
 
 		feature spaceEnclosedOccurrences: Occurrence[1..*] subsets occurrences {
@@ -166,8 +167,8 @@ standard library package Occurrences {
 			 */
 
 			/* spaceEnclosedOccurrences is transitive. */
-			feature smallerSpace: Occurrence[1] subsets that;
-			feature largerSpace: Occurrence[1] subsets self;
+			feature largerSpace: Occurrence[1] subsets that;
+			feature smallerSpace: Occurrence[1] subsets self;
 			subset smallerSpace.spaceEnclosedOccurrences subsets largerSpace.spaceEnclosedOccurrences;
 		}
 
@@ -189,12 +190,20 @@ standard library package Occurrences {
 			binding startShot[1] = endShot[1];
 		}
 
-		feature spaceTimeCoincidentOccurrences: Occurrence[1..*] subsets spaceTimeEnclosedOccurrences inverse of spaceTimeCoincidentOccurrences {
+		feature spaceTimeCoincidentOccurrences: Occurrence[1..*] subsets timeCoincidentOccurrences, spaceEnclosedOccurrences inverse of spaceTimeCoincidentOccurrences {
 			doc
 			/*
 			 * Occurrences that this one completely includes in both space and time,
 			 * and vice-versa, including this one.
 			 */
+
+			/* spaceTimeCoincidentOccurrences occurrences are inside of each other. */
+			feature redefines thatOccurrence subsets largerSpace;
+			feature redefines thisOccurrence subsets smallerSpace;
+
+			connector :InsideOf
+				from largerSpace references thatOccurrence [1]
+				to smallerSpace references thisOccurrence [1];
 		}
 
 		feature outsideOfOccurrences: Occurrence[0..*] subsets withoutOccurrences inverse of outsideOfOccurrences {
@@ -750,17 +759,17 @@ standard library package Occurrences {
 		end feature largerOccurrence: Occurrence[1..*] redefines longerOccurrence, largerSpace;
 	 }
 
-	assoc all WithinBoth specializes Within {
+	assoc all WithinBoth specializes Within, HappensWhile {
 		doc
 		/*
 		 * WithinBoth asserts that two occurrences are Within each other, that is, they occupy the
 		 * same four dimensional region.  Note that this means every Occurrence is WithinBoth with
 		 * itself and transitive.
 		 */
 
-		end feature thisOccurrence: Occurrence[1..*] redefines smallerOccurrence
+		end feature thisOccurrence redefines smallerOccurrence redefines HappensWhile::thisOccurrence
 		  subsets thatOccurrence.spaceTimeCoincidentOccurrences;
-		end feature thatOccurrence: Occurrence[1..*] redefines largerOccurrence
+		end feature thatOccurrence redefines largerOccurrence redefines HappensWhile::thatOccurrence 
 		  subsets thisOccurrence.spaceTimeCoincidentOccurrences;
 	}