[Update] to SysML2.ecore metamodel for 2025-06 and regenerate code

Author: samatstariongroup

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/AnnotatingElement.cs

@@ -36,7 +36,7 @@ namespace SysML2.NET.Core.POCO
     /// Relationships, or it implicitly annotates its owningNamespace.annotatedElement =  if
     /// annotation->notEmpty() then annotation.annotatedElement else Sequence{owningNamespace}
     /// endifownedAnnotatingRelationship = ownedRelationship->    selectByKind(Annotation)->    select(a |
-    /// a.annotatingElement = self)annotation =     if owningAnnotatingRelationship = null then
+    /// a.annotatedElement <> self)annotation =     if owningAnnotatingRelationship = null then
     /// ownedAnnotatingRelationship    else
     /// owningAnnotatingRelationship->prepend(owningAnnotatingRelationship)    endif
     /// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Connector.cs

@@ -34,18 +34,24 @@ namespace SysML2.NET.Core.POCO
     /// A Connector is a usage of Associations, with links restricted according to instances of the Type in
     /// which they are used (domain of the Connector). The associations of the Connector restrict what kinds
     /// of things might be linked. The Connector further restricts these links to be between values of
-    /// Features on instances of its domain.not isAbstract implies relatedFeature->size() >=
-    /// 2connectorEnds->size() = 2 andassociation->exists(oclIsKindOf(AssociationStructure)) implies   
-    /// specializesFromLibrary('Objects::binaryLinkObjects')sourceFeature =     if relatedFeature->isEmpty()
-    /// then null     else relatedFeature->first()     endifconnectorEnds->size() > 2 implies    not
-    /// specializesFromLibrary('Links::BinaryLink')relatedFeature->forAll(f |     if
-    /// featuringType->isEmpty() then f.isFeaturedWithin(null)    else featuringType->forAll(t |
-    /// f.isFeaturedWithin(t))    endif)relatedFeature = connectorEnd.ownedReferenceSubsetting->    select(s
-    /// | s <> null).subsettedFeaturespecializesFromLibrary('Links::links')connectorEnd->size() = 2 implies 
-    ///   specializesFromLibrary('Links::binaryLinks')association->exists(oclIsKindOf(AssociationStructure))
-    /// implies    specializesFromLibrary('Objects::linkObjects')targetFeature =    if
-    /// relatedFeature->size() < 2 then OrderedSet{}    else         relatedFeature->           
-    /// subSequence(2, relatedFeature->size())->            asOrderedSet()    endif
+    /// Features on instances of its domain.relatedFeature = connectorEnd.ownedReferenceSubsetting->   
+    /// select(s | s <> null).subsettedFeaturerelatedFeature->forAll(f |     if featuringType->isEmpty()
+    /// then f.isFeaturedWithin(null)    else featuringType->forAll(t | f.isFeaturedWithin(t))   
+    /// endif)sourceFeature =     if relatedFeature->isEmpty() then null     else relatedFeature->first()   
+    ///  endiftargetFeature =    if relatedFeature->size() < 2 then OrderedSet{}    else        
+    /// relatedFeature->            subSequence(2, relatedFeature->size())->            asOrderedSet()   
+    /// endifnot isAbstract implies relatedFeature->size() >=
+    /// 2specializesFromLibrary('Links::links')association->exists(oclIsKindOf(AssociationStructure))
+    /// implies    specializesFromLibrary('Objects::linkObjects')connectorEnds->size() = 2
+    /// andassociation->exists(oclIsKindOf(AssociationStructure)) implies   
+    /// specializesFromLibrary('Objects::binaryLinkObjects')connectorEnd->size() = 2 implies   
+    /// specializesFromLibrary('Links::binaryLinks')connectorEnds->size() > 2 implies    not
+    /// specializesFromLibrary('Links::BinaryLink')let commonFeaturingTypes : OrderedSet(Type) =    
+    /// relatedFeature->closure(featuringType)->select(t |         relatedFeature->forAll(f |
+    /// f.isFeaturedWithin(t))    ) inlet nearestCommonFeaturingTypes : OrderedSet(Type) =   
+    /// commonFeaturingTypes->reject(t1 |         commonFeaturingTypes->exists(t2 |             t2 <> t1 and
+    /// t2->closure(featuringType)->contains(t1)    )) inif nearestCommonFeaturingTypes->isEmpty() then
+    /// nullelse nearestCommonFeaturingTypes->first()endif
     /// </summary>
     public partial class Connector : IConnector
     {
@@ -57,15 +63,16 @@ public Connector()
             this.AliasIds = new List<string>();
             this.IsAbstract = false;
             this.IsComposite = false;
+            this.IsConstant = false;
             this.IsDerived = false;
             this.IsEnd = false;
             this.IsImplied = false;
             this.IsImpliedIncluded = false;
             this.IsOrdered = false;
             this.IsPortion = false;
-            this.IsReadOnly = false;
             this.IsSufficient = false;
             this.IsUnique = true;
+            this.IsVariable = false;
             this.OwnedRelatedElement = new List<IElement>();
             this.OwnedRelationship = new List<IRelationship>();
             this.Source = new List<IElement>();
@@ -135,6 +142,15 @@ public Feature QueryCrossFeature()
         [EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
         public string DeclaredShortName { get; set; }
 
+        /// <summary>
+        /// Queries the derived property DefaultFeaturingType
+        /// </summary>
+        [EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
+        public Type QueryDefaultFeaturingType()
+        {
+            throw new NotImplementedException("Derived property DefaultFeaturingType not yet supported");
+        }
+
         /// <summary>
         /// Queries the derived property DifferencingType
         /// </summary>
@@ -284,7 +300,8 @@ public List<Type> QueryIntersectingType()
 
         /// <summary>
         /// Whether the Feature is a composite feature of its featuringType. If so, the values of the Feature
-        /// cannot exist after its featuring instance no longer does.
+        /// cannot exist after its featuring instance no longer does and cannot be values of another composite
+        /// feature that is not on the same featuring instance.
         /// </summary>
         [EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
         public bool IsComposite { get; set; }
@@ -298,6 +315,13 @@ public bool QueryIsConjugated()
             throw new NotImplementedException("Derived property IsConjugated not yet supported");
         }
 
+        /// <summary>
+        /// If isVariable is true, then whether the value of this Feature nevertheless does not change over all
+        /// snapshots of its owningType.
+        /// </summary>
+        [EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
+        public bool IsConstant { get; set; }
+
         /// <summary>
         /// Whether the values of this Feature can always be computed from the values of other Features.
         /// </summary>
@@ -365,12 +389,6 @@ public bool QueryIsNonunique()
         [EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
         public bool IsPortion { get; set; }
 
-        /// <summary>
-        /// Whether the values of this Feature can change over the lifetime of an instance of the domain.
-        /// </summary>
-        [EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
-        public bool IsReadOnly { get; set; }
-
         /// <summary>
         /// Whether all things that meet the classification conditions of this Type must be classified by the
         /// Type.(A Type gives conditions that must be met by whatever it classifies, but when isSufficient
@@ -388,6 +406,13 @@ public bool QueryIsNonunique()
         [EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
         public bool IsUnique { get; set; }
 
+        /// <summary>
+        /// Whether the value of this Feature might vary over time. That is, whether the Feature may have a
+        /// different value for each snapshot of an owningType that is an Occurrence.
+        /// </summary>
+        [EFeature(isChangeable: true, isVolatile: false, isTransient: false, isUnsettable: false, isDerived: false, isOrdered: false, isUnique: true, lowerBound: 1, upperBound: 1, isMany: false, isRequired: false, isContainment: false)]
+        public bool IsVariable { get; set; }
+
         /// <summary>
         /// Queries the derived property Member
         /// </summary>

SysML2.NET.CodeGenerator.Tests/Expected/AutGenPoco/Definition.cs

@@ -490,7 +490,7 @@ public List<FeatureMembership> QueryOwnedFeatureMembership()
         /// Queries the derived property OwnedFlow
         /// </summary>
         [EFeature(isChangeable: true, isVolatile: true, isTransient: true, isUnsettable: false, isDerived: true, isOrdered: false, isUnique: true, lowerBound: 0, upperBound: -1, isMany: false, isRequired: false, isContainment: false)]
-        public List<FlowConnectionUsage> QueryOwnedFlow()
+        public List<FlowUsage> QueryOwnedFlow()
         {
             throw new NotImplementedException("Derived property OwnedFlow not yet supported");
         }