SYSML2_-158 Implemented semantic/validation constraints per resolution.

Author: seidewitz

org.omg.kerml.expressions.xtext/src/org/omg/kerml/expressions/xtext/KerMLExpressions.xtext

@@ -1,6 +1,6 @@
 /*****************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2018-2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2018-2025 Model Driven Solutions, Inc.
  * Copyright (c) 2018 IncQuery Labs Ltd.
  * Copyright (c) 2019 Maplesoft (Waterloo Maple, Inc.)
  * Copyright (c) 2019 Mgnite Inc.

org.omg.kerml.xtext/src/org/omg/kerml/xtext/KerML.xtext

@@ -1,6 +1,6 @@
 /*****************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2018-2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2018-2025 Model Driven Solutions, Inc.
  * Copyright (c) 2018 IncQuery Labs Ltd.
  * Copyright (c) 2019 Maplesoft (Waterloo Maple, Inc.)
  * Copyright (c) 2019 Mgnite Inc.

org.omg.sysml.xtext/src/org/omg/sysml/xtext/SysML.xtext

@@ -1,6 +1,6 @@
 /*****************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2018-2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2018-2025 Model Driven Solutions, Inc.
  * Copyright (c) 2018 IncQuery Labs Ltd.
  * Copyright (c) 2019 Maplesoft (Waterloo Maple, Inc.)
  * Copyright (c) 2019 Mgnite Inc.

org.omg.sysml.xtext/src/org/omg/sysml/xtext/validation/SysMLValidator.xtend

@@ -174,16 +174,16 @@ class SysMLValidator extends KerMLValidator {
 	public static val INVALID_EVENT_OCCURRENCE_USAGE_REFERENCE = "validateEventOccurrenceUsageReferent"
 	public static val INVALID_EVENT_OCCURRENCE_USAGE_REFERENCE_MSG = "Must reference an occurrence."
 
-	public static val INVALID_OCCURRENCE_DEFINITION_LIFE_CLASS = "validateOccurrenceDefinitionLifeClass"
-	public static val INVALID_OCCURRENCE_DEFINITION_LIFE_CLASS_MSG_1 = "Must have exactly one LifeClass."
-	public static val INVALID_OCCURRENCE_DEFINITION_LIFE_CLASS_MSG_2 = "Must not have a LifeClass."
-	
 	public static val INVALID_OCCURRENCE_USAGE_TYPE = "validateOccurrenceUsageType_"
 	public static val INVALID_OCCURRENCE_USAGE_TYPE_MSG = "An occurrence must be typed by occurrence definitions."
 	public static val INVALID_OCCURRENCE_USAGE_INDIVIDUAL_DEFINITION = "validateOccurrenceUsageIndividualDefinition"
 	public static val INVALID_OCCURRENCE_USAGE_INDIVIDUAL_DEFINITION_MSG = "At most one individual definition is allowed."
 	public static val INVALID_OCCURRENCE_USAGE_INDIVIDUAL_USAGE = "validateOccurrenceUsageIndividualUsage"
 	public static val INVALID_OCCURRENCE_USAGE_INDIVIDUAL_USAGE_MSG = "An individual must be typed by one individual definition."	
+	public static val INVALID_OCCURRENCE_USAGE_IS_PORTION = "validateOccurrenceUsageIsPortion"
+	public static val INVALID_OCCURRENCE_USAGE_IS_PORTION_MSG = "Must be a portion."	
+	public static val INVALID_OCCURRENCE_USAGE_PORTION_KIND = "validateOccurrenceUsageIsPortion"
+	public static val INVALID_OCCURRENCE_USAGE_PORTION_KIND_MSG = "Must be owned by an occurrence definition or usage."	
 
 	public static val INVALID_ITEM_DEFINITION_SPECIALIZATION = "validateClassSpecialization"
 	public static val INVALID_ITEM_DEFINITION_SPECIALIZATION_MSG = "Cannot specialize attribute definition"    	
@@ -577,6 +577,17 @@ class SysMLValidator extends KerMLValidator {
 		} else if (usg.isIndividual && nIndividualDefs != 1) {
 			error (INVALID_OCCURRENCE_USAGE_INDIVIDUAL_USAGE_MSG, SysMLPackage.eINSTANCE.occurrenceUsage_OccurrenceDefinition, INVALID_OCCURRENCE_USAGE_INDIVIDUAL_USAGE)
 		}
+		
+		// validateOccurrenceUsageIsPortion
+		if (usg.isIndividual && !usg.isPortion) {
+			error(INVALID_OCCURRENCE_USAGE_IS_PORTION_MSG, usg, null, INVALID_OCCURRENCE_USAGE_IS_PORTION_MSG)
+		}
+		
+		// validateOccurrenceUsagePortionKind
+		val owningType = usg.owningType;
+		if (usg.portionKind === null && !(owningType instanceof OccurrenceDefinition || owningType instanceof OccurrenceUsage )) {
+			error(INVALID_OCCURRENCE_USAGE_PORTION_KIND_MSG, usg, null, INVALID_OCCURRENCE_USAGE_PORTION_KIND_MSG)
+		}
 
 	}
 

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2025 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
@@ -33,5 +33,10 @@ public OccurrenceDefinitionAdapter(OccurrenceDefinition element) {
 	public OccurrenceDefinition getTarget() {
 		return (OccurrenceDefinition)super.getTarget();
 	}
+	
+	protected String getDefaultSupertype() {
+		return getTarget().isIndividual()? getDefaultSupertype("life"):
+			getDefaultSupertype("base");
+	}
 
 }

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

@@ -1,6 +1,6 @@
 /*******************************************************************************
  * SysML 2 Pilot Implementation
- * Copyright (c) 2021, 2023-2024 Model Driven Solutions, Inc.
+ * Copyright (c) 2021, 2023-2025 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
@@ -21,13 +21,8 @@
 
 package org.omg.sysml.adapter;
 
-import org.eclipse.emf.common.util.EList;
-import org.omg.sysml.lang.sysml.FeatureTyping;
-import org.omg.sysml.lang.sysml.OccurrenceDefinition;
 import org.omg.sysml.lang.sysml.OccurrenceUsage;
 import org.omg.sysml.lang.sysml.PortionKind;
-import org.omg.sysml.lang.sysml.SysMLPackage;
-import org.omg.sysml.lang.sysml.Type;
 
 public class OccurrenceUsageAdapter extends UsageAdapter {
 
@@ -39,6 +34,20 @@ public OccurrenceUsageAdapter(OccurrenceUsage element) {
 	public OccurrenceUsage getTarget() {
 		return (OccurrenceUsage)super.getTarget();
 	}
+	
+	// Post-processing
+	
+	@Override
+	public void postProcess() {
+		super.postProcess();
+		
+		OccurrenceUsage self = getTarget();
+		if (self.getPortionKind() != null) {
+			self.setIsPortion(true);
+		}
+	}
+	
+	// Implicit Generalization
 
 	@Override
 	public void addDefaultGeneralType() {
@@ -66,39 +75,4 @@ protected boolean isSuboccurrence() {
 	protected String getDefaultSupertype() {
 		return getDefaultSupertype("base");
 	}
-	
-	protected void addOccurrenceTyping() {
-		OccurrenceUsage target = getTarget();
-		Type owningType = target.getOwningType();
-		if (target.getPortionKind() != null && target.getOwnedTyping().isEmpty()) {
-			if (owningType instanceof OccurrenceDefinition) {
-				addImplicitGeneralType(SysMLPackage.eINSTANCE.getFeatureTyping(), owningType);
-			} else if (owningType instanceof OccurrenceUsage) {
-				addImplicitGeneralType(SysMLPackage.eINSTANCE.getSubsetting(), owningType);
-			}
-		}
-	}
-	
-	protected void addOccurrenceFeaturing() {
-		OccurrenceUsage target = getTarget();
-		if (target.getPortionKind() != null) {
-			EList<Type> featuringTypes = target.getFeaturingType();
-			target.getOwnedTyping().stream().
-				map(FeatureTyping::getType).
-				filter(OccurrenceDefinition.class::isInstance).
-				forEach(type->{
-					if (!(featuringTypes.contains(type))) {
-						addFeaturingType(type);
-					}
-				});
-		}
-	}
-	
-	@Override
-	public void computeImplicitGeneralTypes() {
-		addOccurrenceTyping();
-		addOccurrenceFeaturing();
-		super.computeImplicitGeneralTypes();
-	}
-	
 }

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

@@ -271,6 +271,7 @@ protected ImplicitGeneralizationMap() {
 		put(MergeNodeImpl.class, "subaction", "Actions::Action::merges");
 
 		put(OccurrenceDefinitionImpl.class, "base", "Occurrences::Occurrence");
+		put(OccurrenceDefinitionImpl.class, "life", "Occurrences::Life");
 		put(OccurrenceUsageImpl.class, "base", "Occurrences::occurrences");
 		put(OccurrenceUsageImpl.class, "timeslice", "Occurrences::Occurrence::timeSlices");
 		put(OccurrenceUsageImpl.class, "snapshot", "Occurrences::Occurrence::snapshots");

org.omg.sysml/syntax-gen/org/omg/sysml/lang/sysml/impl/FlowUsageImpl.java

@@ -103,10 +103,10 @@ public class FlowUsageImpl extends ConnectorAsUsageImpl implements FlowUsage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see #getPortionKind()
-	 * @generated
+	 * @generated NOT
 	 * @ordered
 	 */
-	protected static final PortionKind PORTION_KIND_EDEFAULT = PortionKind.TIMESLICE;
+	protected static final PortionKind PORTION_KIND_EDEFAULT = null;
 	/**
 	 * The cached value of the '{@link #getPortionKind() <em>Portion Kind</em>}' attribute.
 	 * <!-- begin-user-doc -->