Made minor model updates.

Author: seidewitz

sysml.library/Kernel Libraries/Kernel Function Library/DataFunctions.kerml

@@ -7,13 +7,15 @@ standard library package DataFunctions {
 
 	private import Base::DataValue;
 	private import ScalarValues::Boolean;
-	private import ControlFunctions::reduce;
+	private import ControlFunctions::reduce;	
 
+	abstract function '==' specializes BaseFunctions::'==' { in x: DataValue[0..1]; in y: DataValue[0..1]; 
+		return : Boolean[1];
+	}
 	function '===' specializes BaseFunctions::'==='{ in x: DataValue[0..1]; in y: DataValue[0..1]; 
 		return : Boolean[1] = x == y;
 	}
 
-	
 	abstract function '+' { in x: DataValue[1]; in y: DataValue[0..1]; return : DataValue[1]; }
 	abstract function '-' { in x: DataValue[1]; in y: DataValue[0..1]; return : DataValue[1]; }
 	abstract function '*' { in x: DataValue[1]; in y: DataValue[1]; return : DataValue[1]; }
@@ -37,7 +39,5 @@ standard library package DataFunctions {
 	abstract function Max { in x: DataValue[1]; in y: DataValue[1]; return : DataValue[1]; }
 	abstract function Min { in x: DataValue[1]; in y: DataValue[1]; return : DataValue[1]; }
 
-	abstract function '==' specializes BaseFunctions::'==' { in x: DataValue[0..1]; in y: DataValue[0..1]; return : Boolean[1]; }
-	
 	abstract function '..' { in lower: DataValue[1]; in upper: DataValue[1]; return : DataValue[0..*] ordered; }	
 }

sysml/src/training/26. Occurrences/Interaction Example-2.sysml

@@ -8,22 +8,22 @@ package 'Interaction Example-2' {
 	occurrence def CruiseControlInteraction {
 
 		ref part driver : Driver {
-			event setSpeedMessage.source;
+			event setSpeedMessage.sourceEvent;
 		}
 
 		ref part vehicle : Vehicle {
 			part cruiseController : CruiseController {
-				event setSpeedMessage.target;		
-				then event sensedSpeedMessage.target;		
-				then event fuelCommandMessage.source;
+				event setSpeedMessage.targetEvent;		
+				then event sensedSpeedMessage.targetEvent;		
+				then event fuelCommandMessage.sourceEvent;
 			}
 
 			part speedometer : Speedometer {
-				event sensedSpeedMessage.source;
+				event sensedSpeedMessage.sourceEvent;
 			}
 
 			part engine : Engine {
-				event fuelCommandMessage.target;
+				event fuelCommandMessage.targetEvent;
 			}
 		}