Revised training examples for actions.

Author: seidewitz

…itions/Action Definition Example-1.sysml …initions/Action Definition Example.sysmlsysml/src/training/14. Action Definitions/Action Definition Example-1.sysml renamed to sysml/src/training/14. Action Definitions/Action Definition Example.sysml sysml/src/training/14. Action Definitions/Action Definition Example-1.sysml renamed to sysml/src/training/14. Action Definitions/Action Definition Example.sysml

@@ -1,4 +1,4 @@
-package 'Action Definition Example-1' {
+package 'Action Definition Example' {
 	item def Scene;
 	item def Image;
 	item def Picture;
@@ -11,7 +11,7 @@ package 'Action Definition Example-1' {
 
 		action focus: Focus (in scene, out image);
 
-		succession flow from focus.image to shoot.image;
+		flow from focus.image to shoot.image;
 
 		action shoot: Shoot (in image, out picture);
 

…itions/Action Definition Example-2.sysml …finitions/Action Shorthand Example.sysmlsysml/src/training/14. Action Definitions/Action Definition Example-2.sysml renamed to sysml/src/training/14. Action Definitions/Action Shorthand Example.sysml sysml/src/training/14. Action Definitions/Action Definition Example-2.sysml renamed to sysml/src/training/14. Action Definitions/Action Shorthand Example.sysml

@@ -1,4 +1,4 @@
-package 'Action Definition Example-1' {
+package 'Action Shorthand Example' {
 	item def Scene;
 	item def Image;
 	item def Picture;
@@ -15,8 +15,8 @@ package 'Action Definition Example-1' {
 			out item image;
 		}
 
-		action shoot: Shoot {
-			in item image succession flow from focus.image;
+		then action shoot: Shoot {
+			in item image flow from focus.image;
 			out item picture = TakePicture::picture;
 		}
 	}

sysml/src/training/14. Action Definitions/Action Succession Example-1.sysml

@@ -0,0 +1,26 @@
+package 'Action Succession Example-1' {
+	item def Scene;
+	item def Image;
+	item def Picture;
+	
+	action def Focus(in scene : Scene, out image : Image);
+	action def Shoot(in image: Image, out picture : Picture);	
+		
+	action def TakePicture {
+		in item scene : Scene;
+		out item picture : Picture;
+		
+		bind focus.scene = scene;
+		
+		action focus: Focus (in scene, out image);
+		
+		flow from focus.image to shoot.image;
+		
+		first focus then shoot;
+		
+		action shoot: Shoot (in image, out picture);
+		
+		bind shoot.picture = picture;
+	}
+	
+}

sysml/src/training/14. Action Definitions/Action Succession Example-2.sysml

@@ -0,0 +1,24 @@
+package 'Action Definition Example' {
+	item def Scene;
+	item def Image;
+	item def Picture;
+	
+	action def Focus(in scene : Scene, out image : Image);
+	action def Shoot(in image: Image, out picture : Picture);	
+		
+	action def TakePicture {
+		in item scene : Scene;
+		out item picture : Picture;
+		
+		bind focus.scene = scene;
+		
+		action focus: Focus (in scene, out image);
+		
+		succession flow from focus.image to shoot.image;
+		
+		action shoot: Shoot (in image, out picture);
+		
+		bind shoot.picture = picture;
+	}
+	
+}