Updated SysML training examples.

Author: seidewitz

kerml/src/examples/Simple Tests/Classes.kerml

@@ -9,8 +9,8 @@ package Classes {
 	}
 
 	abstract class B {
-		public abstract a: A;
-		packaged abstract x: C;
+		public abstract feature a: A;
+		packaged abstract feature x: C;
 		package P { }
 	}
 

sysml/src/training/01. Packages/Comment Example.sysml

@@ -0,0 +1,23 @@
+package 'Comment Example' {
+	/* This is documentary comment, part of the model, 
+	 * annotating (by default) its owning package. */
+	
+	comment Comment1 /* This is a named documentary comment. */
+	
+	comment on Automobile
+	/* This is an unnamed documentary comment, 
+	 * annotating an explicitly specified element. 
+	 */
+	 
+	block Automobile;
+	
+	/**
+	 * This is a documentary comment, annotating the
+	 * following element.
+	 */
+	block Car is Automobile;	                         
+	
+	// This is a lexical comment ("note"). 
+	// It is in the text, but not part of the model.
+	private value type Torque is ISQ::TorqueValue;
+}

sysml/src/training/01. Packages/Package Example.sysml

@@ -1,17 +1,9 @@
-/**
- * This is a documentary comment.
- * It is part of the model.
- */
 package 'Package Example' {
 	private import ScalarValues::*;
-	
-	/*
-	 * This is a lexical comment ("note").
-	 * It is in the text, but not part of the model.
-	 */
+	 
 	block Automobile;
 
-	block Car is Automobile; // This is also a lexical comment.
+	block Car is Automobile;	                         
 
-	private value type Torque is ISQ::TorqueValue;	
+	private value type Torque is ISQ::TorqueValue;
 }

sysml/src/training/08. Ports/Port Conjugation Example.sysml

@@ -11,10 +11,10 @@ package 'Port Conjugation Example' {
 	}
 
 	block FuelTank {
-		port fuelTankPort : ~FuelPort;
+		port fuelTankPort : FuelPort;
 	}
 
 	block Engine {
-		port engineFuelPort : FuelPort;
+		port engineFuelPort : ~FuelPort;
 	}
 }

sysml/src/training/16. Control/Camera.sysml

@@ -1,4 +1,4 @@
-package 'Allocation Example' {
+package Camera {
 	import 'Action Decomposition'::*;
 
 	block Camera;

sysml/src/training/16. Control/Decision Example.sysml

@@ -0,0 +1,28 @@
+package 'Decision Example' {
+	import ScalarValues::*;
+	
+	value type BatteryCharged;
+	
+	part battery;
+	part powerSystem;
+	
+	activity AddCharge (in charge : Real);
+	
+	activity ChargeBattery {
+		first start;
+
+		then merge continueCharging;
+		
+		then accept monitor (batteryCharge : Real);
+		
+		then decide;
+			if monitor::batteryCharge < 100 then addCharge;
+			if monitor::batteryCharge >= 100 then signalCharged;
+			
+		action addCharge : AddCharge (batteryCharge);
+		then continueCharging;
+		
+		send signalCharged of BatteryCharged() to powerSystem;
+		then done;
+	}
+}

sysml/src/training/16. Control/Fork Join Example.sysml

@@ -0,0 +1,36 @@
+package 'Fork Join Example' {
+	import ScalarValues::*;
+	
+	value type TurnKeyToOn;
+	value type BrakePressure;
+	
+	activity MonitorBrakePedal(out brakePressure : BrakePressure);
+	activity MonitorTraction(out modulationFrequency : Real);
+	activity Braking(in brakePressure : BrakePressure, in modulationFrequency : Real);
+	
+	activity Brake {
+		accept (TurnKeyToOn);
+		
+		then fork;
+			then monitorBrakePedal;
+			then monitorTraction;
+			then braking;
+		
+		action monitorBrakePedal : MonitorBrakePedal (
+			out brakePressure
+		);
+		then joinNode;
+		
+		action monitorTraction : MonitorTraction (
+			out modulationFrequency);
+		then joinNode;
+		
+		action braking : Braking(
+			in stream from monitorBrakePedal::brakePressure, 
+			in stream from monitorTraction::modulationFrequency);
+		then joinNode;
+		
+		join joinNode;
+		then done;
+	}
+}

sysml/src/training/16. Control/Control Example.sysml renamed to sysml/src/training/16. Control/Merge Example.sysml

@@ -1,4 +1,4 @@
-package 'Control Example' {
+package 'Merge Example' {
 	block Scene;
 	block Image;
 	block Picture;