Merge pull request #660 from Systems-Modeling/ST6RI-855/859

ST6RI-855/859 Fix eval invocations in TradeStudies model/Occurrences::surroundedByOccurrences::surroundingSpace should not be an end feature

Author: seidewitz

sysml.library/Domain Libraries/Analysis/TradeStudies.sysml

@@ -95,7 +95,7 @@ standard library package TradeStudies {
 			 * For a MinimizeObjective, the best value is the minimum one.
 			 */
 
-			in x; fn(x)
+			in x; eval(x)
 		};
 	}
 
@@ -117,7 +117,7 @@ standard library package TradeStudies {
 			 * For a MinimizeObjective, the best value is the maximum one.
 			 */
 
-			in x; fn(x)
+			in x; eval(x)
 		};
 	}
 

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

@@ -601,8 +601,8 @@ standard library package Occurrences {
 			 * Occurrences that have inner spaces that completely include this occurrence.
 			 */
 
-			feature surroundedSpace: Occurrence[1] subsets that;
-			end [1] feature surroundingSpace: Occurrence subsets self;
+			feature surroundedSpace: Occurrence [1] subsets that;
+			feature surroundingSpace: Occurrence [1] subsets self;
 
 			connector :InsideOf
 				from [0..1] smallerOccurrence references surroundedSpace