ST6RI-925 Cached Type::featureMemberships to improve performance.

Author: seidewitz

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

@@ -46,6 +46,7 @@
 import org.omg.sysml.lang.sysml.Element;
 import org.omg.sysml.lang.sysml.Expression;
 import org.omg.sysml.lang.sysml.Feature;
+import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.Specialization;
 import org.omg.sysml.lang.sysml.Membership;
 import org.omg.sysml.lang.sysml.ResultExpressionMembership;
@@ -202,18 +203,38 @@ protected Collection<Feature> getFeaturesRedefinedByType() {
 		}
 		return redefinedFeatures;		
 	}
+	
+	public EList<FeatureMembership> getFeatureMembership() {
+		if (featureMembership == null) {
+			Type target = getTarget();
+			EList<FeatureMembership> featureMemberships = new NonNotifyingEObjectEList<FeatureMembership>(FeatureMembership.class, (InternalEObject) target, SysMLPackage.TYPE__FEATURE_MEMBERSHIP);
+			featureMemberships.addAll(target.getOwnedFeatureMembership());
+			// For improved performance, compute supertypes only once.
+			List<Type> allSupertypes = target.allSupertypes();
+			for (Membership membership: target.getInheritedMembership()) {
+				if (membership instanceof FeatureMembership && 
+						allSupertypes.contains(membership.getMembershipOwningNamespace())) {
+					featureMemberships.add((FeatureMembership)membership);
+				}
+			}
+			featureMembership = featureMemberships;
+		}
+		return featureMembership;
+	}
 
 	// Caching
 
 	private EList<Membership> inheritedMembership = null;
 	private EList<Membership> nonPrivateMembership = null;
-	private Collection<Feature> redefinedFeatures = null;	
+	private Collection<Feature> redefinedFeatures = null;
+	private EList<FeatureMembership> featureMembership = null;
 
 	public void clearCaches() {
 		super.clearCaches();
 		inheritedMembership = null;
 		nonPrivateMembership = null;
 		redefinedFeatures = null;
+		featureMembership = null;
 	}
 
 	// Implicit Elements

org.omg.sysml/src/org/omg/sysml/delegate/setting/Type_featureMembership_SettingDelegate.java

@@ -1,7 +1,7 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
  * Copyright (c) 2022 Siemens AG
- * Copyright (c) 2022 Model Driven Solutions, Inc.
+ * Copyright (c) 2022, 2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -22,13 +22,11 @@
 
 package org.omg.sysml.delegate.setting;
 
-import java.util.List;
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.EStructuralFeature;
 import org.eclipse.emf.ecore.InternalEObject;
-import org.omg.sysml.lang.sysml.FeatureMembership;
 import org.omg.sysml.lang.sysml.Type;
-import org.omg.sysml.util.NonNotifyingEObjectEList;
+import org.omg.sysml.util.TypeUtil;
 
 public class Type_featureMembership_SettingDelegate extends BasicDerivedListSettingDelegate {
 
@@ -38,18 +36,7 @@ public Type_featureMembership_SettingDelegate(EStructuralFeature eStructuralFeat
 
 	@Override
 	protected EList<?> basicGet(InternalEObject owner) {
-		Type self = (Type)owner;
-		
-		EList<FeatureMembership> featureMemberships = new NonNotifyingEObjectEList<>(FeatureMembership.class, owner, eStructuralFeature.getFeatureID());
-		featureMemberships.addAll(self.getOwnedFeatureMembership());
-		// For improved performance, compute supertypes only once.
-		List<Type> allSupertypes = self.allSupertypes();
-		self.getInheritedMembership().stream().
-			filter(FeatureMembership.class::isInstance).
-			map(FeatureMembership.class::cast).
-			filter(membership->allSupertypes.contains(membership.getOwningType())).
-			forEachOrdered(featureMemberships::add);
-		return featureMemberships;
+		return TypeUtil.getFeatureMembershipOf((Type)owner);
 	}
 
 }

org.omg.sysml/src/org/omg/sysml/util/TypeUtil.java

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021-2022, 2024-2025 Model Driven Solutions, Inc.
+ * Copyright (c) 2021-2022, 2024-2026 Model Driven Solutions, Inc.
  *    
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -104,6 +104,10 @@ public static List<Feature> getFeaturesRedefinedBy(Type type, Feature skip) {
 				flatMap(feature->FeatureUtil.getRedefinedFeaturesWithComputedOf(feature).stream()).
 				toList();
 	}
+	
+	public static EList<FeatureMembership> getFeatureMembershipOf(Type type) {
+		return getTypeAdapter(type).getFeatureMembership();
+	}
 
 	// Supertypes