ST6RI-811 Gave a deterministic ordering to implicit general types.

Author: seidewitz

org.omg.sysml.interactive/.launch/SysML Interactive Library Index Generator.launch

@@ -17,5 +17,5 @@
     <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="&quot;${workspace_loc:/SysML-v2-Pilot-Implementation/sysml.library}&quot;"/>
     <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.omg.sysml.interactive"/>
     <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="C:\Users\GatiL\Documents\git\SysML-v2-Pilot-Implementation\org.omg.sysml.interactive\.launch"/>
+    <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:sysml.library}"/>
 </launchConfiguration>

org.omg.sysml/src/org/omg/sysml/adapter/TypeAdapter.java

@@ -24,6 +24,7 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -188,7 +189,16 @@ public boolean isImplicitGeneralTypesEmpty() {
 	}
 
 	public Collection<EClass> getImplicitGeneralTypeKinds() {
-		return implicitGeneralTypes.keySet();
+		// Sort keys, to ensure a deterministic ordering of implied specializations 
+		// for implicit general types.
+		List<EClass> keyList = new ArrayList<>(implicitGeneralTypes.keySet());
+		Collections.sort(keyList, new Comparator<EClass>() {
+			@Override
+			public int compare(EClass c1, EClass c2) {
+				return Integer.compare(c1.getClassifierID(), c2.getClassifierID());
+			}			
+		});
+		return keyList;
 	}
 
 	public void forEachImplicitBindingConnector(Consumer<BindingConnector> consumer) {
@@ -211,13 +221,15 @@ public void forEachImplicitBindingConnector(BiConsumer<BindingConnector, EClass>
 
 	public List<Type> getImplicitGeneralTypes() {
 		computeImplicitGeneralTypes();
-		return implicitGeneralTypes.values().stream().
+		
+		return getImplicitGeneralTypeKinds().stream().
+				map(implicitGeneralTypes::get).
 				flatMap(Collection::stream).
 				collect(Collectors.toList());
 	}
 
 	public List<Type> getImplicitGeneralTypes(EClass eClass) {
-		return implicitGeneralTypes.keySet().stream().
+		return getImplicitGeneralTypeKinds().stream().
 				filter(eClass::isSuperTypeOf).
 				flatMap(keyClass->getImplicitGeneralTypesOnly(keyClass).stream()).
 				collect(Collectors.toList());
@@ -258,7 +270,7 @@ public void removeImplicitGeneralType(EClass eClass) {
 	}
 
 	public void forEachImplicitGeneralType(BiConsumer<EClass, Type> action) {
-		for (EClass eClass : implicitGeneralTypes.keySet()) {
+		for (EClass eClass : getImplicitGeneralTypeKinds()) {
 			for (Type supertype : implicitGeneralTypes.get(eClass)) {
 				action.accept(eClass, supertype);
 			}

sysml.library/.index.json

@@ -92131,13 +92131,15 @@
       "dispatchScope",
       "done",
       "enactedPerformances",
+      "endShot",
       "envelopingShapes",
       "immediatePredecessors",
       "immediateSuccessors",
       "incomingTransferSort",
       "incomingTransfers",
       "incomingTransfersToSelf",
       "innerSpaceDimension",
+      "innerSpaceOccurrences",
       "intersectionsOf",
       "involvingPerformances",
       "isClosed",
@@ -92167,6 +92169,7 @@
       "shorterOccurrence",
       "snapshotOf",
       "snapshots",
+      "spaceBoundary",
       "spaceBoundaryOf",
       "spaceEnclosedOccurrences",
       "spaceInterior",
@@ -92179,6 +92182,7 @@
       "spaceTimeEnclosedOccurrences",
       "spaceTimeEnclosedPoints",
       "start",
+      "startShot",
       "structuredSpaceBoundary",
       "subitems",
       "subobjects",
@@ -92284,13 +92288,15 @@
       "dispatchScope",
       "done",
       "enactedPerformances",
+      "endShot",
       "envelopingShapes",
       "immediatePredecessors",
       "immediateSuccessors",
       "incomingTransferSort",
       "incomingTransfers",
       "incomingTransfersToSelf",
       "innerSpaceDimension",
+      "innerSpaceOccurrences",
       "intersectionsOf",
       "involvingPerformances",
       "isClosed",
@@ -92320,6 +92326,7 @@
       "shorterOccurrence",
       "snapshotOf",
       "snapshots",
+      "spaceBoundary",
       "spaceBoundaryOf",
       "spaceEnclosedOccurrences",
       "spaceInterior",
@@ -92332,6 +92339,7 @@
       "spaceTimeEnclosedOccurrences",
       "spaceTimeEnclosedPoints",
       "start",
+      "startShot",
       "structuredSpaceBoundary",
       "subitems",
       "subobjects",
@@ -278567,5 +278575,5 @@
       "withoutOccurrences"
     ]
   },
-  "checksum": "62c9b321ce3252a9f3a94985874041a1be697db73cd6d2fea730ac97bd03d2e1"
+  "checksum": "18da3df101a78979cf8b437b6260a48eae8cbfee0c54460bb70e59dead06a524"
 }