SYSML2_-158 Updated SysML examples on individuals/snapshots/timeslices.

Author: seidewitz

sysml/src/examples/Individuals Examples/JohnIndividualExample.sysml

@@ -46,12 +46,14 @@ package JohnIndividualExample {
 	  	}
 	}
 
-	timeslice item UnitedStatesWithJohnAsPresident[*] : UnitedStates {
-		doc
-		/*
-		 * These are the time slices of the United States during
-		 * which John is president of the United States.
-		 */
-		ref :>> presidentOfUS : John;
+	individual UnitedStatesWithJohnAsPresident : UnitedStates {
+    	timeslice item UnitedStatesWhenJohnIsPresident[*] : UnitedStates {
+    		doc
+    		/*
+    		 * These are the time slices of the United States during
+    		 * which John is president of the United States.
+    		 */
+    		ref :>> presidentOfUS : John;
+    	}
 	}
 }

sysml/src/examples/Simple Tests/OccurrenceTest.sysml

@@ -22,11 +22,10 @@ package OccurrenceTest {
 	}
 	individual occurrence ind : Ind, Occ {
 		snapshot s3;
-		individual timeslice t3;
+		individual timeslice t3 :> ind;
+        individual snapshot s4 : Ind;
 	}
-	
-	individual snapshot s4 : Ind;
-	
+
 	occurrence o1 {
 	  occurrence o2;
 	}

sysml/src/examples/Vehicle Example/VehicleIndividuals.sysml

@@ -31,81 +31,85 @@ package VehicleIndividuals {
 
 	package IndividualSnapshots {
 		public import IndividualDefinitions::*;
+		private import Occurrences::HappensJustBefore;
 
 		attribute t0: DateTime;
 		attribute t1: DateTime;
 
-		snapshot part vehicle1_t0: Vehicle1 {
-			doc
-			/*
-			 * This is a snapshot of Vehicle1 at time t0;
-			 */
-		
-			// Note: Timestamping of snapshots is not yet formalized.
-			attribute t = t0;
-		}
-		
-		timeslice part vehicle1_t0_t1: Vehicle1 {
-			doc
-			/*
-			 * This is a time slice of Vehicle1 starting at snapshot vehicle1_t0 
-			 * (time t0) and ending at time t1.
-			 */
-		
-			snapshot :>> start = vehicle1_t0;
-			snapshot :>> done {
-				attribute t = t1;
-			}
+		individual part vehicle1 : Vehicle1 {
+    		snapshot vehicle1_t0 {
+    			doc
+    			/*
+    			 * This is a snapshot of Vehicle1 at time t0;
+    			 */
+    		
+    			attribute :>> localClock.currentTime = t0;
+    		}
+    		
+    		succession : HappensJustBefore first vehicle1_t0 then vehicle1_t0_t1;
+    		
+    		timeslice vehicle1_t0_t1 {
+    			doc
+    			/*
+    			 * This is a time slice of Vehicle1 starting at snapshot vehicle1_t0 
+    			 * (time t0) and ending at time t1.
+    			 */
+    		
+    			snapshot :>> done {
+    				attribute :>> localClock.currentTime = t1;
+    			}
+    		}
 		}	
 	}
 
 	package IndividualConfigurations {
 		public import IndividualSnapshots::*;
 
-		individual part vehicle1_C2: Vehicle1 :> vehicle_C2 {
+		individual part vehicle1_C2: Vehicle1 :> vehicle_C2, vehicle1 {
 			doc
 			/*
 			 * This asserts that for some portion of its lifetime, Vehicle1 conforms
 			 * to the configuration vehicle_C2;
 			 */
-		}	
-			
-		snapshot part vehicle1_C2_t0 : Vehicle1 :> vehicle1_C2, vehicle1_t0 {
-			doc
-			/*
-			 * This is a snapshot of Vehicle1 in configuration vehicle1_C2 at time t0.
-			 */
-		
-			snapshot axleAssembly1_t0: AxleAssembly1 :>> frontAxleAssembly {
-				doc
-				/*
-				 * frontAxleAssembly is a feature of vehicle1_C2.
-				 */
 
-				snapshot leftFrontWheel_t0: Wheel1 :>> leftFrontWheel {
-					doc
-					/*
-					 * This asserts that Wheel1 is the leftFrontWheel of vehicle_C2_t0
-					 * (leftFrontWheel is a feature of vehicle_C2::frontAxleAssembly).
-					 */
-				}
-			}
-		}
+    		snapshot vehicle1_C2_t0 :> vehicle1_t0 {
+    			doc
+    			/*
+    			 * This is a snapshot of Vehicle1 in configuration vehicle1_C2 at time t0.
+    			 */
+    		
+    			individual axleAssembly1_t0: AxleAssembly1 :>> frontAxleAssembly {
+    				doc
+    				/*
+    				 * frontAxleAssembly is a feature of vehicle1_C2.
+    				 */
+    			
+    				individual leftFrontWheel_t0: Wheel1 :>> leftFrontWheel {
+    					doc
+    					/*
+    					 * This asserts that Wheel1 is the leftFrontWheel of vehicle_C2_t0
+    					 * (leftFrontWheel is a feature of vehicle_C2::frontAxleAssembly).
+    					 */
+    				}
+    			}
+    		}
 
-		snapshot part vehicle1_C2_t1 : Vehicle1 :> vehicle1_C2, vehicle1_t0_t1.done {
-			doc
-			/*
-			 * This is a snapshot of Vehicle1 in configuration vehicle_C2 at time t1.
-			 */
-		
-			snapshot axleAssembly1_t1: AxleAssembly1 :>> frontAxleAssembly {
-				snapshot rightFrontWheel_t1: Wheel1 :>> rightFrontWheel {
-					doc
-					/*
-					 * This asserts that Wheel1 is the rightFrontWheel of vehicle_C2_t1.
-					 */
-				}
-			}
-		}	
+    		snapshot vehicle1_C2_t1 :> vehicle1_t0_t1.done {
+    			doc
+    			/*
+    			 * This is a snapshot of Vehicle1 in configuration vehicle_C2 at time t1.
+    			 */
+    		
+    			individual axleAssembly1_t1: AxleAssembly1 :>> frontAxleAssembly {
+    				individual rightFrontWheel_t1: Wheel1 :>> rightFrontWheel {
+    					doc
+    					/*
+    					 * This asserts that Wheel1 is the rightFrontWheel of vehicle_C2_t1.
+    					 */
+    				}
+    			}
+    		}	
+	       
+        }
 	}
 }