Skip to content

Fix #75: Containmnet principle implemented #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
antoineatstariongroup merged 3 commits into from
Feb 16, 2026
Merged

Fix #75: Containmnet principle implemented #78

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a61e129
Fix #75: Containmnet principle implemented
antoineatstariongroup Feb 16, 2026
2bb1d54
Rename
antoineatstariongroup Feb 16, 2026
b788a16
Update doc
antoineatstariongroup Feb 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
24 changes: 21 additions & 3 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/AnnotatingElement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ namespace SysML2.NET.Core.POCO.Root.Annotations

using SysML2.NET.Core.POCO.Root.Elements;
using SysML2.NET.Core.POCO.Root.Namespaces;
using SysML2.NET.Collections;
using SysML2.NET.Decorators;

/// <summary>
Expand All @@ -40,8 +41,19 @@ namespace SysML2.NET.Core.POCO.Root.Annotations
/// </summary>
[Class(xmiId: "_19_0_2_12e503d9_1594145576693_532940_27", isAbstract: false, isFinalSpecialization: false, isActive: false)]
[GeneratedCode("SysML2.NET", "latest")]
public partial class AnnotatingElement : IAnnotatingElement
public partial class AnnotatingElement : IAnnotatingElement, IContainedElement
{
/// <summary>
/// Initialize a new instance of <see cref="AnnotatingElement" />
/// </summary>
public AnnotatingElement()
{
((IContainedElement)this).OwnedRelationship = new ContainerList<IElement, IRelationship>(this,
(relationship, element) => ((IContainedRelationship)relationship).OwningRelatedElement = element,
relationship => relationship.OwningRelatedElement);

}

/// <summary>
/// Gets or sets the unique identifier
/// </summary>
Expand Down Expand Up @@ -170,7 +182,10 @@ public partial class AnnotatingElement : IAnnotatingElement
[Property(xmiId: "_18_5_3_12e503d9_1543092026091_217766_16748", aggregation: AggregationKind.Composite, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwnedRelationship")]
public List<IRelationship> OwnedRelationship { get; set; } = [];
public IReadOnlyCollection<IRelationship> OwnedRelationship => ((IContainedElement)this).OwnedRelationship;

/// <summary>Backing field for IElement.OwnedRelationship</summary>
ContainerList<IElement, IRelationship> IContainedElement.OwnedRelationship { get; set; }

/// <summary>
/// The owner of this Element, derived as the owningRelatedElement of the owningRelationship of this
Expand Down Expand Up @@ -213,7 +228,10 @@ public partial class AnnotatingElement : IAnnotatingElement
[Property(xmiId: "_18_5_3_12e503d9_1533160674986_482273_43303", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwningRelationship")]
public IRelationship OwningRelationship { get; set; }
public IRelationship OwningRelationship => ((IContainedElement)this).OwningRelationship;

/// <summary>Backing field for IElement.OwningRelationship</summary>
IRelationship IContainedElement.OwningRelationship { get; set; }

/// <summary>
/// The full ownership-qualified name of this Element, represented in a form that is valid according to
Expand Down
38 changes: 33 additions & 5 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/Association.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ namespace SysML2.NET.Core.POCO.Kernel.Associations
using SysML2.NET.Core.POCO.Root.Annotations;
using SysML2.NET.Core.POCO.Root.Elements;
using SysML2.NET.Core.POCO.Root.Namespaces;
using SysML2.NET.Collections;
using SysML2.NET.Decorators;

/// <summary>
Expand All @@ -44,8 +45,23 @@ namespace SysML2.NET.Core.POCO.Kernel.Associations
/// </summary>
[Class(xmiId: "_18_5_3_12e503d9_1533160651716_116234_42240", isAbstract: false, isFinalSpecialization: false, isActive: false)]
[GeneratedCode("SysML2.NET", "latest")]
public partial class Association : IAssociation
public partial class Association : IAssociation, IContainedRelationship
{
/// <summary>
/// Initialize a new instance of <see cref="Association" />
/// </summary>
public Association()
{
((IContainedElement)this).OwnedRelationship = new ContainerList<IElement, IRelationship>(this,
(relationship, element) => ((IContainedRelationship)relationship).OwningRelatedElement = element,
relationship => relationship.OwningRelatedElement);

((IContainedRelationship)this).OwnedRelatedElement = new ContainerList<IRelationship, IElement>(this,
(element, relationship) => ((IContainedElement)element).OwningRelationship = relationship,
element => element.OwningRelationship);

}

/// <summary>
/// Gets or sets the unique identifier
/// </summary>
Expand Down Expand Up @@ -413,15 +429,21 @@ public partial class Association : IAssociation
[Property(xmiId: "_18_5_3_12e503d9_1533160674986_59873_43302", aggregation: AggregationKind.Composite, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_132339_43177")]
[Implements(implementation: "IRelationship.OwnedRelatedElement")]
public List<IElement> OwnedRelatedElement { get; set; } = [];
public IReadOnlyCollection<IElement> OwnedRelatedElement => ((IContainedRelationship)this).OwnedRelatedElement;

/// <summary>Backing field for IRelationship.OwnedRelatedElement</summary>
ContainerList<IRelationship, IElement> IContainedRelationship.OwnedRelatedElement { get; set; }

/// <summary>
/// The Relationships for which this Element is the owningRelatedElement.
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1543092026091_217766_16748", aggregation: AggregationKind.Composite, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwnedRelationship")]
public List<IRelationship> OwnedRelationship { get; set; } = [];
public IReadOnlyCollection<IRelationship> OwnedRelationship => ((IContainedElement)this).OwnedRelationship;

/// <summary>Backing field for IElement.OwnedRelationship</summary>
ContainerList<IElement, IRelationship> IContainedElement.OwnedRelationship { get; set; }

/// <summary>
/// The ownedRelationships of this Type that are Specializations, for which the Type is the specific
Expand Down Expand Up @@ -483,15 +505,21 @@ public partial class Association : IAssociation
[Property(xmiId: "_18_5_3_12e503d9_1543092026091_693018_16749", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_132339_43177")]
[Implements(implementation: "IRelationship.OwningRelatedElement")]
public IElement OwningRelatedElement { get; set; }
public IElement OwningRelatedElement => ((IContainedRelationship)this).OwningRelatedElement;

/// <summary>Backing field for IRelationship.OwningRelatedElement</summary>
IElement IContainedRelationship.OwningRelatedElement { get; set; }

/// <summary>
/// The Relationship for which this Element is an ownedRelatedElement, if any.
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1533160674986_482273_43303", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwningRelationship")]
public IRelationship OwningRelationship { get; set; }
public IRelationship OwningRelationship => ((IContainedElement)this).OwningRelationship;

/// <summary>Backing field for IElement.OwningRelationship</summary>
IRelationship IContainedElement.OwningRelationship { get; set; }

/// <summary>
/// The full ownership-qualified name of this Element, represented in a form that is valid according to
Expand Down
38 changes: 33 additions & 5 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/Dependency.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ namespace SysML2.NET.Core.POCO.Root.Dependencies
using SysML2.NET.Core.POCO.Root.Annotations;
using SysML2.NET.Core.POCO.Root.Elements;
using SysML2.NET.Core.POCO.Root.Namespaces;
using SysML2.NET.Collections;
using SysML2.NET.Decorators;

/// <summary>
Expand All @@ -43,8 +44,23 @@ namespace SysML2.NET.Core.POCO.Root.Dependencies
/// </summary>
[Class(xmiId: "_19_0_2_12e503d9_1594006219028_628649_74", isAbstract: false, isFinalSpecialization: false, isActive: false)]
[GeneratedCode("SysML2.NET", "latest")]
public partial class Dependency : IDependency
public partial class Dependency : IDependency, IContainedRelationship
{
/// <summary>
/// Initialize a new instance of <see cref="Dependency" />
/// </summary>
public Dependency()
{
((IContainedRelationship)this).OwnedRelatedElement = new ContainerList<IRelationship, IElement>(this,
(element, relationship) => ((IContainedElement)element).OwningRelationship = relationship,
element => element.OwningRelationship);

((IContainedElement)this).OwnedRelationship = new ContainerList<IElement, IRelationship>(this,
(relationship, element) => ((IContainedRelationship)relationship).OwningRelatedElement = element,
relationship => relationship.OwningRelatedElement);

}

/// <summary>
/// Gets or sets the unique identifier
/// </summary>
Expand Down Expand Up @@ -161,15 +177,21 @@ public partial class Dependency : IDependency
[Property(xmiId: "_18_5_3_12e503d9_1533160674986_59873_43302", aggregation: AggregationKind.Composite, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_132339_43177")]
[Implements(implementation: "IRelationship.OwnedRelatedElement")]
public List<IElement> OwnedRelatedElement { get; set; } = [];
public IReadOnlyCollection<IElement> OwnedRelatedElement => ((IContainedRelationship)this).OwnedRelatedElement;

/// <summary>Backing field for IRelationship.OwnedRelatedElement</summary>
ContainerList<IRelationship, IElement> IContainedRelationship.OwnedRelatedElement { get; set; }

/// <summary>
/// The Relationships for which this Element is the owningRelatedElement.
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1543092026091_217766_16748", aggregation: AggregationKind.Composite, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwnedRelationship")]
public List<IRelationship> OwnedRelationship { get; set; } = [];
public IReadOnlyCollection<IRelationship> OwnedRelationship => ((IContainedElement)this).OwnedRelationship;

/// <summary>Backing field for IElement.OwnedRelationship</summary>
ContainerList<IElement, IRelationship> IContainedElement.OwnedRelationship { get; set; }

/// <summary>
/// The owner of this Element, derived as the owningRelatedElement of the owningRelationship of this
Expand Down Expand Up @@ -203,15 +225,21 @@ public partial class Dependency : IDependency
[Property(xmiId: "_18_5_3_12e503d9_1543092026091_693018_16749", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_132339_43177")]
[Implements(implementation: "IRelationship.OwningRelatedElement")]
public IElement OwningRelatedElement { get; set; }
public IElement OwningRelatedElement => ((IContainedRelationship)this).OwningRelatedElement;

/// <summary>Backing field for IRelationship.OwningRelatedElement</summary>
IElement IContainedRelationship.OwningRelatedElement { get; set; }

/// <summary>
/// The Relationship for which this Element is an ownedRelatedElement, if any.
/// </summary>
[Property(xmiId: "_18_5_3_12e503d9_1533160674986_482273_43303", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwningRelationship")]
public IRelationship OwningRelationship { get; set; }
public IRelationship OwningRelationship => ((IContainedElement)this).OwningRelationship;

/// <summary>Backing field for IElement.OwningRelationship</summary>
IRelationship IContainedElement.OwningRelationship { get; set; }

/// <summary>
/// The full ownership-qualified name of this Element, represented in a form that is valid according to
Expand Down
24 changes: 21 additions & 3 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/EnumerationDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ namespace SysML2.NET.Core.POCO.Systems.Enumerations
using SysML2.NET.Core.POCO.Systems.UseCases;
using SysML2.NET.Core.POCO.Systems.VerificationCases;
using SysML2.NET.Core.POCO.Systems.Views;
using SysML2.NET.Collections;
using SysML2.NET.Decorators;

/// <summary>
Expand All @@ -65,8 +66,19 @@ namespace SysML2.NET.Core.POCO.Systems.Enumerations
/// </summary>
[Class(xmiId: "_19_0_4_12e503d9_1606946467364_179493_153", isAbstract: false, isFinalSpecialization: false, isActive: false)]
[GeneratedCode("SysML2.NET", "latest")]
public partial class EnumerationDefinition : IEnumerationDefinition
public partial class EnumerationDefinition : IEnumerationDefinition, IContainedElement
{
/// <summary>
/// Initialize a new instance of <see cref="EnumerationDefinition" />
/// </summary>
public EnumerationDefinition()
{
((IContainedElement)this).OwnedRelationship = new ContainerList<IElement, IRelationship>(this,
(relationship, element) => ((IContainedRelationship)relationship).OwningRelatedElement = element,
relationship => relationship.OwningRelatedElement);

}

/// <summary>
/// Gets or sets the unique identifier
/// </summary>
Expand Down Expand Up @@ -603,7 +615,10 @@ bool Systems.DefinitionAndUsage.IDefinition.IsVariation
[Property(xmiId: "_18_5_3_12e503d9_1543092026091_217766_16748", aggregation: AggregationKind.Composite, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwnedRelationship")]
public List<IRelationship> OwnedRelationship { get; set; } = [];
public IReadOnlyCollection<IRelationship> OwnedRelationship => ((IContainedElement)this).OwnedRelationship;

/// <summary>Backing field for IElement.OwnedRelationship</summary>
ContainerList<IElement, IRelationship> IContainedElement.OwnedRelationship { get; set; }

/// <summary>
/// The RenderingUsages that are ownedUsages of this Definition.
Expand Down Expand Up @@ -737,7 +752,10 @@ bool Systems.DefinitionAndUsage.IDefinition.IsVariation
[Property(xmiId: "_18_5_3_12e503d9_1533160674986_482273_43303", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwningRelationship")]
public IRelationship OwningRelationship { get; set; }
public IRelationship OwningRelationship => ((IContainedElement)this).OwningRelationship;

/// <summary>Backing field for IElement.OwningRelationship</summary>
IRelationship IContainedElement.OwningRelationship { get; set; }

/// <summary>
/// The full ownership-qualified name of this Element, represented in a form that is valid according to
Expand Down
24 changes: 21 additions & 3 deletions SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/Feature.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ namespace SysML2.NET.Core.POCO.Core.Features
using SysML2.NET.Core.POCO.Root.Annotations;
using SysML2.NET.Core.POCO.Root.Elements;
using SysML2.NET.Core.POCO.Root.Namespaces;
using SysML2.NET.Collections;
using SysML2.NET.Decorators;

/// <summary>
Expand All @@ -56,8 +57,19 @@ namespace SysML2.NET.Core.POCO.Core.Features
/// </summary>
[Class(xmiId: "_18_5_3_12e503d9_1533160651684_893483_42160", isAbstract: false, isFinalSpecialization: false, isActive: false)]
[GeneratedCode("SysML2.NET", "latest")]
public partial class Feature : IFeature
public partial class Feature : IFeature, IContainedElement
{
/// <summary>
/// Initialize a new instance of <see cref="Feature" />
/// </summary>
public Feature()
{
((IContainedElement)this).OwnedRelationship = new ContainerList<IElement, IRelationship>(this,
(relationship, element) => ((IContainedRelationship)relationship).OwningRelatedElement = element,
relationship => relationship.OwningRelatedElement);

}

/// <summary>
/// Gets or sets the unique identifier
/// </summary>
Expand Down Expand Up @@ -578,7 +590,10 @@ public partial class Feature : IFeature
[Property(xmiId: "_18_5_3_12e503d9_1543092026091_217766_16748", aggregation: AggregationKind.Composite, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwnedRelationship")]
public List<IRelationship> OwnedRelationship { get; set; } = [];
public IReadOnlyCollection<IRelationship> OwnedRelationship => ((IContainedElement)this).OwnedRelationship;

/// <summary>Backing field for IElement.OwnedRelationship</summary>
ContainerList<IElement, IRelationship> IContainedElement.OwnedRelationship { get; set; }

/// <summary>
/// The ownedRelationships of this Type that are Specializations, for which the Type is the specific
Expand Down Expand Up @@ -669,7 +684,10 @@ public partial class Feature : IFeature
[Property(xmiId: "_18_5_3_12e503d9_1533160674986_482273_43303", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: false, isDerivedUnion: false, isUnique: true, defaultValue: null)]
[SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674961_585972_43176")]
[Implements(implementation: "IElement.OwningRelationship")]
public IRelationship OwningRelationship { get; set; }
public IRelationship OwningRelationship => ((IContainedElement)this).OwningRelationship;

/// <summary>Backing field for IElement.OwningRelationship</summary>
IRelationship IContainedElement.OwningRelationship { get; set; }

/// <summary>
/// The Type that is the owningType of the owningFeatureMembership of this Feature.
Expand Down
Loading
Loading