ST6RI-851 Corrected errors in example, training, validation models.

Author: seidewitz

sysml/src/examples/Simple Tests/ActionTest.sysml

@@ -32,7 +32,7 @@ package ActionTest {
 		}
 		flow aa.target to snd.receiver;
 		action snd send { 
-			:>> payload = s;
+			in :>> payload = s;
 		}
 		action snd2 send via this to aa.target;
 		bind s = snd2.payload;

sysml/src/examples/Simple Tests/UseCaseTest.sysml

@@ -23,6 +23,7 @@ package UseCaseTest {
 	part user : User;
 
 	use case uc2 {
+	    subject;
 		actor :>> user;
 	}
 

sysml/src/examples/Simple Tests/ViewTest.sysml

@@ -7,10 +7,12 @@ package ViewTest {
 	part def S;
 
 	concern def C {
+	    subject;
 		stakeholder s : S;
 	}
 
 	concern c : C {
+	    subject;
 		stakeholder s1;
 	}
 

sysml/src/examples/State Space Representation Examples/EVSample.sysml

@@ -81,7 +81,7 @@ package EVSample {
     }
 
     requirement def VehicleRequirement {
-        in vehicle : Vehicle;
+        subject vehicle : Vehicle;
     }
 
     analysis def VehicleAnalysis {
@@ -220,7 +220,7 @@ package EVSample {
     part smallEVRangeContext {
         requirement smallEVRequirement : VehicleRequirement {
             doc /* The small EVs must be ligher than 900[kg] */
-            in :>> vehicle = vehicle_compact;
+            subject :>> vehicle = vehicle_compact;
             /*  To comform with the regulation and the battery mass will impact it. */
             assume constraint { vehicle.mass < 900[kg] }
         }
@@ -257,6 +257,7 @@ package EVSample {
         }
 
         analysis maxSpeedAnalysisSmall :> smallEVAnalysis : MaxSpeedAnalysis {
+            subject;
             requirement :>> maxSpeedRequirement = maxSpeedRequirementSmall;
             out voltage :> ISQ::electricPotential = vehicle.battery.batteryBehavior.output.voltage;
             return simulatedMaxSpeed = vehicle.vehicleBehavior.output.velocity;
@@ -274,7 +275,7 @@ package EVSample {
     part largeEVRangeContext {
         requirement largeEVRequirement : VehicleRequirement {
             doc /* The large EVs must be ligher than 900[kg] */
-            in :>> vehicle = vehicle_large;
+            subject :>> vehicle = vehicle_large;
             /*  To comform with the regulation and the battery mass will impact it. */
             assume constraint { vehicle.mass < 1200[kg] }
         }
@@ -311,6 +312,7 @@ package EVSample {
         }
 
         analysis maxSpeedAnalysisLarge :> largeEVAnalysis : MaxSpeedAnalysis {
+            subject;
             requirement :>> maxSpeedRequirement = maxSpeedRequirementLarge;
             out voltage = vehicle.battery.batteryBehavior.output.voltage;
             return simulatedMaxSpeed = vehicle.vehicleBehavior.output.velocity;

sysml/src/examples/Vehicle Example/SysML v2 Spec Annex A SimpleVehicleModel.sysml

@@ -1548,6 +1548,7 @@ package SimpleVehicleModel{
             part def SafetyEngineer;
             concern def VehicleSafety {
                 doc /* identify system safety features */
+                subject;
                 stakeholder se:SafetyEngineer;
             }
         }

sysml/src/training/35. Use Cases/Use Case Usage Example.sysml

@@ -4,24 +4,30 @@ package 'Use Case Usage Example' {
 
 	part def 'Fuel Station';
 
-	use case 'provide transportation' : 'Provide Transportation' {		
+	use case 'provide transportation' : 'Provide Transportation' {
+	    subject vehicle;
+	    	
 		first start;
 
 		then include use case 'enter vehicle' : 'Enter Vehicle' {
+		    subject vehicle;
 			actor :>> driver = 'provide transportation'::driver;
 			actor :>> passengers = 'provide transportation'::passengers;
 		}
 
 		then use case 'drive vehicle' {
+            subject vehicle;
 			actor driver = 'provide transportation'::driver;
 			actor environment = 'provide transportation'::environment;
 
 			include 'add fuel'[0..*] { 
+                subject vehicle;
 				actor :>> fueler = driver;
 			}
 		}
 
 		then include use case 'exit vehicle' : 'Exit Vehicle' {
+            subject vehicle;
 			actor :>> driver = 'provide transportation'::driver;
 			actor :>> passengers = 'provide transportation'::passengers;
 		}

sysml/src/training/42. Views/Viewpoint Example.sysml

@@ -8,7 +8,7 @@ package 'Viewpoint Example' {
 		 * it is necessary to understand how it is broken down into
 		 * subsystems and components that provide those capabilities.
 		 */
-		 
+		subject;
 		stakeholder se : 'Systems Engineer';
 		stakeholder ivv : 'IV&V';
 	}
@@ -18,9 +18,9 @@ package 'Viewpoint Example' {
 		 * There should be well defined interfaces between the parts of
 		 * a system that allow each part to be understood individually,
 		 * as well as being part of the whole system.
-		 */
-		 
-		 stakeholder se : 'Systems Engineer';
+		 */		 
+        subject;
+		stakeholder se : 'Systems Engineer';
 	}
 
 	viewpoint 'system structure perspective' {		

sysml/src/validation/10-Analysis and Trades/10a-Analysis.sysml

@@ -44,7 +44,9 @@ package '10a-Analysis' {
 
 		analysis def MassAnalysisCase {
 			subject vehicle : Vehicle;
-			objective : MassAnalysisObjective;
+			objective : MassAnalysisObjective {
+			    subject = MassAnalysisCase::result;
+			}
 
 			// Result
 			vehicle.mass

sysml/src/validation/11-View and Viewpoint/11a-View-Viewpoint.sysml

@@ -35,6 +35,7 @@ package '11a-View-Viewpoint' {
 		part 'systems engineer';
 
 		concern 'system breakdown' {
+			subject;
 			stakeholder :>> 'systems engineer';
 		}
 

sysml/src/validation/18-Use Case/18-Use Case.sysml

@@ -31,6 +31,7 @@ package '18-Use Case' {
 		first start;
 
 		then include 'enter vehicle' {
+		    subject;
 			actor :>> driver = 'provide transportation'::driver;
 			actor :>> passengers = 'provide transportation'::passengers;
 		}
@@ -43,7 +44,7 @@ package '18-Use Case' {
 				 * (But reference to 'add fuel' is in the wrong direction, and it doesn't
 				 * make the extension condition sufficient to trigger the behavior.)
 				 */
-			 
+                subject;
 				actor :>> fueler = driver;
 				ref :>> start {
 					doc /* Fuel level < 10% max fuel */
@@ -52,6 +53,7 @@ package '18-Use Case' {
 		}
 
 		then include 'exit vehicle' {
+		    subject;
 			actor :>> driver = 'provide transportation'::driver;
 			actor :>> passengers = 'provide transportation'::passengers;
 		}