KERML11-76 Fixed diamond inheritance problems in kernel libraries.

Kernel Semantic Library
- FeatureReferencePerformances
- Objects
- Observation

Kernel Function Library
- VectorFunctions

Author: seidewitz

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

@@ -179,7 +179,9 @@ standard library package VectorFunctions {
 	}
 	function CartesianThreeVectorOf specializes CartesianVectorOf { 
 		in components: Real[3] ordered nonunique;
-		return : CartesianThreeVectorValue[1];
+		return : CartesianThreeVectorValue[1] {
+		    feature :>> CartesianVectorOf::result::dimension, CartesianThreeVectorValue::dimension;
+		}
 	}
 
 	feature cartesianZeroVector: CartesianVectorValue[3] =

sysml.library/Kernel Libraries/Kernel Semantic Library/FeatureReferencingPerformances.kerml

@@ -133,8 +133,8 @@ standard library package FeatureReferencingPerformances {
 		 */
 
 		in feature onOccurrence : Evaluation redefines onOccurrence {
-	    	protected monitoredOccurrence : Evaluation [1] redefines monitoredOccurrence {
-				out result : Anything[*] redefines result, monitoredFeature; 
+	    	protected expr monitoredOccurrence : Evaluation [1] redefines monitoredOccurrence {
+				return result : Anything[*] redefines result, monitoredFeature; 
 			} 
 		} 
 	}
@@ -147,7 +147,9 @@ standard library package FeatureReferencingPerformances {
 		 */	
 
 	  	in bool redefines onOccurrence {
-	    	protected bool redefines monitoredOccurrence[1];
+	    	protected bool redefines monitoredOccurrence[1] {
+	    	    return result : Boolean [1];
+	    	}
 		}
 		out redefines afterValues : Boolean [1]; 
 		out redefines beforeValues : Boolean [1];	 
@@ -167,10 +169,16 @@ standard library package FeatureReferencingPerformances {
   		feature isToTrue : Boolean [1] default true;
   		out afterValues: Boolean[1] redefines values  = isToTrue;
   		private feature monitor1 : BooleanEvaluationResultMonitorPerformance [1] {
-    		feature redefines endWhen : HappensJustBefore;
+    		feature redefines endWhen : HappensJustBefore {
+    		    end feature earlierOccurrence;
+    		    end feature laterOccurrence;
+    		}
   		}
   		private feature monitor2 : BooleanEvaluationResultMonitorPerformance [1] {
-    		feature redefines endWhen : HappensJustBefore;
+    		feature redefines endWhen : HappensJustBefore {
+                end feature earlierOccurrence;
+                end feature laterOccurrence;
+            }
   		}
 
   		private connector : HappensJustBefore from [1] monitor1 to [0..1] monitor2;

sysml.library/Kernel Libraries/Kernel Semantic Library/Objects.kerml

@@ -165,12 +165,13 @@ standard library package Objects {
 		 * inner space dimension of structured space object is the highest of their cells.
 		 */
 
-		abstract portion feature structuredSpaceObjectCells : StructuredSpaceObject[1..*] subsets Occurrence::spaceSlices
+        abstract portion feature structuredSpaceObjectCells : StructuredSpaceObject[1..*] subsets Occurrence::spaceSlices
 		  { feature cellOrientation : Integer [0..1];
 		    inv { notEmpty(cellOrientation) implies (cellOrientation >= -1 & cellOrientation <= 1) }
 		  }
 
 		portion feature faces : Surface[0..*] ordered subsets structuredSpaceObjectCells {
+		    feature redefines Surface::innerSpaceDimension, structuredSpaceObjectCells::innerSpaceDimension;
 			feature redefines edges subsets StructuredSpaceObject::edges;
 			feature redefines vertices subsets StructuredSpaceObject::vertices;
 			derived feature redefines spaceBoundary; 
@@ -179,13 +180,16 @@ standard library package Objects {
 		}
 
 		portion feature edges : Curve[0..*] ordered subsets structuredSpaceObjectCells {
+            feature redefines Curve::innerSpaceDimension, structuredSpaceObjectCells::innerSpaceDimension;
 			feature redefines vertices subsets StructuredSpaceObject::vertices;
 			derived feature redefines spaceBoundary;
 			inv { isEmpty(spaceBoundary) == isEmpty(vertices) }
 			inv { notEmpty(spaceBoundary) implies contains(spaceBoundary.unionsOf, vertices) }
 		}
 
-		portion feature vertices : Point[0..*] ordered subsets structuredSpaceObjectCells;
+		portion feature vertices : Point[0..*] ordered subsets structuredSpaceObjectCells{
+            feature redefines Point::innerSpaceDimension, structuredSpaceObjectCells::innerSpaceDimension;		    
+		}
 
 		derived feature redefines innerSpaceDimension = 
 			if notEmpty(faces) ? 2 else if notEmpty(edges) ? 1 else 0;

sysml.library/Kernel Libraries/Kernel Semantic Library/Observation.kerml

@@ -92,6 +92,7 @@ standard library package Observation {
 	    	end feature source {
 	    		feature redefines sourceOutput = changeSignal;
 	    	}
+	    	end feature target;
 	    }
 	}