diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/EnumerationDefinition.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/EnumerationDefinition.cs index e851a82b..b54ba59c 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/EnumerationDefinition.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/EnumerationDefinition.cs @@ -97,6 +97,7 @@ public partial class EnumerationDefinition : IEnumerationDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -643,6 +644,7 @@ bool Systems.DefinitionAndUsage.IDefinition.IsVariation /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IRequirementUsage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IRequirementUsage.cs index 7191dfe2..cd336d5b 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IRequirementUsage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IRequirementUsage.cs @@ -45,6 +45,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List actorParameter { get; } /// @@ -94,6 +95,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List stakeholderParameter { get; } /// @@ -101,6 +103,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] Guid subjectParameter { get; } /// diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IUsage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IUsage.cs index e2e64749..1bfdd465 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IUsage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/IUsage.cs @@ -59,6 +59,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List directedUsage { get; } /// @@ -247,6 +248,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List nestedUsage { get; } /// @@ -282,6 +284,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] Guid? owningDefinition { get; } /// diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/RequirementUsage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/RequirementUsage.cs index 964430dc..721e4ab4 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/RequirementUsage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/RequirementUsage.cs @@ -52,6 +52,7 @@ public partial class RequirementUsage : IRequirementUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -177,6 +178,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -710,6 +712,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -993,6 +996,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1141,6 +1145,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -1149,6 +1154,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/Usage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/Usage.cs index 238ab0a0..ca4bf907 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/Usage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenDto/Usage.cs @@ -134,6 +134,7 @@ public partial class Usage : IUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -625,6 +626,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -898,6 +900,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenExtensions/ElementExtensions.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenExtensions/ElementExtensions.cs index 45bb0e93..f4aa334a 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenExtensions/ElementExtensions.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenExtensions/ElementExtensions.cs @@ -117,33 +117,12 @@ public static bool QueryIsValidContainmentOwner(this IRelationship bridgeRelatio { return bridgeRelationship switch { - SysML2.NET.Core.POCO.Systems.Requirements.IActorMembership => source is SysML2.NET.Core.POCO.Systems.Parts.IPartUsage, - SysML2.NET.Core.POCO.Systems.Requirements.IFramedConcernMembership => source is SysML2.NET.Core.POCO.Systems.Requirements.IConcernUsage, - SysML2.NET.Core.POCO.Systems.VerificationCases.IRequirementVerificationMembership => source is SysML2.NET.Core.POCO.Systems.Requirements.IRequirementUsage, - SysML2.NET.Core.POCO.Systems.Requirements.IStakeholderMembership => source is SysML2.NET.Core.POCO.Systems.Parts.IPartUsage, - SysML2.NET.Core.POCO.Systems.Requirements.ISubjectMembership => source is SysML2.NET.Core.POCO.Systems.DefinitionAndUsage.IUsage, - SysML2.NET.Core.POCO.Kernel.Associations.IAssociation => source is SysML2.NET.Core.POCO.Core.Types.IType, - SysML2.NET.Core.POCO.Kernel.Connectors.IConnector => source is SysML2.NET.Core.POCO.Core.Features.IFeature, - SysML2.NET.Core.POCO.Core.Features.IEndFeatureMembership => source is SysML2.NET.Core.POCO.Core.Features.IFeature, - SysML2.NET.Core.POCO.Systems.Cases.IObjectiveMembership => source is SysML2.NET.Core.POCO.Systems.Requirements.IRequirementUsage, - SysML2.NET.Core.POCO.Kernel.Behaviors.IParameterMembership => source is SysML2.NET.Core.POCO.Core.Features.IFeature, - SysML2.NET.Core.POCO.Systems.Requirements.IRequirementConstraintMembership => source is SysML2.NET.Core.POCO.Systems.Constraints.IConstraintUsage, - SysML2.NET.Core.POCO.Kernel.Functions.IResultExpressionMembership => source is SysML2.NET.Core.POCO.Kernel.Functions.IExpression, - SysML2.NET.Core.POCO.Systems.States.IStateSubactionMembership => source is SysML2.NET.Core.POCO.Systems.Actions.IActionUsage, - SysML2.NET.Core.POCO.Systems.States.ITransitionFeatureMembership => source is SysML2.NET.Core.POCO.Kernel.Behaviors.IStep, - SysML2.NET.Core.POCO.Systems.Views.IViewRenderingMembership => source is SysML2.NET.Core.POCO.Systems.Views.IRenderingUsage, - SysML2.NET.Core.POCO.Systems.Ports.IConjugatedPortTyping => source is SysML2.NET.Core.POCO.Systems.Ports.IConjugatedPortDefinition, SysML2.NET.Core.POCO.Core.Features.ICrossSubsetting => source is SysML2.NET.Core.POCO.Core.Features.IFeature, - SysML2.NET.Core.POCO.Kernel.Packages.IElementFilterMembership => source is SysML2.NET.Core.POCO.Kernel.Functions.IExpression, - SysML2.NET.Core.POCO.Core.Types.IFeatureMembership => source is SysML2.NET.Core.POCO.Core.Features.IFeature, - SysML2.NET.Core.POCO.Kernel.FeatureValues.IFeatureValue => source is SysML2.NET.Core.POCO.Kernel.Functions.IExpression, - SysML2.NET.Core.POCO.Core.Features.IRedefinition => source is SysML2.NET.Core.POCO.Core.Features.IFeature, + SysML2.NET.Core.POCO.Core.Types.IFeatureMembership => source is SysML2.NET.Core.POCO.Core.Types.IType, + SysML2.NET.Core.POCO.Kernel.FeatureValues.IFeatureValue => source is SysML2.NET.Core.POCO.Core.Features.IFeature, SysML2.NET.Core.POCO.Core.Features.IReferenceSubsetting => source is SysML2.NET.Core.POCO.Core.Features.IFeature, - SysML2.NET.Core.POCO.Systems.DefinitionAndUsage.IVariantMembership => source is SysML2.NET.Core.POCO.Systems.DefinitionAndUsage.IUsage, - SysML2.NET.Core.POCO.Core.Features.IFeatureTyping => source is SysML2.NET.Core.POCO.Core.Types.IType, - SysML2.NET.Core.POCO.Root.Namespaces.IMembershipImport => source is SysML2.NET.Core.POCO.Root.Namespaces.IMembership, - SysML2.NET.Core.POCO.Root.Namespaces.INamespaceImport => source is SysML2.NET.Core.POCO.Root.Namespaces.INamespace, - SysML2.NET.Core.POCO.Systems.Ports.IPortConjugation => source is SysML2.NET.Core.POCO.Systems.Ports.IPortDefinition, + SysML2.NET.Core.POCO.Core.Features.IFeatureTyping => source is SysML2.NET.Core.POCO.Core.Features.IFeature, + SysML2.NET.Core.POCO.Systems.Ports.IPortConjugation => source is SysML2.NET.Core.POCO.Systems.Ports.IConjugatedPortDefinition, SysML2.NET.Core.POCO.Core.Classifiers.ISubclassification => source is SysML2.NET.Core.POCO.Core.Classifiers.IClassifier, SysML2.NET.Core.POCO.Core.Features.ISubsetting => source is SysML2.NET.Core.POCO.Core.Features.IFeature, SysML2.NET.Core.POCO.Core.Types.IConjugation => source is SysML2.NET.Core.POCO.Core.Types.IType, @@ -151,9 +130,11 @@ public static bool QueryIsValidContainmentOwner(this IRelationship bridgeRelatio SysML2.NET.Core.POCO.Core.Types.IDisjoining => source is SysML2.NET.Core.POCO.Core.Types.IType, SysML2.NET.Core.POCO.Core.Features.IFeatureChaining => source is SysML2.NET.Core.POCO.Core.Features.IFeature, SysML2.NET.Core.POCO.Core.Features.IFeatureInverting => source is SysML2.NET.Core.POCO.Core.Features.IFeature, + SysML2.NET.Core.POCO.Root.Namespaces.IImport => source is SysML2.NET.Core.POCO.Root.Namespaces.INamespace, SysML2.NET.Core.POCO.Core.Types.IIntersecting => source is SysML2.NET.Core.POCO.Core.Types.IType, + SysML2.NET.Core.POCO.Root.Namespaces.IMembership => source is SysML2.NET.Core.POCO.Root.Namespaces.INamespace, SysML2.NET.Core.POCO.Core.Types.ISpecialization => source is SysML2.NET.Core.POCO.Core.Types.IType, - SysML2.NET.Core.POCO.Core.Features.ITypeFeaturing => source is SysML2.NET.Core.POCO.Core.Types.IType, + SysML2.NET.Core.POCO.Core.Features.ITypeFeaturing => source is SysML2.NET.Core.POCO.Core.Features.IFeature, SysML2.NET.Core.POCO.Core.Types.IUnioning => source is SysML2.NET.Core.POCO.Core.Types.IType, _ => true, }; @@ -170,33 +151,12 @@ public static string ExpectedContainmentOwnerTypeName(this IRelationship bridgeR { return bridgeRelationship switch { - SysML2.NET.Core.POCO.Systems.Requirements.IActorMembership => nameof(SysML2.NET.Core.POCO.Systems.Parts.IPartUsage), - SysML2.NET.Core.POCO.Systems.Requirements.IFramedConcernMembership => nameof(SysML2.NET.Core.POCO.Systems.Requirements.IConcernUsage), - SysML2.NET.Core.POCO.Systems.VerificationCases.IRequirementVerificationMembership => nameof(SysML2.NET.Core.POCO.Systems.Requirements.IRequirementUsage), - SysML2.NET.Core.POCO.Systems.Requirements.IStakeholderMembership => nameof(SysML2.NET.Core.POCO.Systems.Parts.IPartUsage), - SysML2.NET.Core.POCO.Systems.Requirements.ISubjectMembership => nameof(SysML2.NET.Core.POCO.Systems.DefinitionAndUsage.IUsage), - SysML2.NET.Core.POCO.Kernel.Associations.IAssociation => nameof(SysML2.NET.Core.POCO.Core.Types.IType), - SysML2.NET.Core.POCO.Kernel.Connectors.IConnector => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), - SysML2.NET.Core.POCO.Core.Features.IEndFeatureMembership => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), - SysML2.NET.Core.POCO.Systems.Cases.IObjectiveMembership => nameof(SysML2.NET.Core.POCO.Systems.Requirements.IRequirementUsage), - SysML2.NET.Core.POCO.Kernel.Behaviors.IParameterMembership => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), - SysML2.NET.Core.POCO.Systems.Requirements.IRequirementConstraintMembership => nameof(SysML2.NET.Core.POCO.Systems.Constraints.IConstraintUsage), - SysML2.NET.Core.POCO.Kernel.Functions.IResultExpressionMembership => nameof(SysML2.NET.Core.POCO.Kernel.Functions.IExpression), - SysML2.NET.Core.POCO.Systems.States.IStateSubactionMembership => nameof(SysML2.NET.Core.POCO.Systems.Actions.IActionUsage), - SysML2.NET.Core.POCO.Systems.States.ITransitionFeatureMembership => nameof(SysML2.NET.Core.POCO.Kernel.Behaviors.IStep), - SysML2.NET.Core.POCO.Systems.Views.IViewRenderingMembership => nameof(SysML2.NET.Core.POCO.Systems.Views.IRenderingUsage), - SysML2.NET.Core.POCO.Systems.Ports.IConjugatedPortTyping => nameof(SysML2.NET.Core.POCO.Systems.Ports.IConjugatedPortDefinition), SysML2.NET.Core.POCO.Core.Features.ICrossSubsetting => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), - SysML2.NET.Core.POCO.Kernel.Packages.IElementFilterMembership => nameof(SysML2.NET.Core.POCO.Kernel.Functions.IExpression), - SysML2.NET.Core.POCO.Core.Types.IFeatureMembership => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), - SysML2.NET.Core.POCO.Kernel.FeatureValues.IFeatureValue => nameof(SysML2.NET.Core.POCO.Kernel.Functions.IExpression), - SysML2.NET.Core.POCO.Core.Features.IRedefinition => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), + SysML2.NET.Core.POCO.Core.Types.IFeatureMembership => nameof(SysML2.NET.Core.POCO.Core.Types.IType), + SysML2.NET.Core.POCO.Kernel.FeatureValues.IFeatureValue => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), SysML2.NET.Core.POCO.Core.Features.IReferenceSubsetting => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), - SysML2.NET.Core.POCO.Systems.DefinitionAndUsage.IVariantMembership => nameof(SysML2.NET.Core.POCO.Systems.DefinitionAndUsage.IUsage), - SysML2.NET.Core.POCO.Core.Features.IFeatureTyping => nameof(SysML2.NET.Core.POCO.Core.Types.IType), - SysML2.NET.Core.POCO.Root.Namespaces.IMembershipImport => nameof(SysML2.NET.Core.POCO.Root.Namespaces.IMembership), - SysML2.NET.Core.POCO.Root.Namespaces.INamespaceImport => nameof(SysML2.NET.Core.POCO.Root.Namespaces.INamespace), - SysML2.NET.Core.POCO.Systems.Ports.IPortConjugation => nameof(SysML2.NET.Core.POCO.Systems.Ports.IPortDefinition), + SysML2.NET.Core.POCO.Core.Features.IFeatureTyping => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), + SysML2.NET.Core.POCO.Systems.Ports.IPortConjugation => nameof(SysML2.NET.Core.POCO.Systems.Ports.IConjugatedPortDefinition), SysML2.NET.Core.POCO.Core.Classifiers.ISubclassification => nameof(SysML2.NET.Core.POCO.Core.Classifiers.IClassifier), SysML2.NET.Core.POCO.Core.Features.ISubsetting => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), SysML2.NET.Core.POCO.Core.Types.IConjugation => nameof(SysML2.NET.Core.POCO.Core.Types.IType), @@ -204,9 +164,11 @@ public static string ExpectedContainmentOwnerTypeName(this IRelationship bridgeR SysML2.NET.Core.POCO.Core.Types.IDisjoining => nameof(SysML2.NET.Core.POCO.Core.Types.IType), SysML2.NET.Core.POCO.Core.Features.IFeatureChaining => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), SysML2.NET.Core.POCO.Core.Features.IFeatureInverting => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), + SysML2.NET.Core.POCO.Root.Namespaces.IImport => nameof(SysML2.NET.Core.POCO.Root.Namespaces.INamespace), SysML2.NET.Core.POCO.Core.Types.IIntersecting => nameof(SysML2.NET.Core.POCO.Core.Types.IType), + SysML2.NET.Core.POCO.Root.Namespaces.IMembership => nameof(SysML2.NET.Core.POCO.Root.Namespaces.INamespace), SysML2.NET.Core.POCO.Core.Types.ISpecialization => nameof(SysML2.NET.Core.POCO.Core.Types.IType), - SysML2.NET.Core.POCO.Core.Features.ITypeFeaturing => nameof(SysML2.NET.Core.POCO.Core.Types.IType), + SysML2.NET.Core.POCO.Core.Features.ITypeFeaturing => nameof(SysML2.NET.Core.POCO.Core.Features.IFeature), SysML2.NET.Core.POCO.Core.Types.IUnioning => nameof(SysML2.NET.Core.POCO.Core.Types.IType), _ => nameof(IElement), }; diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/EnumerationDefinition.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/EnumerationDefinition.cs index 6f165a3a..07029259 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/EnumerationDefinition.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/EnumerationDefinition.cs @@ -138,6 +138,7 @@ public EnumerationDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -687,6 +688,7 @@ bool Systems.DefinitionAndUsage.IDefinition.IsVariation /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IRequirementUsage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IRequirementUsage.cs index d030dd1c..26c471fb 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IRequirementUsage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IRequirementUsage.cs @@ -75,6 +75,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List actorParameter { get; } /// @@ -124,6 +125,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List stakeholderParameter { get; } /// @@ -131,6 +133,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] IUsage subjectParameter { get; } /// diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IUsage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IUsage.cs index a31acadb..518d3d20 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IUsage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/IUsage.cs @@ -86,6 +86,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List directedUsage { get; } /// @@ -274,6 +275,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List nestedUsage { get; } /// @@ -309,6 +311,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] IDefinition owningDefinition { get; } /// diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/RequirementUsage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/RequirementUsage.cs index 1a7bff9f..308984e0 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/RequirementUsage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/RequirementUsage.cs @@ -95,6 +95,7 @@ public RequirementUsage() /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -220,6 +221,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -753,6 +755,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1039,6 +1042,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1190,6 +1194,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -1198,6 +1203,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/Usage.cs b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/Usage.cs index 9384fb20..6207df05 100644 --- a/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/Usage.cs +++ b/SysML2.NET.CodeGenerator.Tests/Expected/UML/Core/AutoGenPoco/Usage.cs @@ -174,6 +174,7 @@ public Usage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -665,6 +666,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -941,6 +943,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj b/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj index 16f57f7e..a4f371c3 100644 --- a/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj +++ b/SysML2.NET.CodeGenerator.Tests/SysML2.NET.CodeGenerator.Tests.csproj @@ -1160,7 +1160,7 @@ - + diff --git a/SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCorePocoValidationGenerator.cs b/SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCorePocoValidationGenerator.cs index 7fc468d4..596266ec 100644 --- a/SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCorePocoValidationGenerator.cs +++ b/SysML2.NET.CodeGenerator/Generators/UmlHandleBarsGenerators/UmlCorePocoValidationGenerator.cs @@ -127,9 +127,50 @@ protected override void RegisterTemplates() /// The payload with the two ordered rule lists. private static ContainmentRulePayload QueryContainmentRulePayload(XmiReaderResult xmiReaderResult) { - var (_, ownedRelatedElementXmiId, owningRelatedElementXmiId, elementXmiId) = + var (relationshipClass, ownedRelatedElementXmiId, owningRelatedElementXmiId, elementXmiId) = QueryRootContainmentMeta(xmiReaderResult); + // Relationship's target-side branch (relatedElement + target + source) shares a common + // ancestor with the ownedRelatedElement / owningRelatedElement branch: Relationship::relatedElement + // (a derivedUnion). Some uml4net versions populate SubsettedProperty collections at query time + // with reverse-subsetters (i.e. properties that subset the current property), causing the chain + // walker to cross between the target-side and owner-side branches via this shared ancestor. + // Collecting the xmiIds of relatedElement and its two immediate subsetters (target, source) and + // passing them as "avoid" nodes makes the walker dead-end there, so a candidate property is + // picked only when its declared subset/redefinition chain LEADS DIRECTLY to the requested root + // without crossing over. + var walkAvoidXmiIds = new HashSet(); + var ownedRelatedElementSubsets = relationshipClass.OwnedAttribute + .Where(a => a.XmiId == ownedRelatedElementXmiId) + .SelectMany(a => a.SubsettedProperty.Select(s => s.XmiId)) + .ToHashSet(); + var owningRelatedElementSubsets = relationshipClass.OwnedAttribute + .Where(a => a.XmiId == owningRelatedElementXmiId) + .SelectMany(a => a.SubsettedProperty.Select(s => s.XmiId)) + .ToHashSet(); + var relatedElementXmiId = ownedRelatedElementSubsets + .Intersect(owningRelatedElementSubsets) + .FirstOrDefault(); + + if (relatedElementXmiId != null) + { + walkAvoidXmiIds.Add(relatedElementXmiId); + + // target and source are Relationship's non-composite ownedAttributes typed Element that + // subset relatedElement (they are the target-side memberEnds of the source/target + // associations). Add them so a candidate whose redefined chain hits target/source does not + // then cross into owningRelatedElement via uml4net's bidirectional subset expansion. + foreach (var relationshipEnd in relationshipClass.OwnedAttribute + .Where(a => !a.IsComposite + && a.XmiId != owningRelatedElementXmiId + && a.XmiId != relatedElementXmiId + && a.Type is IClass end && end.XmiId == elementXmiId + && a.SubsettedProperty.Any(s => s.XmiId == relatedElementXmiId))) + { + walkAvoidXmiIds.Add(relationshipEnd.XmiId); + } + } + var seenClassXmiIds = new HashSet(); var targetRows = new List<(IClass UmlClass, IProperty TypedProperty, int InheritanceDepth)>(); var ownerRows = new List<(IClass UmlClass, IProperty TypedProperty, int InheritanceDepth)>(); @@ -145,8 +186,8 @@ private static ContainmentRulePayload QueryContainmentRulePayload(XmiReaderResul var inheritanceDepth = QueryInheritanceDepth(umlClass); - var typedTarget = QueryTypedSubsettingProperty(umlClass, ownedRelatedElementXmiId, requireComposite: true); - + var typedTarget = QueryTypedSubsettingProperty(umlClass, ownedRelatedElementXmiId, requireComposite: true, avoidXmiIds: walkAvoidXmiIds); + if (typedTarget != null) { targetRows.Add((umlClass, typedTarget, inheritanceDepth)); @@ -155,8 +196,8 @@ private static ContainmentRulePayload QueryContainmentRulePayload(XmiReaderResul // Owner-side narrowing is meaningful only when the typed property's type is strictly // narrower than Element — otherwise the arm would be equivalent to 'source is not null' // which is exactly what the '_ => true' default already returns. - var typedOwner = QueryTypedSubsettingProperty(umlClass, owningRelatedElementXmiId, requireComposite: false); - + var typedOwner = QueryTypedSubsettingProperty(umlClass, owningRelatedElementXmiId, requireComposite: false, avoidXmiIds: walkAvoidXmiIds); + if (typedOwner != null && typedOwner.Type.XmiId != elementXmiId) { ownerRows.Add((umlClass, typedOwner, inheritanceDepth)); @@ -271,8 +312,15 @@ private static (IClass RelationshipClass, string OwnedRelatedElementXmiId, strin { composite = attribute; } - else if (!attribute.IsComposite && backRef == null) + else if (!attribute.IsComposite && backRef == null && HasCompositePairedMemberEnd(attribute)) { + // Relationship declares MULTIPLE non-composite Element-typed ownedAttributes + // (owningRelatedElement, target, source). Only owningRelatedElement is paired + // with a COMPOSITE property on Element (via the ownedRelationship / + // owningRelatedElement association whose Element-side end is composite). The + // other candidates (target, source) pair with non-composite reference back-refs + // (targetRelationship, sourceRelationship). Requiring the paired end to be + // composite selects the true containment back-reference. backRef = attribute; } } @@ -303,6 +351,27 @@ private static (IClass RelationshipClass, string OwnedRelatedElementXmiId, strin return (match.Class, match.Composite.XmiId, match.BackRef.XmiId, ((IClass)match.Composite.Type).XmiId); } + /// + /// Returns true when the given property's association has a memberEnd on the OTHER side of the + /// relationship that is composite. Used to distinguish the true owner-side back-reference + /// (owningRelatedElement, whose paired end Element::ownedRelationship is composite) + /// from other non-composite Element-typed ownedAttributes on Relationship + /// (target, source) whose paired ends are non-composite references. + /// + /// The non-composite property whose association is inspected. + /// true if a memberEnd distinct from exists on the + /// association and is composite; otherwise false. + private static bool HasCompositePairedMemberEnd(IProperty property) + { + if (property.Association == null) + { + return false; + } + + return property.Association.MemberEnd + .Any(end => end != null && end.XmiId != property.XmiId && end.IsComposite); + } + /// /// Returns true when is a strict (non-reflexive) descendant /// of via transitive walks. @@ -354,10 +423,15 @@ private static bool IsStrictDescendantOf(IClass candidateDescendant, IClass cand /// The candidate class. /// The xmi id of the root property in the subsetting chain. /// When true, only composite-aggregation attributes are considered - /// (target-side OwnedRelatedElement chain). When false, any aggregation is accepted - /// (owner-side OwningRelatedElement chain, which is not composite). + /// (target-side OwnedRelatedElement chain). When false, only non-composite attributes are + /// considered (owner-side OwningRelatedElement chain, which is not composite). + /// Optional set of "shared-ancestor" property xmiIds that the walker + /// must treat as dead-ends. Used to prevent chain walks from crossing between the owned-side and + /// owner-side branches via Relationship::relatedElement and its immediate target-side + /// subsetters (target, source), whose subsetted-by collections may be populated + /// bidirectionally by some uml4net versions. /// The typed property, or null. - private static IProperty QueryTypedSubsettingProperty(IClass umlClass, string rootPropertyXmiId, bool requireComposite) + private static IProperty QueryTypedSubsettingProperty(IClass umlClass, string rootPropertyXmiId, bool requireComposite, HashSet avoidXmiIds = null) { IProperty bestMatch = null; var bestDepth = int.MinValue; @@ -369,7 +443,12 @@ private static IProperty QueryTypedSubsettingProperty(IClass umlClass, string ro continue; } - var depth = QueryDepthToRootProperty(attribute, rootPropertyXmiId); + if (!requireComposite && attribute.IsComposite) + { + continue; + } + + var depth = QueryDepthToRootProperty(attribute, rootPropertyXmiId, avoidXmiIds); if (depth < 0) { @@ -393,8 +472,13 @@ private static IProperty QueryTypedSubsettingProperty(IClass umlClass, string ro /// /// The starting property. /// The xmi id of the root property in the subsetting chain. + /// Optional set of xmi ids treated as dead-ends: if the walker visits + /// one of these properties, it is not expanded (its subsets / redefinitions are not enqueued). + /// Used to prevent walks from crossing between the target-side and owner-side branches via the + /// shared Relationship::relatedElement ancestor and its immediate target-side subsetters + /// (target, source). /// The chain depth, or -1. - private static int QueryDepthToRootProperty(IProperty property, string rootPropertyXmiId) + private static int QueryDepthToRootProperty(IProperty property, string rootPropertyXmiId, HashSet avoidXmiIds = null) { var visited = new HashSet(); var queue = new Queue<(IProperty Property, int Depth)>(); @@ -410,6 +494,11 @@ private static int QueryDepthToRootProperty(IProperty property, string rootPrope return depth; } + if (avoidXmiIds != null && avoidXmiIds.Contains(current.XmiId)) + { + continue; + } + foreach (var redefined in current.RedefinedProperty.Where(redefined => visited.Add(redefined.XmiId))) { queue.Enqueue((redefined, depth + 1)); diff --git a/SysML2.NET.CodeGenerator/HandleBarHelpers/PropertyHelper.cs b/SysML2.NET.CodeGenerator/HandleBarHelpers/PropertyHelper.cs index 3c15054c..11359341 100644 --- a/SysML2.NET.CodeGenerator/HandleBarHelpers/PropertyHelper.cs +++ b/SysML2.NET.CodeGenerator/HandleBarHelpers/PropertyHelper.cs @@ -258,7 +258,11 @@ public static void RegisterPropertyHelper(this IHandlebars handlebars) if (!isRedefinedPropertyInContext) { - if (property.QueryIsDefaultValueDifferentThanDefault()) + if (property.QueryIsEnumPropertyWithDefaultValue()) + { + sb.Append($" = {property.Type.Name.CapitalizeFirstLetter()}.{property.QueryDefaultValueAsString().CapitalizeFirstLetter()};"); + } + else if (property.QueryIsDefaultValueDifferentThanDefault()) { if (property.QueryIsString()) { @@ -269,10 +273,6 @@ public static void RegisterPropertyHelper(this IHandlebars handlebars) sb.Append($" = {property.QueryDefaultValueAsString()};"); } } - else if (property.QueryIsEnumPropertyWithDefaultValue()) - { - sb.Append($" = {property.Type.Name.CapitalizeFirstLetter()}.{property.QueryDefaultValueAsString().CapitalizeFirstLetter()};"); - } } writer.WriteSafeString(sb + Environment.NewLine); @@ -486,7 +486,11 @@ public static void RegisterPropertyHelper(this IHandlebars handlebars) if ((!property.IsDerived || property.IsDerivedUnion) && !isRedefinedPropertyInContext) { - if (property.QueryIsDefaultValueDifferentThanDefault()) + if (property.QueryIsEnumPropertyWithDefaultValue()) + { + sb.Append($" = {property.Type.Name.CapitalizeFirstLetter()}.{property.QueryDefaultValueAsString().CapitalizeFirstLetter()};"); + } + else if (property.QueryIsDefaultValueDifferentThanDefault()) { if (property.QueryIsString()) { @@ -497,10 +501,6 @@ public static void RegisterPropertyHelper(this IHandlebars handlebars) sb.Append($" = {property.QueryDefaultValueAsString()};"); } } - else if (property.QueryIsEnumPropertyWithDefaultValue()) - { - sb.Append($" = {property.Type.Name.CapitalizeFirstLetter()}.{property.QueryDefaultValueAsString().CapitalizeFirstLetter()};"); - } } if (property.QueryPropertyIsPartOfNonDerivedCompositeAggregation()) diff --git a/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj b/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj index 62ec1964..affa35f1 100644 --- a/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj +++ b/SysML2.NET.CodeGenerator/SysML2.NET.CodeGenerator.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/AcceptActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/AcceptActionUsageExtensions.cs index 067c1cc0..49a18cf4 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/AcceptActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/AcceptActionUsageExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.AcceptActionUsage ToDto(this Core.POCO.Sy dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ActionUsageExtensions.cs index 4c8bfcb1..9c8f24e7 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ActionUsageExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.ActionUsage ToDto(this Core.POCO.Systems. dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/AnalysisCaseUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/AnalysisCaseUsageExtensions.cs index 930a97af..9b71d668 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/AnalysisCaseUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/AnalysisCaseUsageExtensions.cs @@ -212,7 +212,6 @@ public static Core.DTO.Systems.AnalysisCases.AnalysisCaseUsage ToDto(this Core.P if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.actorParameter = poco.actorParameter.Select(x => x.Id).ToList(); dto.analysisCaseDefinition = poco.analysisCaseDefinition?.Id; dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); @@ -269,7 +268,6 @@ public static Core.DTO.Systems.AnalysisCases.AnalysisCaseUsage ToDto(this Core.P dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); dto.objectiveRequirement = poco.objectiveRequirement?.Id; - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/AssignmentActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/AssignmentActionUsageExtensions.cs index 219dec21..22c37d88 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/AssignmentActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/AssignmentActionUsageExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.AssignmentActionUsage ToDto(this Core.POC dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/CalculationUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/CalculationUsageExtensions.cs index efdc36ba..6a00da5f 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/CalculationUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/CalculationUsageExtensions.cs @@ -212,7 +212,6 @@ public static Core.DTO.Systems.Calculations.CalculationUsage ToDto(this Core.POC if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.calculationDefinition = poco.calculationDefinition?.Id; dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); dto.crossFeature = poco.crossFeature?.Id; @@ -267,7 +266,6 @@ public static Core.DTO.Systems.Calculations.CalculationUsage ToDto(this Core.POC dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/CaseUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/CaseUsageExtensions.cs index c6508a7c..96da82d7 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/CaseUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/CaseUsageExtensions.cs @@ -212,7 +212,6 @@ public static Core.DTO.Systems.Cases.CaseUsage ToDto(this Core.POCO.Systems.Case if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.actorParameter = poco.actorParameter.Select(x => x.Id).ToList(); dto.caseDefinition = poco.caseDefinition?.Id; dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); @@ -269,7 +268,6 @@ public static Core.DTO.Systems.Cases.CaseUsage ToDto(this Core.POCO.Systems.Case dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); dto.objectiveRequirement = poco.objectiveRequirement?.Id; - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/DecisionNodeExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/DecisionNodeExtensions.cs index d0f6a60e..bd59effb 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/DecisionNodeExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/DecisionNodeExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.DecisionNode ToDto(this Core.POCO.Systems dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ExhibitStateUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ExhibitStateUsageExtensions.cs index bd48b760..81b16d2f 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ExhibitStateUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ExhibitStateUsageExtensions.cs @@ -271,7 +271,6 @@ public static Core.DTO.Systems.States.ExhibitStateUsage ToDto(this Core.POCO.Sys dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FlowUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FlowUsageExtensions.cs index abed88dd..96b056bd 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/FlowUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/FlowUsageExtensions.cs @@ -245,7 +245,6 @@ public static Core.DTO.Systems.Flows.FlowUsage ToDto(this Core.POCO.Systems.Flow if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); dto.connectorEnd = poco.connectorEnd.Select(x => x.Id).ToList(); dto.crossFeature = poco.crossFeature?.Id; @@ -301,7 +300,6 @@ public static Core.DTO.Systems.Flows.FlowUsage ToDto(this Core.POCO.Systems.Flow dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForLoopActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForLoopActionUsageExtensions.cs index bf849fa1..609f8474 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForLoopActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForLoopActionUsageExtensions.cs @@ -267,7 +267,6 @@ public static Core.DTO.Systems.Actions.ForLoopActionUsage ToDto(this Core.POCO.S dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForkNodeExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForkNodeExtensions.cs index 11a92c00..cb5857c9 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForkNodeExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/ForkNodeExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.ForkNode ToDto(this Core.POCO.Systems.Act dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/IfActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/IfActionUsageExtensions.cs index b684f0f5..75d40be0 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/IfActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/IfActionUsageExtensions.cs @@ -267,7 +267,6 @@ public static Core.DTO.Systems.Actions.IfActionUsage ToDto(this Core.POCO.System dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/IncludeUseCaseUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/IncludeUseCaseUsageExtensions.cs index 38ab996c..416ad54a 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/IncludeUseCaseUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/IncludeUseCaseUsageExtensions.cs @@ -212,7 +212,6 @@ public static Core.DTO.Systems.UseCases.IncludeUseCaseUsage ToDto(this Core.POCO if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.actorParameter = poco.actorParameter.Select(x => x.Id).ToList(); dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); dto.crossFeature = poco.crossFeature?.Id; @@ -269,7 +268,6 @@ public static Core.DTO.Systems.UseCases.IncludeUseCaseUsage ToDto(this Core.POCO dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); dto.objectiveRequirement = poco.objectiveRequirement?.Id; - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/JoinNodeExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/JoinNodeExtensions.cs index 37144a7d..8e969f19 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/JoinNodeExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/JoinNodeExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.JoinNode ToDto(this Core.POCO.Systems.Act dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MergeNodeExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MergeNodeExtensions.cs index f57eaeb4..3519fcda 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MergeNodeExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MergeNodeExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.MergeNode ToDto(this Core.POCO.Systems.Ac dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MetadataUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MetadataUsageExtensions.cs index cb387f4c..7c633ad9 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/MetadataUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/MetadataUsageExtensions.cs @@ -235,7 +235,6 @@ public static Core.DTO.Systems.Metadata.MetadataUsage ToDto(this Core.POCO.Syste dto.isConjugated = poco.isConjugated; dto.isLibraryElement = poco.isLibraryElement; dto.isReference = poco.isReference; - dto.itemDefinition = poco.itemDefinition.Select(x => x.Id).ToList(); dto.mayTimeVary = poco.mayTimeVary; dto.member = poco.member.Select(x => x.Id).ToList(); dto.membership = poco.membership.Select(x => x.Id).ToList(); diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/PerformActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/PerformActionUsageExtensions.cs index cfe92409..8b877ee5 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/PerformActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/PerformActionUsageExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.PerformActionUsage ToDto(this Core.POCO.S dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SendActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SendActionUsageExtensions.cs index f6554732..89ed77a3 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SendActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SendActionUsageExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.SendActionUsage ToDto(this Core.POCO.Syst dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; @@ -297,7 +296,7 @@ public static Core.DTO.Systems.Actions.SendActionUsage ToDto(this Core.POCO.Syst dto.owningType = poco.owningType?.Id; dto.owningUsage = poco.owningUsage?.Id; dto.parameter = poco.parameter.Select(x => x.Id).ToList(); - dto.payloadArgument = poco.payloadArgument.Id; + dto.payloadArgument = poco.payloadArgument?.Id; dto.qualifiedName = poco.qualifiedName; dto.receiverArgument = poco.receiverArgument?.Id; dto.senderArgument = poco.senderArgument?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/StateUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/StateUsageExtensions.cs index 7843f13d..16684be0 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/StateUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/StateUsageExtensions.cs @@ -270,7 +270,6 @@ public static Core.DTO.Systems.States.StateUsage ToDto(this Core.POCO.Systems.St dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SuccessionFlowUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SuccessionFlowUsageExtensions.cs index cb37a8c8..124fcc44 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/SuccessionFlowUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/SuccessionFlowUsageExtensions.cs @@ -245,7 +245,6 @@ public static Core.DTO.Systems.Flows.SuccessionFlowUsage ToDto(this Core.POCO.Sy if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); dto.connectorEnd = poco.connectorEnd.Select(x => x.Id).ToList(); dto.crossFeature = poco.crossFeature?.Id; @@ -301,7 +300,6 @@ public static Core.DTO.Systems.Flows.SuccessionFlowUsage ToDto(this Core.POCO.Sy dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/TerminateActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/TerminateActionUsageExtensions.cs index 5fd1806f..65f6079b 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/TerminateActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/TerminateActionUsageExtensions.cs @@ -265,7 +265,6 @@ public static Core.DTO.Systems.Actions.TerminateActionUsage ToDto(this Core.POCO dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/TransitionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/TransitionUsageExtensions.cs index a619577f..a9cd5cf2 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/TransitionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/TransitionUsageExtensions.cs @@ -267,7 +267,6 @@ public static Core.DTO.Systems.States.TransitionUsage ToDto(this Core.POCO.Syste dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/UseCaseUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/UseCaseUsageExtensions.cs index 1e43b1bb..f22b9325 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/UseCaseUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/UseCaseUsageExtensions.cs @@ -212,7 +212,6 @@ public static Core.DTO.Systems.UseCases.UseCaseUsage ToDto(this Core.POCO.System if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.actorParameter = poco.actorParameter.Select(x => x.Id).ToList(); dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); dto.crossFeature = poco.crossFeature?.Id; @@ -269,7 +268,6 @@ public static Core.DTO.Systems.UseCases.UseCaseUsage ToDto(this Core.POCO.System dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); dto.objectiveRequirement = poco.objectiveRequirement?.Id; - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/VerificationCaseUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/VerificationCaseUsageExtensions.cs index ef08957f..db976f6d 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/VerificationCaseUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/VerificationCaseUsageExtensions.cs @@ -212,7 +212,6 @@ public static Core.DTO.Systems.VerificationCases.VerificationCaseUsage ToDto(thi if (includeDerivedProperties) { - dto.actionDefinition = poco.actionDefinition.Select(x => x.Id).ToList(); dto.actorParameter = poco.actorParameter.Select(x => x.Id).ToList(); dto.caseDefinition = poco.caseDefinition?.Id; dto.chainingFeature = poco.chainingFeature.Select(x => x.Id).ToList(); @@ -269,7 +268,6 @@ public static Core.DTO.Systems.VerificationCases.VerificationCaseUsage ToDto(thi dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); dto.objectiveRequirement = poco.objectiveRequirement?.Id; - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Dal/Core/AutoGenPocoExtension/WhileLoopActionUsageExtensions.cs b/SysML2.NET.Dal/Core/AutoGenPocoExtension/WhileLoopActionUsageExtensions.cs index 998801b6..fe64221a 100644 --- a/SysML2.NET.Dal/Core/AutoGenPocoExtension/WhileLoopActionUsageExtensions.cs +++ b/SysML2.NET.Dal/Core/AutoGenPocoExtension/WhileLoopActionUsageExtensions.cs @@ -266,7 +266,6 @@ public static Core.DTO.Systems.Actions.WhileLoopActionUsage ToDto(this Core.POCO dto.nestedVerificationCase = poco.nestedVerificationCase.Select(x => x.Id).ToList(); dto.nestedView = poco.nestedView.Select(x => x.Id).ToList(); dto.nestedViewpoint = poco.nestedViewpoint.Select(x => x.Id).ToList(); - dto.occurrenceDefinition = poco.occurrenceDefinition.Select(x => x.Id).ToList(); dto.output = poco.output.Select(x => x.Id).ToList(); dto.ownedAnnotation = poco.ownedAnnotation.Select(x => x.Id).ToList(); dto.ownedConjugator = poco.ownedConjugator?.Id; diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AcceptActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AcceptActionUsageDeSerializer.cs index 6c259e45..5523f8e6 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AcceptActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AcceptActionUsageDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the AcceptActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the AcceptActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ActionUsageDeSerializer.cs index e912ad90..fcd14c32 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ActionUsageDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the ActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the ActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AnalysisCaseUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AnalysisCaseUsageDeSerializer.cs index 1e717234..b5ec9e08 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AnalysisCaseUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AnalysisCaseUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static IAnalysisCaseUsage DeSerialize(JsonElement jsonElement, Serializ /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.AnalysisCases.AnalysisCaseUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the AnalysisCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("actorParameter"u8, out var actorParameterProperty)) { foreach (var arrayItem in actorParameterProperty.EnumerateArray()) @@ -1435,26 +1415,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the objectiveRequirement Json property was not found in the AnalysisCaseUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the AnalysisCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AssignmentActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AssignmentActionUsageDeSerializer.cs index 924a3187..66020f98 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AssignmentActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/AssignmentActionUsageDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the AssignmentActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the AssignmentActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CalculationUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CalculationUsageDeSerializer.cs index 6ed308f7..b21652de 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CalculationUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CalculationUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static ICalculationUsage DeSerialize(JsonElement jsonElement, Serializa /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.Calculations.CalculationUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the CalculationUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("aliasIds"u8, out var aliasIdsProperty)) { foreach (var arrayItem in aliasIdsProperty.EnumerateArray()) @@ -1391,26 +1371,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the CalculationUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the CalculationUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CaseUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CaseUsageDeSerializer.cs index 03120ebb..c34e4ddb 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CaseUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/CaseUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static ICaseUsage DeSerialize(JsonElement jsonElement, SerializationMod /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.Cases.CaseUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the CaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("actorParameter"u8, out var actorParameterProperty)) { foreach (var arrayItem in actorParameterProperty.EnumerateArray()) @@ -1435,26 +1415,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the objectiveRequirement Json property was not found in the CaseUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the CaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/DecisionNodeDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/DecisionNodeDeSerializer.cs index 72de0317..c45417c1 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/DecisionNodeDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/DecisionNodeDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the DecisionNode: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the DecisionNode: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ExhibitStateUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ExhibitStateUsageDeSerializer.cs index b8298796..8970fbbb 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ExhibitStateUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ExhibitStateUsageDeSerializer.cs @@ -1444,26 +1444,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the ExhibitStateUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the ExhibitStateUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/FlowUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/FlowUsageDeSerializer.cs index 3ac00bbe..96a13be1 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/FlowUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/FlowUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static IFlowUsage DeSerialize(JsonElement jsonElement, SerializationMod /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.Flows.FlowUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the FlowUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("aliasIds"u8, out var aliasIdsProperty)) { foreach (var arrayItem in aliasIdsProperty.EnumerateArray()) @@ -1431,26 +1411,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the FlowUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the FlowUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForLoopActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForLoopActionUsageDeSerializer.cs index 93c4aa5c..5eac0005 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForLoopActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForLoopActionUsageDeSerializer.cs @@ -1405,26 +1405,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the ForLoopActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the ForLoopActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForkNodeDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForkNodeDeSerializer.cs index f911cbda..b1e92f0e 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForkNodeDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/ForkNodeDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the ForkNode: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the ForkNode: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IfActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IfActionUsageDeSerializer.cs index e8c5a6cf..40cc3a2f 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IfActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IfActionUsageDeSerializer.cs @@ -1404,26 +1404,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the IfActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the IfActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IncludeUseCaseUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IncludeUseCaseUsageDeSerializer.cs index dcd9d599..a900b894 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IncludeUseCaseUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/IncludeUseCaseUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static IIncludeUseCaseUsage DeSerialize(JsonElement jsonElement, Serial /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.UseCases.IncludeUseCaseUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the IncludeUseCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("actorParameter"u8, out var actorParameterProperty)) { foreach (var arrayItem in actorParameterProperty.EnumerateArray()) @@ -1431,26 +1411,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the objectiveRequirement Json property was not found in the IncludeUseCaseUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the IncludeUseCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/JoinNodeDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/JoinNodeDeSerializer.cs index 1b55be06..30ebfc2e 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/JoinNodeDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/JoinNodeDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the JoinNode: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the JoinNode: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MergeNodeDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MergeNodeDeSerializer.cs index 5c4de455..ccf17d1d 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MergeNodeDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MergeNodeDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the MergeNode: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the MergeNode: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MetadataUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MetadataUsageDeSerializer.cs index 7b88f4b8..8fdc663f 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MetadataUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/MetadataUsageDeSerializer.cs @@ -770,26 +770,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the isVariation Json property was not found in the MetadataUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("itemDefinition"u8, out var itemDefinitionProperty)) - { - foreach (var arrayItem in itemDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var itemDefinitionExternalIdProperty)) - { - var propertyValue = itemDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.itemDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the itemDefinition Json property was not found in the MetadataUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("mayTimeVary"u8, out var mayTimeVaryProperty)) { if (mayTimeVaryProperty.ValueKind != JsonValueKind.Null) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/PerformActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/PerformActionUsageDeSerializer.cs index 7308f303..510d8f96 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/PerformActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/PerformActionUsageDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the PerformActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the PerformActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SendActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SendActionUsageDeSerializer.cs index 91ac55b1..575c2078 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SendActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SendActionUsageDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the SendActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the SendActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/StateUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/StateUsageDeSerializer.cs index 20062a70..8e6fb349 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/StateUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/StateUsageDeSerializer.cs @@ -1419,26 +1419,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the StateUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the StateUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SuccessionFlowUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SuccessionFlowUsageDeSerializer.cs index da5e6cb4..f85d4fb5 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SuccessionFlowUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/SuccessionFlowUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static ISuccessionFlowUsage DeSerialize(JsonElement jsonElement, Serial /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.Flows.SuccessionFlowUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the SuccessionFlowUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("aliasIds"u8, out var aliasIdsProperty)) { foreach (var arrayItem in aliasIdsProperty.EnumerateArray()) @@ -1431,26 +1411,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the SuccessionFlowUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the SuccessionFlowUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TerminateActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TerminateActionUsageDeSerializer.cs index 58dcf846..bda12c27 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TerminateActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TerminateActionUsageDeSerializer.cs @@ -1355,26 +1355,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the TerminateActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the TerminateActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TransitionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TransitionUsageDeSerializer.cs index 939879bf..a176d053 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TransitionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/TransitionUsageDeSerializer.cs @@ -1395,26 +1395,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the TransitionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the TransitionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/UseCaseUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/UseCaseUsageDeSerializer.cs index c8d79789..a11a7132 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/UseCaseUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/UseCaseUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static IUseCaseUsage DeSerialize(JsonElement jsonElement, Serialization /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.UseCases.UseCaseUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the UseCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("actorParameter"u8, out var actorParameterProperty)) { foreach (var arrayItem in actorParameterProperty.EnumerateArray()) @@ -1431,26 +1411,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the objectiveRequirement Json property was not found in the UseCaseUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the UseCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/VerificationCaseUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/VerificationCaseUsageDeSerializer.cs index 069f6496..c8c93610 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/VerificationCaseUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/VerificationCaseUsageDeSerializer.cs @@ -115,26 +115,6 @@ internal static IVerificationCaseUsage DeSerialize(JsonElement jsonElement, Seri /// private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO.Systems.VerificationCases.VerificationCaseUsage dtoInstance, JsonElement jsonElement, ILogger logger) { - if (jsonElement.TryGetProperty("actionDefinition"u8, out var actionDefinitionProperty)) - { - foreach (var arrayItem in actionDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var actionDefinitionExternalIdProperty)) - { - var propertyValue = actionDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.actionDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the actionDefinition Json property was not found in the VerificationCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("actorParameter"u8, out var actorParameterProperty)) { foreach (var arrayItem in actorParameterProperty.EnumerateArray()) @@ -1435,26 +1415,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the objectiveRequirement Json property was not found in the VerificationCaseUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the VerificationCaseUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/WhileLoopActionUsageDeSerializer.cs b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/WhileLoopActionUsageDeSerializer.cs index 66347b1a..7f6d2143 100644 --- a/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/WhileLoopActionUsageDeSerializer.cs +++ b/SysML2.NET.Serializer.Json/Core/AutoGenDeSerializer/WhileLoopActionUsageDeSerializer.cs @@ -1380,26 +1380,6 @@ private static void DeserializeDtoIncludingDerivedProperties(SysML2.NET.Core.DTO logger.LogDebug("the nestedViewpoint Json property was not found in the WhileLoopActionUsage: {Id}", dtoInstance.Id); } - if (jsonElement.TryGetProperty("occurrenceDefinition"u8, out var occurrenceDefinitionProperty)) - { - foreach (var arrayItem in occurrenceDefinitionProperty.EnumerateArray()) - { - if (arrayItem.TryGetProperty("@id"u8, out var occurrenceDefinitionExternalIdProperty)) - { - var propertyValue = occurrenceDefinitionExternalIdProperty.GetString(); - - if (propertyValue != null) - { - dtoInstance.occurrenceDefinition.Add(Guid.Parse(propertyValue)); - } - } - } - } - else - { - logger.LogDebug("the occurrenceDefinition Json property was not found in the WhileLoopActionUsage: {Id}", dtoInstance.Id); - } - if (jsonElement.TryGetProperty("output"u8, out var outputProperty)) { foreach (var arrayItem in outputProperty.EnumerateArray()) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AcceptActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AcceptActionUsageWriter.cs index a8b9fb1b..1a79e294 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AcceptActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AcceptActionUsageWriter.cs @@ -913,17 +913,6 @@ public override void Write(XmlWriter xmlWriter, IAcceptActionUsage poco, string } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2155,17 +2144,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IAcceptActionUsage po } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ActionUsageWriter.cs index c7b3a4ef..ce51d097 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ActionUsageWriter.cs @@ -889,17 +889,6 @@ public override void Write(XmlWriter xmlWriter, IActionUsage poco, string elemen } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2074,17 +2063,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IActionUsage poco, st } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AnalysisCaseUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AnalysisCaseUsageWriter.cs index bdd2a4fc..018f115f 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AnalysisCaseUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AnalysisCaseUsageWriter.cs @@ -409,17 +409,6 @@ public override void Write(XmlWriter xmlWriter, IAnalysisCaseUsage poco, string // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -970,17 +959,6 @@ public override void Write(XmlWriter xmlWriter, IAnalysisCaseUsage poco, string } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1708,17 +1686,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IAnalysisCaseUsage po // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -2269,17 +2236,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IAnalysisCaseUsage po } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AssignmentActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AssignmentActionUsageWriter.cs index 0ea59a98..693e4d67 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AssignmentActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/AssignmentActionUsageWriter.cs @@ -913,17 +913,6 @@ public override void Write(XmlWriter xmlWriter, IAssignmentActionUsage poco, str } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2155,17 +2144,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IAssignmentActionUsag } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CalculationUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CalculationUsageWriter.cs index 39111e63..f0012fd7 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CalculationUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CalculationUsageWriter.cs @@ -385,17 +385,6 @@ public override void Write(XmlWriter xmlWriter, ICalculationUsage poco, string e // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.calculationDefinition != null) @@ -924,17 +913,6 @@ public override void Write(XmlWriter xmlWriter, ICalculationUsage poco, string e } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1616,17 +1594,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ICalculationUsage poc // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.calculationDefinition != null) @@ -2155,17 +2122,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ICalculationUsage poc } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CaseUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CaseUsageWriter.cs index e0f52992..540c99ef 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CaseUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/CaseUsageWriter.cs @@ -401,17 +401,6 @@ public override void Write(XmlWriter xmlWriter, ICaseUsage poco, string elementN // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -962,17 +951,6 @@ public override void Write(XmlWriter xmlWriter, ICaseUsage poco, string elementN } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1681,17 +1659,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ICaseUsage poco, stri // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -2242,17 +2209,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ICaseUsage poco, stri } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/DecisionNodeWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/DecisionNodeWriter.cs index 34b0a205..4853c325 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/DecisionNodeWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/DecisionNodeWriter.cs @@ -889,17 +889,6 @@ public override void Write(XmlWriter xmlWriter, IDecisionNode poco, string eleme } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2074,17 +2063,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IDecisionNode poco, s } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ExhibitStateUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ExhibitStateUsageWriter.cs index b957fdb3..b5ae6eed 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ExhibitStateUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ExhibitStateUsageWriter.cs @@ -959,17 +959,6 @@ public override void Write(XmlWriter xmlWriter, IExhibitStateUsage poco, string } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2225,17 +2214,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IExhibitStateUsage po } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/FlowUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/FlowUsageWriter.cs index 80cae09d..be563cd2 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/FlowUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/FlowUsageWriter.cs @@ -409,17 +409,6 @@ public override void Write(XmlWriter xmlWriter, IFlowUsage poco, string elementN // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.chainingFeature != null) @@ -970,17 +959,6 @@ public override void Write(XmlWriter xmlWriter, IFlowUsage poco, string elementN } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1757,17 +1735,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IFlowUsage poco, stri // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.chainingFeature != null) @@ -2318,17 +2285,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IFlowUsage poco, stri } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForLoopActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForLoopActionUsageWriter.cs index a6c3ca64..49598168 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForLoopActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForLoopActionUsageWriter.cs @@ -935,17 +935,6 @@ public override void Write(XmlWriter xmlWriter, IForLoopActionUsage poco, string } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2177,17 +2166,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IForLoopActionUsage p } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForkNodeWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForkNodeWriter.cs index 31f7a0d2..5f4db778 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForkNodeWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/ForkNodeWriter.cs @@ -889,17 +889,6 @@ public override void Write(XmlWriter xmlWriter, IForkNode poco, string elementNa } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2074,17 +2063,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IForkNode poco, strin } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IfActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IfActionUsageWriter.cs index e9c85afc..5225af0d 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IfActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IfActionUsageWriter.cs @@ -935,17 +935,6 @@ public override void Write(XmlWriter xmlWriter, IIfActionUsage poco, string elem } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2177,17 +2166,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IIfActionUsage poco, } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IncludeUseCaseUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IncludeUseCaseUsageWriter.cs index 76f9ba99..b587dd01 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IncludeUseCaseUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/IncludeUseCaseUsageWriter.cs @@ -409,17 +409,6 @@ public override void Write(XmlWriter xmlWriter, IIncludeUseCaseUsage poco, strin // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -970,17 +959,6 @@ public override void Write(XmlWriter xmlWriter, IIncludeUseCaseUsage poco, strin } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1719,17 +1697,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IIncludeUseCaseUsage // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -2280,17 +2247,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IIncludeUseCaseUsage } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/JoinNodeWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/JoinNodeWriter.cs index c685418d..a135579b 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/JoinNodeWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/JoinNodeWriter.cs @@ -889,17 +889,6 @@ public override void Write(XmlWriter xmlWriter, IJoinNode poco, string elementNa } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2074,17 +2063,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IJoinNode poco, strin } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MergeNodeWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MergeNodeWriter.cs index a0aba368..98da2f3e 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MergeNodeWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MergeNodeWriter.cs @@ -889,17 +889,6 @@ public override void Write(XmlWriter xmlWriter, IMergeNode poco, string elementN } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2074,17 +2063,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IMergeNode poco, stri } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MetadataUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MetadataUsageWriter.cs index 782ee2c8..acd4e146 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MetadataUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/MetadataUsageWriter.cs @@ -589,17 +589,6 @@ public override void Write(XmlWriter xmlWriter, IMetadataUsage poco, string elem } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.itemDefinition != null) - { - foreach (var item in poco.itemDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "itemDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.member != null) @@ -1826,17 +1815,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IMetadataUsage poco, } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.itemDefinition != null) - { - foreach (var item in poco.itemDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "itemDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.member != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/PerformActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/PerformActionUsageWriter.cs index 67df8081..3a4cebcc 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/PerformActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/PerformActionUsageWriter.cs @@ -897,17 +897,6 @@ public override void Write(XmlWriter xmlWriter, IPerformActionUsage poco, string } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2101,17 +2090,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IPerformActionUsage p } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SendActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SendActionUsageWriter.cs index a559d810..f803f214 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SendActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SendActionUsageWriter.cs @@ -913,17 +913,6 @@ public override void Write(XmlWriter xmlWriter, ISendActionUsage poco, string el } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2155,17 +2144,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ISendActionUsage poco } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/StateUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/StateUsageWriter.cs index 38b46748..bae89cc7 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/StateUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/StateUsageWriter.cs @@ -940,17 +940,6 @@ public override void Write(XmlWriter xmlWriter, IStateUsage poco, string element } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2187,17 +2176,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IStateUsage poco, str } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SuccessionFlowUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SuccessionFlowUsageWriter.cs index b09219b1..9c6f73ac 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SuccessionFlowUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/SuccessionFlowUsageWriter.cs @@ -409,17 +409,6 @@ public override void Write(XmlWriter xmlWriter, ISuccessionFlowUsage poco, strin // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.chainingFeature != null) @@ -970,17 +959,6 @@ public override void Write(XmlWriter xmlWriter, ISuccessionFlowUsage poco, strin } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1757,17 +1735,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ISuccessionFlowUsage // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.chainingFeature != null) @@ -2318,17 +2285,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ISuccessionFlowUsage } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TerminateActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TerminateActionUsageWriter.cs index 2ed2b07c..9a177099 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TerminateActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TerminateActionUsageWriter.cs @@ -897,17 +897,6 @@ public override void Write(XmlWriter xmlWriter, ITerminateActionUsage poco, stri } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2101,17 +2090,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ITerminateActionUsage } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TransitionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TransitionUsageWriter.cs index 54929bc4..95e5ca3f 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TransitionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/TransitionUsageWriter.cs @@ -936,17 +936,6 @@ public override void Write(XmlWriter xmlWriter, ITransitionUsage poco, string el } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2211,17 +2200,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, ITransitionUsage poco } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/UseCaseUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/UseCaseUsageWriter.cs index 12267c7a..b1c59151 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/UseCaseUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/UseCaseUsageWriter.cs @@ -401,17 +401,6 @@ public override void Write(XmlWriter xmlWriter, IUseCaseUsage poco, string eleme // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -962,17 +951,6 @@ public override void Write(XmlWriter xmlWriter, IUseCaseUsage poco, string eleme } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1692,17 +1670,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IUseCaseUsage poco, s // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -2253,17 +2220,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IUseCaseUsage poco, s } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/VerificationCaseUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/VerificationCaseUsageWriter.cs index 0168cdda..7dfa578a 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/VerificationCaseUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/VerificationCaseUsageWriter.cs @@ -409,17 +409,6 @@ public override void Write(XmlWriter xmlWriter, IVerificationCaseUsage poco, str // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -970,17 +959,6 @@ public override void Write(XmlWriter xmlWriter, IVerificationCaseUsage poco, str } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -1719,17 +1697,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IVerificationCaseUsag // Reference/containment properties as child elements (sorted alphabetically) - if (writerOptions.IncludeDerivedProperties) - { - if (poco.actionDefinition != null) - { - foreach (var item in poco.actionDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "actionDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.actorParameter != null) @@ -2280,17 +2247,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IVerificationCaseUsag } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/WhileLoopActionUsageWriter.cs b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/WhileLoopActionUsageWriter.cs index fb9cbe18..12345514 100644 --- a/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/WhileLoopActionUsageWriter.cs +++ b/SysML2.NET.Serializer.Xmi/Writers/AutoGenWriters/WhileLoopActionUsageWriter.cs @@ -924,17 +924,6 @@ public override void Write(XmlWriter xmlWriter, IWhileLoopActionUsage poco, stri } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - this.XmiDataWriterFacade.WriteReferenceElement(xmlWriter, (IData)item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) @@ -2166,17 +2155,6 @@ public override async Task WriteAsync(XmlWriter xmlWriter, IWhileLoopActionUsage } } - if (writerOptions.IncludeDerivedProperties) - { - if (poco.occurrenceDefinition != null) - { - foreach (var item in poco.occurrenceDefinition) - { - await this.XmiDataWriterFacade.WriteReferenceElementAsync(xmlWriter, item, "occurrenceDefinition", elementOriginMap, currentFileUri); - } - } - } - if (writerOptions.IncludeDerivedProperties) { if (poco.output != null) diff --git a/SysML2.NET.Tests/Extend/AnalysisCaseUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/AnalysisCaseUsageExtensionsTestFixture.cs index 26b8f664..e4462ca2 100644 --- a/SysML2.NET.Tests/Extend/AnalysisCaseUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/AnalysisCaseUsageExtensionsTestFixture.cs @@ -27,6 +27,7 @@ namespace SysML2.NET.Tests.Extend using SysML2.NET.Core.POCO.Core.Features; using SysML2.NET.Core.POCO.Kernel.Functions; using SysML2.NET.Core.POCO.Systems.AnalysisCases; + using SysML2.NET.Core.POCO.Systems.Cases; using SysML2.NET.Core.POCO.Systems.DefinitionAndUsage; using SysML2.NET.Exceptions; using SysML2.NET.Extensions; @@ -37,12 +38,33 @@ public class AnalysisCaseUsageExtensionsTestFixture [Test] public void VerifyComputeAnalysisCaseDefinition() { + // Null subject: guard clause throws ArgumentNullException. Assert.That(() => ((IAnalysisCaseUsage)null).ComputeAnalysisCaseDefinition(), Throws.TypeOf()); var analysisCaseUsage = new AnalysisCaseUsage(); - // Empty case: no FeatureTyping whose Type is an IAnalysisCaseDefinition → null. - Assert.That(analysisCaseUsage.ComputeAnalysisCaseDefinition, Throws.TypeOf()); + // Empty case: no FeatureTyping owned by the subject → null. + Assert.That(analysisCaseUsage.ComputeAnalysisCaseDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a plain CaseDefinition, which is a superclass of + // IAnalysisCaseDefinition and therefore NOT an IAnalysisCaseDefinition — filtered out by + // OfType() → still null. + var caseDefinition = new CaseDefinition(); + analysisCaseUsage.AssignOwnership(new FeatureTyping { Type = caseDefinition }); + Assert.That(analysisCaseUsage.ComputeAnalysisCaseDefinition(), Is.Null); + + // Populated case: adding a FeatureTyping whose Type is an IAnalysisCaseDefinition → returned. + // The prior non-matching CaseDefinition typing must continue to be filtered out. + var analysisCaseDefinition = new AnalysisCaseDefinition(); + analysisCaseUsage.AssignOwnership(new FeatureTyping { Type = analysisCaseDefinition }); + Assert.That(analysisCaseUsage.ComputeAnalysisCaseDefinition(), Is.SameAs(analysisCaseDefinition)); + + // [0..1] upper-bound violation: two FeatureTypings each targeting an IAnalysisCaseDefinition + // → SingleOrDefaultStrict throws MultiplicityViolationException per the derived property's + // [0..1] multiplicity. + var secondAnalysisCaseDefinition = new AnalysisCaseDefinition(); + analysisCaseUsage.AssignOwnership(new FeatureTyping { Type = secondAnalysisCaseDefinition }); + Assert.That(() => analysisCaseUsage.ComputeAnalysisCaseDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET.Tests/Extend/CalculationUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/CalculationUsageExtensionsTestFixture.cs index 5e8efdb8..4b9603ec 100644 --- a/SysML2.NET.Tests/Extend/CalculationUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/CalculationUsageExtensionsTestFixture.cs @@ -28,6 +28,7 @@ namespace SysML2.NET.Tests.Extend using SysML2.NET.Core.POCO.Core.Features; using SysML2.NET.Core.POCO.Core.Types; using SysML2.NET.Core.POCO.Kernel.Functions; + using SysML2.NET.Core.POCO.Systems.Actions; using SysML2.NET.Core.POCO.Systems.Calculations; using SysML2.NET.Exceptions; using SysML2.NET.Extensions; @@ -42,10 +43,26 @@ public void VerifyComputeCalculationDefinition() { Assert.That(() => ((ICalculationUsage)null).ComputeCalculationDefinition(), Throws.TypeOf()); - var emptyCalculationUsage = new CalculationUsage(); + var calculationUsage = new CalculationUsage(); // No FeatureTyping entries → no IFunction type → null (property is [0..1]). - Assert.That(emptyCalculationUsage.ComputeCalculationDefinition, Throws.TypeOf()); + Assert.That(calculationUsage.ComputeCalculationDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets an ActionDefinition (a Behavior, NOT an + // IFunction) — filtered out → still null. + var actionDefinition = new ActionDefinition(); + calculationUsage.AssignOwnership(new FeatureTyping { Type = actionDefinition }); + Assert.That(calculationUsage.ComputeCalculationDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an IFunction (CalculationDefinition) → returned. + var calculationDefinition = new CalculationDefinition(); + calculationUsage.AssignOwnership(new FeatureTyping { Type = calculationDefinition }); + Assert.That(calculationUsage.ComputeCalculationDefinition(), Is.SameAs(calculationDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondCalculationDefinition = new CalculationDefinition(); + calculationUsage.AssignOwnership(new FeatureTyping { Type = secondCalculationDefinition }); + Assert.That(() => calculationUsage.ComputeCalculationDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET.Tests/Extend/CaseUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/CaseUsageExtensionsTestFixture.cs index 3d5f7646..221ca848 100644 --- a/SysML2.NET.Tests/Extend/CaseUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/CaseUsageExtensionsTestFixture.cs @@ -26,6 +26,7 @@ namespace SysML2.NET.Tests.Extend using SysML2.NET.Core.POCO.Core.Features; using SysML2.NET.Core.POCO.Kernel.Behaviors; + using SysML2.NET.Core.POCO.Systems.Calculations; using SysML2.NET.Core.POCO.Systems.Cases; using SysML2.NET.Core.POCO.Systems.Parts; using SysML2.NET.Core.POCO.Systems.Requirements; @@ -68,7 +69,23 @@ public void VerifyComputeCaseDefinition() var caseUsage = new CaseUsage(); // Empty case: no FeatureTyping whose Type is an ICaseDefinition → null. - Assert.That(caseUsage.ComputeCaseDefinition, Throws.TypeOf()); + Assert.That(caseUsage.ComputeCaseDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a CalculationDefinition, which is a superclass of + // ICaseDefinition and therefore NOT an ICaseDefinition — filtered out → still null. + var calculationDefinition = new CalculationDefinition(); + caseUsage.AssignOwnership(new FeatureTyping { Type = calculationDefinition }); + Assert.That(caseUsage.ComputeCaseDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an ICaseDefinition → returned. + var caseDefinition = new CaseDefinition(); + caseUsage.AssignOwnership(new FeatureTyping { Type = caseDefinition }); + Assert.That(caseUsage.ComputeCaseDefinition(), Is.SameAs(caseDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondCaseDefinition = new CaseDefinition(); + caseUsage.AssignOwnership(new FeatureTyping { Type = secondCaseDefinition }); + Assert.That(() => caseUsage.ComputeCaseDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET.Tests/Extend/ConstraintUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/ConstraintUsageExtensionsTestFixture.cs index 15a10384..3d6cdb40 100644 --- a/SysML2.NET.Tests/Extend/ConstraintUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/ConstraintUsageExtensionsTestFixture.cs @@ -26,6 +26,7 @@ namespace SysML2.NET.Tests.Extend using SysML2.NET.Core.POCO.Core.Features; using SysML2.NET.Core.POCO.Kernel.Functions; + using SysML2.NET.Core.POCO.Systems.Calculations; using SysML2.NET.Core.POCO.Systems.Constraints; using SysML2.NET.Core.POCO.Systems.Parts; using SysML2.NET.Core.POCO.Systems.Requirements; @@ -41,9 +42,25 @@ public void VerifyComputeConstraintDefinition() Assert.That(() => ((IConstraintUsage)null).ComputeConstraintDefinition(), Throws.TypeOf()); // Empty OwnedRelationship → no FeatureTyping → null. - var emptyUsage = new ConstraintUsage(); + var constraintUsage = new ConstraintUsage(); - Assert.That(emptyUsage.ComputeConstraintDefinition, Throws.TypeOf()); + Assert.That(constraintUsage.ComputeConstraintDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a CalculationDefinition (a Function, NOT an + // IPredicate) — filtered out → still null. + var calculationDefinition = new CalculationDefinition(); + constraintUsage.AssignOwnership(new FeatureTyping { Type = calculationDefinition }); + Assert.That(constraintUsage.ComputeConstraintDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an IPredicate (ConstraintDefinition) → returned. + var constraintDefinition = new ConstraintDefinition(); + constraintUsage.AssignOwnership(new FeatureTyping { Type = constraintDefinition }); + Assert.That(constraintUsage.ComputeConstraintDefinition(), Is.SameAs(constraintDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondConstraintDefinition = new ConstraintDefinition(); + constraintUsage.AssignOwnership(new FeatureTyping { Type = secondConstraintDefinition }); + Assert.That(() => constraintUsage.ComputeConstraintDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET.Tests/Extend/PartUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/PartUsageExtensionsTestFixture.cs index 11518561..899f3609 100644 --- a/SysML2.NET.Tests/Extend/PartUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/PartUsageExtensionsTestFixture.cs @@ -1,4 +1,4 @@ -// ------------------------------------------------------------------------------------------------- +// ------------------------------------------------------------------------------------------------- // // // Copyright 2022-2026 Starion Group S.A. @@ -24,7 +24,10 @@ namespace SysML2.NET.Tests.Extend using NUnit.Framework; + using SysML2.NET.Core.POCO.Core.Features; + using SysML2.NET.Core.POCO.Systems.Items; using SysML2.NET.Core.POCO.Systems.Parts; + using SysML2.NET.Extensions; [TestFixture] public class PartUsageExtensionsTestFixture @@ -32,13 +35,27 @@ public class PartUsageExtensionsTestFixture [Test] public void VerifyComputePartDefinition() { - Assert.That(() => ((IPartUsage)null).ComputePartDefinition(), - Throws.TypeOf()); + // Null subject: guard clause throws ArgumentNullException. + Assert.That(() => ((IPartUsage)null).ComputePartDefinition(), Throws.TypeOf()); - var subject = new PartUsage(); + var partUsage = new PartUsage(); - Assert.That(() => subject.ComputePartDefinition(), - Throws.TypeOf()); + // Empty case: no FeatureTyping owned by the subject → empty list. + Assert.That(partUsage.ComputePartDefinition(), Is.Empty); + + // Discrimination: FeatureTyping targets an ItemDefinition (a Structure, NOT an + // IPartDefinition) — filtered out → still empty. + var itemDefinition = new ItemDefinition(); + partUsage.AssignOwnership(new FeatureTyping { Type = itemDefinition }); + Assert.That(partUsage.ComputePartDefinition(), Is.Empty); + + // Populated case: FeatureTypings whose Types are IPartDefinition → all returned, + // the non-matching ItemDefinition typing stays filtered out. + var partDefinition = new PartDefinition(); + var secondPartDefinition = new PartDefinition(); + partUsage.AssignOwnership(new FeatureTyping { Type = partDefinition }); + partUsage.AssignOwnership(new FeatureTyping { Type = secondPartDefinition }); + Assert.That(partUsage.ComputePartDefinition(), Is.EqualTo([partDefinition, secondPartDefinition])); } } } diff --git a/SysML2.NET.Tests/Extend/RenderingUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/RenderingUsageExtensionsTestFixture.cs index b83d9472..056b5c04 100644 --- a/SysML2.NET.Tests/Extend/RenderingUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/RenderingUsageExtensionsTestFixture.cs @@ -41,7 +41,23 @@ public void VerifyComputeRenderingDefinition() var renderingUsage = new RenderingUsage(); // Empty: no OwnedRelationship → null. - Assert.That(renderingUsage.ComputeRenderingDefinition, Throws.TypeOf()); + Assert.That(renderingUsage.ComputeRenderingDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a PartDefinition, which is a superclass of + // IRenderingDefinition and therefore NOT an IRenderingDefinition — filtered out → still null. + var partDefinition = new PartDefinition(); + renderingUsage.AssignOwnership(new FeatureTyping { Type = partDefinition }); + Assert.That(renderingUsage.ComputeRenderingDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an IRenderingDefinition → returned. + var renderingDefinition = new RenderingDefinition(); + renderingUsage.AssignOwnership(new FeatureTyping { Type = renderingDefinition }); + Assert.That(renderingUsage.ComputeRenderingDefinition(), Is.SameAs(renderingDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondRenderingDefinition = new RenderingDefinition(); + renderingUsage.AssignOwnership(new FeatureTyping { Type = secondRenderingDefinition }); + Assert.That(() => renderingUsage.ComputeRenderingDefinition(), Throws.TypeOf()); } } } diff --git a/SysML2.NET.Tests/Extend/RequirementUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/RequirementUsageExtensionsTestFixture.cs index fe1a6fe6..72626c9c 100644 --- a/SysML2.NET.Tests/Extend/RequirementUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/RequirementUsageExtensionsTestFixture.cs @@ -162,7 +162,23 @@ public void VerifyComputeRequirementDefinition() var requirementUsage = new RequirementUsage(); // Empty case: no OwnedRelationship → returns null. - Assert.That(requirementUsage.ComputeRequirementDefinition, Throws.TypeOf()); + Assert.That(requirementUsage.ComputeRequirementDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a ConstraintDefinition, which is a superclass of + // IRequirementDefinition and therefore NOT an IRequirementDefinition — filtered out → still null. + var constraintDefinition = new ConstraintDefinition(); + requirementUsage.AssignOwnership(new FeatureTyping { Type = constraintDefinition }); + Assert.That(requirementUsage.ComputeRequirementDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an IRequirementDefinition → returned. + var requirementDefinition = new RequirementDefinition(); + requirementUsage.AssignOwnership(new FeatureTyping { Type = requirementDefinition }); + Assert.That(requirementUsage.ComputeRequirementDefinition(), Is.SameAs(requirementDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondRequirementDefinition = new RequirementDefinition(); + requirementUsage.AssignOwnership(new FeatureTyping { Type = secondRequirementDefinition }); + Assert.That(() => requirementUsage.ComputeRequirementDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET.Tests/Extend/VerificationCaseUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/VerificationCaseUsageExtensionsTestFixture.cs index cd3063e9..ca2d765e 100644 --- a/SysML2.NET.Tests/Extend/VerificationCaseUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/VerificationCaseUsageExtensionsTestFixture.cs @@ -43,7 +43,23 @@ public void VerifyComputeVerificationCaseDefinition() var verificationCaseUsage = new VerificationCaseUsage(); // Empty case: no FeatureTyping whose Type is an IVerificationCaseDefinition → null. - Assert.That(verificationCaseUsage.ComputeVerificationCaseDefinition, Throws.TypeOf()); + Assert.That(verificationCaseUsage.ComputeVerificationCaseDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a plain CaseDefinition, which is a superclass of + // IVerificationCaseDefinition and therefore NOT an IVerificationCaseDefinition — filtered out → still null. + var caseDefinition = new CaseDefinition(); + verificationCaseUsage.AssignOwnership(new FeatureTyping { Type = caseDefinition }); + Assert.That(verificationCaseUsage.ComputeVerificationCaseDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an IVerificationCaseDefinition → returned. + var verificationCaseDefinition = new VerificationCaseDefinition(); + verificationCaseUsage.AssignOwnership(new FeatureTyping { Type = verificationCaseDefinition }); + Assert.That(verificationCaseUsage.ComputeVerificationCaseDefinition(), Is.SameAs(verificationCaseDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondVerificationCaseDefinition = new VerificationCaseDefinition(); + verificationCaseUsage.AssignOwnership(new FeatureTyping { Type = secondVerificationCaseDefinition }); + Assert.That(() => verificationCaseUsage.ComputeVerificationCaseDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET.Tests/Extend/ViewUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/ViewUsageExtensionsTestFixture.cs index 5f0f5345..5245d61d 100644 --- a/SysML2.NET.Tests/Extend/ViewUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/ViewUsageExtensionsTestFixture.cs @@ -29,6 +29,7 @@ namespace SysML2.NET.Tests.Extend using SysML2.NET.Core.POCO.Kernel.Functions; using SysML2.NET.Core.POCO.Kernel.Packages; using SysML2.NET.Core.POCO.Root.Namespaces; + using SysML2.NET.Core.POCO.Systems.Parts; using SysML2.NET.Core.POCO.Systems.Requirements; using SysML2.NET.Core.POCO.Systems.Views; using SysML2.NET.Exceptions; @@ -177,7 +178,23 @@ public void VerifyComputeViewDefinition() var viewUsage = new ViewUsage(); // Empty: no FeatureTyping → null. - Assert.That(viewUsage.ComputeViewDefinition, Throws.TypeOf()); + Assert.That(viewUsage.ComputeViewDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a PartDefinition, which is a superclass of + // IViewDefinition and therefore NOT an IViewDefinition — filtered out → still null. + var partDefinition = new PartDefinition(); + viewUsage.AssignOwnership(new FeatureTyping { Type = partDefinition }); + Assert.That(viewUsage.ComputeViewDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an IViewDefinition → returned. + var viewDefinition = new ViewDefinition(); + viewUsage.AssignOwnership(new FeatureTyping { Type = viewDefinition }); + Assert.That(viewUsage.ComputeViewDefinition(), Is.SameAs(viewDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondViewDefinition = new ViewDefinition(); + viewUsage.AssignOwnership(new FeatureTyping { Type = secondViewDefinition }); + Assert.That(() => viewUsage.ComputeViewDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET.Tests/Extend/ViewpointUsageExtensionsTestFixture.cs b/SysML2.NET.Tests/Extend/ViewpointUsageExtensionsTestFixture.cs index e1d15626..53432efe 100644 --- a/SysML2.NET.Tests/Extend/ViewpointUsageExtensionsTestFixture.cs +++ b/SysML2.NET.Tests/Extend/ViewpointUsageExtensionsTestFixture.cs @@ -41,7 +41,23 @@ public void VerifyComputeViewpointDefinition() var viewpointUsage = new ViewpointUsage(); // Empty: no OwnedRelationship → null. - Assert.That(viewpointUsage.ComputeViewpointDefinition, Throws.TypeOf()); + Assert.That(viewpointUsage.ComputeViewpointDefinition(), Is.Null); + + // Discrimination: FeatureTyping targets a RequirementDefinition, which is a superclass of + // IViewpointDefinition and therefore NOT an IViewpointDefinition — filtered out → still null. + var requirementDefinition = new RequirementDefinition(); + viewpointUsage.AssignOwnership(new FeatureTyping { Type = requirementDefinition }); + Assert.That(viewpointUsage.ComputeViewpointDefinition(), Is.Null); + + // Populated case: FeatureTyping whose Type is an IViewpointDefinition → returned. + var viewpointDefinition = new ViewpointDefinition(); + viewpointUsage.AssignOwnership(new FeatureTyping { Type = viewpointDefinition }); + Assert.That(viewpointUsage.ComputeViewpointDefinition(), Is.SameAs(viewpointDefinition)); + + // [0..1] upper-bound violation: two matching typings → MultiplicityViolationException. + var secondViewpointDefinition = new ViewpointDefinition(); + viewpointUsage.AssignOwnership(new FeatureTyping { Type = secondViewpointDefinition }); + Assert.That(() => viewpointUsage.ComputeViewpointDefinition(), Throws.TypeOf()); } [Test] diff --git a/SysML2.NET/Core/AutoGenDto/AcceptActionUsage.cs b/SysML2.NET/Core/AutoGenDto/AcceptActionUsage.cs index 2dd09a10..4d6d3bb0 100644 --- a/SysML2.NET/Core/AutoGenDto/AcceptActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/AcceptActionUsage.cs @@ -57,6 +57,7 @@ public partial class AcceptActionUsage : IAcceptActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -124,7 +125,7 @@ public partial class AcceptActionUsage : IAcceptActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -153,6 +154,7 @@ public partial class AcceptActionUsage : IAcceptActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -660,6 +662,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -702,8 +705,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -943,6 +947,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1020,6 +1025,7 @@ bool Core.Features.IFeature.IsVariable /// base AcceptActionUsage AcceptAction from the Systems Model Library. /// [Property(xmiId: "_19_0_4_12e503d9_1642701018287_478584_4462", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591477541360_47573_933")] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] [Implements(implementation: "IAcceptActionUsage.PayloadParameter")] public Guid payloadParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ActionDefinition.cs b/SysML2.NET/Core/AutoGenDto/ActionDefinition.cs index 0188795f..cd3bf6e8 100644 --- a/SysML2.NET/Core/AutoGenDto/ActionDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ActionDefinition.cs @@ -53,6 +53,7 @@ public partial class ActionDefinition : IActionDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -107,6 +108,7 @@ public partial class ActionDefinition : IActionDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -634,6 +636,7 @@ public partial class ActionDefinition : IActionDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/ActionUsage.cs b/SysML2.NET/Core/AutoGenDto/ActionUsage.cs index 83c91af9..06b7b645 100644 --- a/SysML2.NET/Core/AutoGenDto/ActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ActionUsage.cs @@ -58,6 +58,7 @@ public partial class ActionUsage : IActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -125,7 +126,7 @@ public partial class ActionUsage : IActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -154,6 +155,7 @@ public partial class ActionUsage : IActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -661,6 +663,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -703,8 +706,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -944,6 +948,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/AllocationDefinition.cs b/SysML2.NET/Core/AutoGenDto/AllocationDefinition.cs index 625da96a..9fc1b08e 100644 --- a/SysML2.NET/Core/AutoGenDto/AllocationDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/AllocationDefinition.cs @@ -127,6 +127,7 @@ public partial class AllocationDefinition : IAllocationDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -687,6 +688,7 @@ bool Core.Types.IType.IsSufficient /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/AllocationUsage.cs b/SysML2.NET/Core/AutoGenDto/AllocationUsage.cs index baecbc74..91083637 100644 --- a/SysML2.NET/Core/AutoGenDto/AllocationUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/AllocationUsage.cs @@ -179,6 +179,7 @@ public partial class AllocationUsage : IAllocationUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -705,6 +706,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -996,6 +998,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/AnalysisCaseDefinition.cs b/SysML2.NET/Core/AutoGenDto/AnalysisCaseDefinition.cs index 5db5982c..1f75c2fa 100644 --- a/SysML2.NET/Core/AutoGenDto/AnalysisCaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/AnalysisCaseDefinition.cs @@ -51,6 +51,7 @@ public partial class AnalysisCaseDefinition : IAnalysisCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -59,6 +60,7 @@ public partial class AnalysisCaseDefinition : IAnalysisCaseDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -73,6 +75,7 @@ public partial class AnalysisCaseDefinition : IAnalysisCaseDefinition /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation { get; internal set; } = []; @@ -121,6 +124,7 @@ public partial class AnalysisCaseDefinition : IAnalysisCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -675,6 +679,7 @@ public partial class AnalysisCaseDefinition : IAnalysisCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; @@ -807,6 +812,7 @@ public partial class AnalysisCaseDefinition : IAnalysisCaseDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/AnalysisCaseUsage.cs b/SysML2.NET/Core/AutoGenDto/AnalysisCaseUsage.cs index b3001af5..d073bb4a 100644 --- a/SysML2.NET/Core/AutoGenDto/AnalysisCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/AnalysisCaseUsage.cs @@ -54,14 +54,17 @@ public partial class AnalysisCaseUsage : IAnalysisCaseUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.HasValue ? [((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.Value] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -96,6 +99,7 @@ public partial class AnalysisCaseUsage : IAnalysisCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] Guid? Systems.Calculations.ICalculationUsage.calculationDefinition => ((SysML2.NET.Core.DTO.Systems.Cases.ICaseUsage)this).caseDefinition.HasValue ? ((SysML2.NET.Core.DTO.Systems.Cases.ICaseUsage)this).caseDefinition.Value : Guid.Empty; @@ -157,7 +161,7 @@ public partial class AnalysisCaseUsage : IAnalysisCaseUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -186,6 +190,7 @@ public partial class AnalysisCaseUsage : IAnalysisCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -710,6 +715,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -760,8 +766,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1001,6 +1008,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1121,6 +1129,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/AssertConstraintUsage.cs b/SysML2.NET/Core/AutoGenDto/AssertConstraintUsage.cs index 88b144b2..84ea17ca 100644 --- a/SysML2.NET/Core/AutoGenDto/AssertConstraintUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/AssertConstraintUsage.cs @@ -161,6 +161,7 @@ public partial class AssertConstraintUsage : IAssertConstraintUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -692,6 +693,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -975,6 +977,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/AssignmentActionUsage.cs b/SysML2.NET/Core/AutoGenDto/AssignmentActionUsage.cs index 850988eb..4fe6df87 100644 --- a/SysML2.NET/Core/AutoGenDto/AssignmentActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/AssignmentActionUsage.cs @@ -56,6 +56,7 @@ public partial class AssignmentActionUsage : IAssignmentActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -123,7 +124,7 @@ public partial class AssignmentActionUsage : IAssignmentActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -152,6 +153,7 @@ public partial class AssignmentActionUsage : IAssignmentActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -659,6 +661,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -701,8 +704,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -942,6 +946,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/AttributeDefinition.cs b/SysML2.NET/Core/AutoGenDto/AttributeDefinition.cs index 5656496b..a9bc71bf 100644 --- a/SysML2.NET/Core/AutoGenDto/AttributeDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/AttributeDefinition.cs @@ -100,6 +100,7 @@ public partial class AttributeDefinition : IAttributeDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -620,6 +621,7 @@ public partial class AttributeDefinition : IAttributeDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/AttributeUsage.cs b/SysML2.NET/Core/AutoGenDto/AttributeUsage.cs index 8d9265af..2e032093 100644 --- a/SysML2.NET/Core/AutoGenDto/AttributeUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/AttributeUsage.cs @@ -144,6 +144,7 @@ public partial class AttributeUsage : IAttributeUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -644,6 +645,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -917,6 +919,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/BindingConnectorAsUsage.cs b/SysML2.NET/Core/AutoGenDto/BindingConnectorAsUsage.cs index ab9bad54..e6e876a5 100644 --- a/SysML2.NET/Core/AutoGenDto/BindingConnectorAsUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/BindingConnectorAsUsage.cs @@ -155,6 +155,7 @@ public partial class BindingConnectorAsUsage : IBindingConnectorAsUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -655,6 +656,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -936,6 +938,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/CalculationDefinition.cs b/SysML2.NET/Core/AutoGenDto/CalculationDefinition.cs index 84aa9b36..f69c0fa5 100644 --- a/SysML2.NET/Core/AutoGenDto/CalculationDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/CalculationDefinition.cs @@ -53,6 +53,7 @@ public partial class CalculationDefinition : ICalculationDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -67,6 +68,7 @@ public partial class CalculationDefinition : ICalculationDefinition /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation { get; internal set; } = []; @@ -115,6 +117,7 @@ public partial class CalculationDefinition : ICalculationDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -661,6 +664,7 @@ public partial class CalculationDefinition : ICalculationDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/CalculationUsage.cs b/SysML2.NET/Core/AutoGenDto/CalculationUsage.cs index b5a3d34f..fcfe68f9 100644 --- a/SysML2.NET/Core/AutoGenDto/CalculationUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/CalculationUsage.cs @@ -58,8 +58,10 @@ public partial class CalculationUsage : ICalculationUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => this.calculationDefinition.HasValue ? [this.calculationDefinition.Value] : []; /// /// Various alternative identifiers for this Element. Generally, these will be set by tools. @@ -84,6 +86,7 @@ public partial class CalculationUsage : ICalculationUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] public Guid? calculationDefinition { get; internal set; } @@ -135,7 +138,7 @@ public partial class CalculationUsage : ICalculationUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -164,6 +167,7 @@ public partial class CalculationUsage : ICalculationUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -688,6 +692,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -730,8 +735,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -971,6 +977,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/CaseDefinition.cs b/SysML2.NET/Core/AutoGenDto/CaseDefinition.cs index f5205276..2b38eedc 100644 --- a/SysML2.NET/Core/AutoGenDto/CaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/CaseDefinition.cs @@ -53,6 +53,7 @@ public partial class CaseDefinition : ICaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -61,6 +62,7 @@ public partial class CaseDefinition : ICaseDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -75,6 +77,7 @@ public partial class CaseDefinition : ICaseDefinition /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation { get; internal set; } = []; @@ -123,6 +126,7 @@ public partial class CaseDefinition : ICaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -677,6 +681,7 @@ public partial class CaseDefinition : ICaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; @@ -799,6 +804,7 @@ public partial class CaseDefinition : ICaseDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/CaseUsage.cs b/SysML2.NET/Core/AutoGenDto/CaseUsage.cs index 556c8601..c822d3ba 100644 --- a/SysML2.NET/Core/AutoGenDto/CaseUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/CaseUsage.cs @@ -54,14 +54,17 @@ public partial class CaseUsage : ICaseUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.HasValue ? [((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.Value] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -88,6 +91,7 @@ public partial class CaseUsage : ICaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] Guid? Systems.Calculations.ICalculationUsage.calculationDefinition => this.caseDefinition.HasValue ? this.caseDefinition.Value : Guid.Empty; @@ -148,7 +152,7 @@ public partial class CaseUsage : ICaseUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -177,6 +181,7 @@ public partial class CaseUsage : ICaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -701,6 +706,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -751,8 +757,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -992,6 +999,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1103,6 +1111,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ConcernDefinition.cs b/SysML2.NET/Core/AutoGenDto/ConcernDefinition.cs index f4f5e0e5..ecf6a845 100644 --- a/SysML2.NET/Core/AutoGenDto/ConcernDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ConcernDefinition.cs @@ -51,6 +51,7 @@ public partial class ConcernDefinition : IConcernDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -123,6 +124,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -678,6 +680,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; @@ -812,6 +815,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -828,6 +832,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ConcernUsage.cs b/SysML2.NET/Core/AutoGenDto/ConcernUsage.cs index cf8eef84..020ffb01 100644 --- a/SysML2.NET/Core/AutoGenDto/ConcernUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ConcernUsage.cs @@ -54,6 +54,7 @@ public partial class ConcernUsage : IConcernUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -187,6 +188,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -720,6 +722,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -1003,6 +1006,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1152,6 +1156,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -1160,6 +1165,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ConjugatedPortDefinition.cs b/SysML2.NET/Core/AutoGenDto/ConjugatedPortDefinition.cs index ec91386f..0681d9e3 100644 --- a/SysML2.NET/Core/AutoGenDto/ConjugatedPortDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ConjugatedPortDefinition.cs @@ -108,6 +108,7 @@ public partial class ConjugatedPortDefinition : IConjugatedPortDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -654,6 +655,7 @@ public partial class ConjugatedPortDefinition : IConjugatedPortDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/ConnectionDefinition.cs b/SysML2.NET/Core/AutoGenDto/ConnectionDefinition.cs index c53dae85..acf7fe36 100644 --- a/SysML2.NET/Core/AutoGenDto/ConnectionDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ConnectionDefinition.cs @@ -116,6 +116,7 @@ public partial class ConnectionDefinition : IConnectionDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -676,6 +677,7 @@ bool Core.Types.IType.IsSufficient /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/ConnectionUsage.cs b/SysML2.NET/Core/AutoGenDto/ConnectionUsage.cs index 2e2aa774..96b20fbb 100644 --- a/SysML2.NET/Core/AutoGenDto/ConnectionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ConnectionUsage.cs @@ -172,6 +172,7 @@ public partial class ConnectionUsage : IConnectionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -698,6 +699,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -989,6 +991,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ConstraintDefinition.cs b/SysML2.NET/Core/AutoGenDto/ConstraintDefinition.cs index fe9176fc..8b1ef6d1 100644 --- a/SysML2.NET/Core/AutoGenDto/ConstraintDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ConstraintDefinition.cs @@ -98,6 +98,7 @@ public partial class ConstraintDefinition : IConstraintDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -644,6 +645,7 @@ public partial class ConstraintDefinition : IConstraintDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/ConstraintUsage.cs b/SysML2.NET/Core/AutoGenDto/ConstraintUsage.cs index 9a4dd501..e04da028 100644 --- a/SysML2.NET/Core/AutoGenDto/ConstraintUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ConstraintUsage.cs @@ -154,6 +154,7 @@ public partial class ConstraintUsage : IConstraintUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -678,6 +679,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -961,6 +963,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/DecisionNode.cs b/SysML2.NET/Core/AutoGenDto/DecisionNode.cs index 50c44837..20ae93b2 100644 --- a/SysML2.NET/Core/AutoGenDto/DecisionNode.cs +++ b/SysML2.NET/Core/AutoGenDto/DecisionNode.cs @@ -53,6 +53,7 @@ public partial class DecisionNode : IDecisionNode /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -120,7 +121,7 @@ public partial class DecisionNode : IDecisionNode [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -149,6 +150,7 @@ public partial class DecisionNode : IDecisionNode /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -656,6 +658,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -698,8 +701,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -939,6 +943,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/Definition.cs b/SysML2.NET/Core/AutoGenDto/Definition.cs index 2e50b2a9..ccc9a7c1 100644 --- a/SysML2.NET/Core/AutoGenDto/Definition.cs +++ b/SysML2.NET/Core/AutoGenDto/Definition.cs @@ -104,6 +104,7 @@ public partial class Definition : IDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -624,6 +625,7 @@ public partial class Definition : IDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/EnumerationDefinition.cs b/SysML2.NET/Core/AutoGenDto/EnumerationDefinition.cs index 56fdcfc6..5c112ed5 100644 --- a/SysML2.NET/Core/AutoGenDto/EnumerationDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/EnumerationDefinition.cs @@ -97,6 +97,7 @@ public partial class EnumerationDefinition : IEnumerationDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -643,6 +644,7 @@ bool Systems.DefinitionAndUsage.IDefinition.IsVariation /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/EnumerationUsage.cs b/SysML2.NET/Core/AutoGenDto/EnumerationUsage.cs index e86442cb..461887a1 100644 --- a/SysML2.NET/Core/AutoGenDto/EnumerationUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/EnumerationUsage.cs @@ -140,6 +140,7 @@ public partial class EnumerationUsage : IEnumerationUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -648,6 +649,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -921,6 +923,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/EventOccurrenceUsage.cs b/SysML2.NET/Core/AutoGenDto/EventOccurrenceUsage.cs index fb360a4c..dfd7e0e0 100644 --- a/SysML2.NET/Core/AutoGenDto/EventOccurrenceUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/EventOccurrenceUsage.cs @@ -134,6 +134,7 @@ public partial class EventOccurrenceUsage : IEventOccurrenceUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -659,6 +660,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -942,6 +944,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ExhibitStateUsage.cs b/SysML2.NET/Core/AutoGenDto/ExhibitStateUsage.cs index 5c277741..1cbe61f7 100644 --- a/SysML2.NET/Core/AutoGenDto/ExhibitStateUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ExhibitStateUsage.cs @@ -57,6 +57,7 @@ public partial class ExhibitStateUsage : IExhibitStateUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [RedefinedByProperty("IStateUsage.StateDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] List Systems.Actions.IActionUsage.actionDefinition => [.. this.stateDefinition]; @@ -125,7 +126,7 @@ public partial class ExhibitStateUsage : IExhibitStateUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -154,6 +155,7 @@ public partial class ExhibitStateUsage : IExhibitStateUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -725,6 +727,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -767,8 +770,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1008,6 +1012,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/FlowDefinition.cs b/SysML2.NET/Core/AutoGenDto/FlowDefinition.cs index 4a45cdc7..f0f70da4 100644 --- a/SysML2.NET/Core/AutoGenDto/FlowDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/FlowDefinition.cs @@ -53,6 +53,7 @@ public partial class FlowDefinition : IFlowDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -118,6 +119,7 @@ public partial class FlowDefinition : IFlowDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -670,6 +672,7 @@ public partial class FlowDefinition : IFlowDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/FlowUsage.cs b/SysML2.NET/Core/AutoGenDto/FlowUsage.cs index a6b28fe0..b74f9f83 100644 --- a/SysML2.NET/Core/AutoGenDto/FlowUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/FlowUsage.cs @@ -56,8 +56,10 @@ public partial class FlowUsage : IFlowUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("IFlowUsage.FlowDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => [.. this.flowDefinition]; /// /// Various alternative identifiers for this Element. Generally, these will be set by tools. @@ -151,7 +153,7 @@ public partial class FlowUsage : IFlowUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -180,6 +182,7 @@ public partial class FlowUsage : IFlowUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -267,6 +270,7 @@ public partial class FlowUsage : IFlowUsage /// Model Libraries. /// [Property(xmiId: "_19_0_4_12e503d9_1661892878973_977062_185", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1661900477937_518125_727")] [Implements(implementation: "IFlowUsage.FlowDefinition")] public List flowDefinition { get; internal set; } = []; @@ -725,6 +729,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -767,8 +772,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1016,6 +1022,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ForLoopActionUsage.cs b/SysML2.NET/Core/AutoGenDto/ForLoopActionUsage.cs index ed6a81de..7b488246 100644 --- a/SysML2.NET/Core/AutoGenDto/ForLoopActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ForLoopActionUsage.cs @@ -55,6 +55,7 @@ public partial class ForLoopActionUsage : IForLoopActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -130,7 +131,7 @@ public partial class ForLoopActionUsage : IForLoopActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -159,6 +160,7 @@ public partial class ForLoopActionUsage : IForLoopActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -675,6 +677,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -717,8 +720,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -958,6 +962,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ForkNode.cs b/SysML2.NET/Core/AutoGenDto/ForkNode.cs index 05f15ea1..27274f9f 100644 --- a/SysML2.NET/Core/AutoGenDto/ForkNode.cs +++ b/SysML2.NET/Core/AutoGenDto/ForkNode.cs @@ -54,6 +54,7 @@ public partial class ForkNode : IForkNode /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -121,7 +122,7 @@ public partial class ForkNode : IForkNode [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -150,6 +151,7 @@ public partial class ForkNode : IForkNode /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -657,6 +659,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -699,8 +702,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -940,6 +944,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/IAcceptActionUsage.cs b/SysML2.NET/Core/AutoGenDto/IAcceptActionUsage.cs index 10cb5fdb..41866f1c 100644 --- a/SysML2.NET/Core/AutoGenDto/IAcceptActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IAcceptActionUsage.cs @@ -55,6 +55,7 @@ public partial interface IAcceptActionUsage : IActionUsage /// base AcceptActionUsage AcceptAction from the Systems Model Library. /// [Property(xmiId: "_19_0_4_12e503d9_1642701018287_478584_4462", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591477541360_47573_933")] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] Guid payloadParameter { get; } diff --git a/SysML2.NET/Core/AutoGenDto/IActionDefinition.cs b/SysML2.NET/Core/AutoGenDto/IActionDefinition.cs index 2563207d..e4b141d3 100644 --- a/SysML2.NET/Core/AutoGenDto/IActionDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/IActionDefinition.cs @@ -46,6 +46,7 @@ public partial interface IActionDefinition : IBehavior, IOccurrenceDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List action { get; } } diff --git a/SysML2.NET/Core/AutoGenDto/IActionUsage.cs b/SysML2.NET/Core/AutoGenDto/IActionUsage.cs index 167e7085..7449dcc7 100644 --- a/SysML2.NET/Core/AutoGenDto/IActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IActionUsage.cs @@ -51,6 +51,7 @@ public partial interface IActionUsage : IStep, IOccurrenceUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] List actionDefinition { get; } } diff --git a/SysML2.NET/Core/AutoGenDto/ICalculationDefinition.cs b/SysML2.NET/Core/AutoGenDto/ICalculationDefinition.cs index 5af59673..dd44b3f7 100644 --- a/SysML2.NET/Core/AutoGenDto/ICalculationDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ICalculationDefinition.cs @@ -44,6 +44,7 @@ public partial interface ICalculationDefinition : IFunction, IActionDefinition /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] List calculation { get; } diff --git a/SysML2.NET/Core/AutoGenDto/ICalculationUsage.cs b/SysML2.NET/Core/AutoGenDto/ICalculationUsage.cs index 087260a4..64792907 100644 --- a/SysML2.NET/Core/AutoGenDto/ICalculationUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ICalculationUsage.cs @@ -51,6 +51,7 @@ public partial interface ICalculationUsage : IExpression, IActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] Guid? calculationDefinition { get; } } diff --git a/SysML2.NET/Core/AutoGenDto/ICaseDefinition.cs b/SysML2.NET/Core/AutoGenDto/ICaseDefinition.cs index 0885b9a7..44a7c513 100644 --- a/SysML2.NET/Core/AutoGenDto/ICaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ICaseDefinition.cs @@ -45,6 +45,7 @@ public partial interface ICaseDefinition : ICalculationDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List actorParameter { get; } /// @@ -59,6 +60,7 @@ public partial interface ICaseDefinition : ICalculationDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] Guid subjectParameter { get; } } diff --git a/SysML2.NET/Core/AutoGenDto/ICaseUsage.cs b/SysML2.NET/Core/AutoGenDto/ICaseUsage.cs index 390a7b51..74e5193c 100644 --- a/SysML2.NET/Core/AutoGenDto/ICaseUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ICaseUsage.cs @@ -45,6 +45,7 @@ public partial interface ICaseUsage : ICalculationUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List actorParameter { get; } /// @@ -66,6 +67,7 @@ public partial interface ICaseUsage : ICalculationUsage /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] Guid subjectParameter { get; } } diff --git a/SysML2.NET/Core/AutoGenDto/IDefinition.cs b/SysML2.NET/Core/AutoGenDto/IDefinition.cs index ff92dbd0..ae2709ef 100644 --- a/SysML2.NET/Core/AutoGenDto/IDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/IDefinition.cs @@ -52,6 +52,7 @@ public partial interface IDefinition : IClassifier /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List directedUsage { get; } /// @@ -222,6 +223,7 @@ public partial interface IDefinition : IClassifier /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List ownedUsage { get; } /// diff --git a/SysML2.NET/Core/AutoGenDto/IFlowUsage.cs b/SysML2.NET/Core/AutoGenDto/IFlowUsage.cs index 9a3ead4d..19eefd90 100644 --- a/SysML2.NET/Core/AutoGenDto/IFlowUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IFlowUsage.cs @@ -48,6 +48,7 @@ public partial interface IFlowUsage : IConnectorAsUsage, IFlow, IActionUsage /// Model Libraries. /// [Property(xmiId: "_19_0_4_12e503d9_1661892878973_977062_185", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1661900477937_518125_727")] List flowDefinition { get; } diff --git a/SysML2.NET/Core/AutoGenDto/IMetadataUsage.cs b/SysML2.NET/Core/AutoGenDto/IMetadataUsage.cs index 39a94555..177bca04 100644 --- a/SysML2.NET/Core/AutoGenDto/IMetadataUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IMetadataUsage.cs @@ -48,6 +48,7 @@ public partial interface IMetadataUsage : IItemUsage, IMetadataFeature /// The MetadataDefinition that is the definition of this MetadataUsage. /// [Property(xmiId: "_19_0_4_12e503d9_1647727047674_847094_2563", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565471361757_649736_20796")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1606345564958_925589_327")] Guid? metadataDefinition { get; } diff --git a/SysML2.NET/Core/AutoGenDto/IRequirementDefinition.cs b/SysML2.NET/Core/AutoGenDto/IRequirementDefinition.cs index 4faec383..4f37a412 100644 --- a/SysML2.NET/Core/AutoGenDto/IRequirementDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/IRequirementDefinition.cs @@ -45,6 +45,7 @@ public partial interface IRequirementDefinition : IConstraintDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List actorParameter { get; } /// @@ -87,6 +88,7 @@ public partial interface IRequirementDefinition : IConstraintDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List stakeholderParameter { get; } /// @@ -94,6 +96,7 @@ public partial interface IRequirementDefinition : IConstraintDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] Guid subjectParameter { get; } /// diff --git a/SysML2.NET/Core/AutoGenDto/IRequirementUsage.cs b/SysML2.NET/Core/AutoGenDto/IRequirementUsage.cs index 678f1a14..e2c8cf41 100644 --- a/SysML2.NET/Core/AutoGenDto/IRequirementUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IRequirementUsage.cs @@ -45,6 +45,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List actorParameter { get; } /// @@ -94,6 +95,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List stakeholderParameter { get; } /// @@ -101,6 +103,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] Guid subjectParameter { get; } /// diff --git a/SysML2.NET/Core/AutoGenDto/IUsage.cs b/SysML2.NET/Core/AutoGenDto/IUsage.cs index a80c2144..3531a388 100644 --- a/SysML2.NET/Core/AutoGenDto/IUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IUsage.cs @@ -59,6 +59,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List directedUsage { get; } /// @@ -247,6 +248,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List nestedUsage { get; } /// @@ -282,6 +284,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] Guid? owningDefinition { get; } /// diff --git a/SysML2.NET/Core/AutoGenDto/IfActionUsage.cs b/SysML2.NET/Core/AutoGenDto/IfActionUsage.cs index c049313d..a9a9e672 100644 --- a/SysML2.NET/Core/AutoGenDto/IfActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IfActionUsage.cs @@ -55,6 +55,7 @@ public partial class IfActionUsage : IIfActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -122,7 +123,7 @@ public partial class IfActionUsage : IIfActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -151,6 +152,7 @@ public partial class IfActionUsage : IIfActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -674,6 +676,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -716,8 +719,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -957,6 +961,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/IncludeUseCaseUsage.cs b/SysML2.NET/Core/AutoGenDto/IncludeUseCaseUsage.cs index 8b121d4c..f8a586e8 100644 --- a/SysML2.NET/Core/AutoGenDto/IncludeUseCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/IncludeUseCaseUsage.cs @@ -57,14 +57,17 @@ public partial class IncludeUseCaseUsage : IIncludeUseCaseUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.HasValue ? [((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.Value] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -91,6 +94,7 @@ public partial class IncludeUseCaseUsage : IIncludeUseCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] Guid? Systems.Calculations.ICalculationUsage.calculationDefinition => ((SysML2.NET.Core.DTO.Systems.Cases.ICaseUsage)this).caseDefinition.HasValue ? ((SysML2.NET.Core.DTO.Systems.Cases.ICaseUsage)this).caseDefinition.Value : Guid.Empty; @@ -152,7 +156,7 @@ public partial class IncludeUseCaseUsage : IIncludeUseCaseUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -181,6 +185,7 @@ public partial class IncludeUseCaseUsage : IIncludeUseCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -732,6 +737,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -782,8 +788,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1023,6 +1030,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1144,6 +1152,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/InterfaceDefinition.cs b/SysML2.NET/Core/AutoGenDto/InterfaceDefinition.cs index 2529c346..16b38a82 100644 --- a/SysML2.NET/Core/AutoGenDto/InterfaceDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/InterfaceDefinition.cs @@ -116,6 +116,7 @@ public partial class InterfaceDefinition : IInterfaceDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -684,6 +685,7 @@ bool Core.Types.IType.IsSufficient /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/InterfaceUsage.cs b/SysML2.NET/Core/AutoGenDto/InterfaceUsage.cs index ea30ccc0..cbe1c7ee 100644 --- a/SysML2.NET/Core/AutoGenDto/InterfaceUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/InterfaceUsage.cs @@ -171,6 +171,7 @@ public partial class InterfaceUsage : IInterfaceUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -705,6 +706,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -996,6 +998,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ItemDefinition.cs b/SysML2.NET/Core/AutoGenDto/ItemDefinition.cs index c861b2a0..5a7e9f88 100644 --- a/SysML2.NET/Core/AutoGenDto/ItemDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ItemDefinition.cs @@ -99,6 +99,7 @@ public partial class ItemDefinition : IItemDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -626,6 +627,7 @@ public partial class ItemDefinition : IItemDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/ItemUsage.cs b/SysML2.NET/Core/AutoGenDto/ItemUsage.cs index 7e86aa46..b6584761 100644 --- a/SysML2.NET/Core/AutoGenDto/ItemUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ItemUsage.cs @@ -133,6 +133,7 @@ public partial class ItemUsage : IItemUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -650,6 +651,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -933,6 +935,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/JoinNode.cs b/SysML2.NET/Core/AutoGenDto/JoinNode.cs index db2c0059..46461a0e 100644 --- a/SysML2.NET/Core/AutoGenDto/JoinNode.cs +++ b/SysML2.NET/Core/AutoGenDto/JoinNode.cs @@ -54,6 +54,7 @@ public partial class JoinNode : IJoinNode /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -121,7 +122,7 @@ public partial class JoinNode : IJoinNode [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -150,6 +151,7 @@ public partial class JoinNode : IJoinNode /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -657,6 +659,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -699,8 +702,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -940,6 +944,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/MergeNode.cs b/SysML2.NET/Core/AutoGenDto/MergeNode.cs index b0e35d74..6e8e7eeb 100644 --- a/SysML2.NET/Core/AutoGenDto/MergeNode.cs +++ b/SysML2.NET/Core/AutoGenDto/MergeNode.cs @@ -54,6 +54,7 @@ public partial class MergeNode : IMergeNode /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -121,7 +122,7 @@ public partial class MergeNode : IMergeNode [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -150,6 +151,7 @@ public partial class MergeNode : IMergeNode /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -657,6 +659,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -699,8 +702,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -940,6 +944,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/MetadataDefinition.cs b/SysML2.NET/Core/AutoGenDto/MetadataDefinition.cs index 026c8615..62ca4fca 100644 --- a/SysML2.NET/Core/AutoGenDto/MetadataDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/MetadataDefinition.cs @@ -96,6 +96,7 @@ public partial class MetadataDefinition : IMetadataDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -623,6 +624,7 @@ public partial class MetadataDefinition : IMetadataDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/MetadataUsage.cs b/SysML2.NET/Core/AutoGenDto/MetadataUsage.cs index a27e4ef4..e2fa15c9 100644 --- a/SysML2.NET/Core/AutoGenDto/MetadataUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/MetadataUsage.cs @@ -152,6 +152,7 @@ public partial class MetadataUsage : IMetadataUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -434,8 +435,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565471361757_649736_20796", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("IMetadataUsage.MetadataDefinition")] [Implements(implementation: "IItemUsage.ItemDefinition")] - public List itemDefinition { get; internal set; } = []; + List Systems.Items.IItemUsage.itemDefinition => this.metadataDefinition.HasValue ? [this.metadataDefinition.Value] : []; /// /// Whether this Usage may be time varying (that is, whether it is featured by the snapshots of its @@ -479,6 +481,7 @@ bool Core.Features.IFeature.IsVariable /// The MetadataDefinition that is the definition of this MetadataUsage. /// [Property(xmiId: "_19_0_4_12e503d9_1647727047674_847094_2563", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565471361757_649736_20796")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1606345564958_925589_327")] [Implements(implementation: "IMetadataUsage.MetadataDefinition")] public Guid? metadataDefinition { get; internal set; } @@ -686,6 +689,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -988,6 +992,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/OccurrenceDefinition.cs b/SysML2.NET/Core/AutoGenDto/OccurrenceDefinition.cs index e46ecfeb..1d5b4c82 100644 --- a/SysML2.NET/Core/AutoGenDto/OccurrenceDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/OccurrenceDefinition.cs @@ -99,6 +99,7 @@ public partial class OccurrenceDefinition : IOccurrenceDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -626,6 +627,7 @@ public partial class OccurrenceDefinition : IOccurrenceDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/OccurrenceUsage.cs b/SysML2.NET/Core/AutoGenDto/OccurrenceUsage.cs index 0c5904f2..f0fae972 100644 --- a/SysML2.NET/Core/AutoGenDto/OccurrenceUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/OccurrenceUsage.cs @@ -133,6 +133,7 @@ public partial class OccurrenceUsage : IOccurrenceUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -640,6 +641,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -923,6 +925,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/PartDefinition.cs b/SysML2.NET/Core/AutoGenDto/PartDefinition.cs index 467a200b..b2a9a4e6 100644 --- a/SysML2.NET/Core/AutoGenDto/PartDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/PartDefinition.cs @@ -97,6 +97,7 @@ public partial class PartDefinition : IPartDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -624,6 +625,7 @@ public partial class PartDefinition : IPartDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/PartUsage.cs b/SysML2.NET/Core/AutoGenDto/PartUsage.cs index 37d79cf4..9ec8a561 100644 --- a/SysML2.NET/Core/AutoGenDto/PartUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/PartUsage.cs @@ -132,6 +132,7 @@ public partial class PartUsage : IPartUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -649,6 +650,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -932,6 +934,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/PerformActionUsage.cs b/SysML2.NET/Core/AutoGenDto/PerformActionUsage.cs index 579bda74..8af196dc 100644 --- a/SysML2.NET/Core/AutoGenDto/PerformActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/PerformActionUsage.cs @@ -57,6 +57,7 @@ public partial class PerformActionUsage : IPerformActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -124,7 +125,7 @@ public partial class PerformActionUsage : IPerformActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -153,6 +154,7 @@ public partial class PerformActionUsage : IPerformActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -679,6 +681,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -721,8 +724,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -962,6 +966,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/PortDefinition.cs b/SysML2.NET/Core/AutoGenDto/PortDefinition.cs index 18444f5f..2e4d1e39 100644 --- a/SysML2.NET/Core/AutoGenDto/PortDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/PortDefinition.cs @@ -106,6 +106,7 @@ public partial class PortDefinition : IPortDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -633,6 +634,7 @@ public partial class PortDefinition : IPortDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/PortUsage.cs b/SysML2.NET/Core/AutoGenDto/PortUsage.cs index 305efa74..0317760f 100644 --- a/SysML2.NET/Core/AutoGenDto/PortUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/PortUsage.cs @@ -131,6 +131,7 @@ public partial class PortUsage : IPortUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -638,6 +639,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -922,6 +924,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ReferenceUsage.cs b/SysML2.NET/Core/AutoGenDto/ReferenceUsage.cs index ed50e29c..11d2b6a4 100644 --- a/SysML2.NET/Core/AutoGenDto/ReferenceUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ReferenceUsage.cs @@ -131,6 +131,7 @@ public partial class ReferenceUsage : IReferenceUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -631,6 +632,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -904,6 +906,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/RenderingDefinition.cs b/SysML2.NET/Core/AutoGenDto/RenderingDefinition.cs index 220aaf08..1dd858c0 100644 --- a/SysML2.NET/Core/AutoGenDto/RenderingDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/RenderingDefinition.cs @@ -96,6 +96,7 @@ public partial class RenderingDefinition : IRenderingDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -623,6 +624,7 @@ public partial class RenderingDefinition : IRenderingDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/RenderingUsage.cs b/SysML2.NET/Core/AutoGenDto/RenderingUsage.cs index f644d4d2..282756dd 100644 --- a/SysML2.NET/Core/AutoGenDto/RenderingUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/RenderingUsage.cs @@ -131,6 +131,7 @@ public partial class RenderingUsage : IRenderingUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -648,6 +649,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -931,6 +933,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/RequirementDefinition.cs b/SysML2.NET/Core/AutoGenDto/RequirementDefinition.cs index 0937413b..ffc123cd 100644 --- a/SysML2.NET/Core/AutoGenDto/RequirementDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/RequirementDefinition.cs @@ -52,6 +52,7 @@ public partial class RequirementDefinition : IRequirementDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -124,6 +125,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -679,6 +681,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; @@ -813,6 +816,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -829,6 +833,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/RequirementUsage.cs b/SysML2.NET/Core/AutoGenDto/RequirementUsage.cs index 00677d4a..e0f45d6f 100644 --- a/SysML2.NET/Core/AutoGenDto/RequirementUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/RequirementUsage.cs @@ -52,6 +52,7 @@ public partial class RequirementUsage : IRequirementUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -177,6 +178,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -710,6 +712,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -993,6 +996,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1141,6 +1145,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -1149,6 +1154,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/SatisfyRequirementUsage.cs b/SysML2.NET/Core/AutoGenDto/SatisfyRequirementUsage.cs index 5ab50b5c..6c8e523b 100644 --- a/SysML2.NET/Core/AutoGenDto/SatisfyRequirementUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/SatisfyRequirementUsage.cs @@ -55,6 +55,7 @@ public partial class SatisfyRequirementUsage : ISatisfyRequirementUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -190,6 +191,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -730,6 +732,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -1013,6 +1016,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1179,6 +1183,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -1187,6 +1192,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/SendActionUsage.cs b/SysML2.NET/Core/AutoGenDto/SendActionUsage.cs index 34e0c7fe..c715580f 100644 --- a/SysML2.NET/Core/AutoGenDto/SendActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/SendActionUsage.cs @@ -58,6 +58,7 @@ public partial class SendActionUsage : ISendActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -125,7 +126,7 @@ public partial class SendActionUsage : ISendActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -154,6 +155,7 @@ public partial class SendActionUsage : ISendActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -661,6 +663,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -703,8 +706,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -944,6 +948,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/StateDefinition.cs b/SysML2.NET/Core/AutoGenDto/StateDefinition.cs index 725f2bc4..baeac050 100644 --- a/SysML2.NET/Core/AutoGenDto/StateDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/StateDefinition.cs @@ -54,6 +54,7 @@ public partial class StateDefinition : IStateDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -108,6 +109,7 @@ public partial class StateDefinition : IStateDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -671,6 +673,7 @@ public partial class StateDefinition : IStateDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/StateUsage.cs b/SysML2.NET/Core/AutoGenDto/StateUsage.cs index 9b6d3052..6e63f069 100644 --- a/SysML2.NET/Core/AutoGenDto/StateUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/StateUsage.cs @@ -57,6 +57,7 @@ public partial class StateUsage : IStateUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [RedefinedByProperty("IStateUsage.StateDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] List Systems.Actions.IActionUsage.actionDefinition => [.. this.stateDefinition]; @@ -125,7 +126,7 @@ public partial class StateUsage : IStateUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -154,6 +155,7 @@ public partial class StateUsage : IStateUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -697,6 +699,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -739,8 +742,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -980,6 +984,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/SuccessionAsUsage.cs b/SysML2.NET/Core/AutoGenDto/SuccessionAsUsage.cs index f02a2eb4..4724be82 100644 --- a/SysML2.NET/Core/AutoGenDto/SuccessionAsUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/SuccessionAsUsage.cs @@ -155,6 +155,7 @@ public partial class SuccessionAsUsage : ISuccessionAsUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -655,6 +656,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -936,6 +938,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/SuccessionFlowUsage.cs b/SysML2.NET/Core/AutoGenDto/SuccessionFlowUsage.cs index bddd43ea..06aabaf2 100644 --- a/SysML2.NET/Core/AutoGenDto/SuccessionFlowUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/SuccessionFlowUsage.cs @@ -54,8 +54,10 @@ public partial class SuccessionFlowUsage : ISuccessionFlowUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("IFlowUsage.FlowDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => [.. this.flowDefinition]; /// /// Various alternative identifiers for this Element. Generally, these will be set by tools. @@ -149,7 +151,7 @@ public partial class SuccessionFlowUsage : ISuccessionFlowUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -178,6 +180,7 @@ public partial class SuccessionFlowUsage : ISuccessionFlowUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -265,6 +268,7 @@ public partial class SuccessionFlowUsage : ISuccessionFlowUsage /// Model Libraries. /// [Property(xmiId: "_19_0_4_12e503d9_1661892878973_977062_185", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1661900477937_518125_727")] [Implements(implementation: "IFlowUsage.FlowDefinition")] public List flowDefinition { get; internal set; } = []; @@ -723,6 +727,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -765,8 +770,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1014,6 +1020,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/TerminateActionUsage.cs b/SysML2.NET/Core/AutoGenDto/TerminateActionUsage.cs index ac44f540..4f5b433c 100644 --- a/SysML2.NET/Core/AutoGenDto/TerminateActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/TerminateActionUsage.cs @@ -57,6 +57,7 @@ public partial class TerminateActionUsage : ITerminateActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -124,7 +125,7 @@ public partial class TerminateActionUsage : ITerminateActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -153,6 +154,7 @@ public partial class TerminateActionUsage : ITerminateActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -660,6 +662,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -702,8 +705,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -943,6 +947,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/TransitionUsage.cs b/SysML2.NET/Core/AutoGenDto/TransitionUsage.cs index ec657537..8dbbcc6f 100644 --- a/SysML2.NET/Core/AutoGenDto/TransitionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/TransitionUsage.cs @@ -59,6 +59,7 @@ public partial class TransitionUsage : ITransitionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -126,7 +127,7 @@ public partial class TransitionUsage : ITransitionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -155,6 +156,7 @@ public partial class TransitionUsage : ITransitionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -682,6 +684,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -724,8 +727,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -965,6 +969,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/Usage.cs b/SysML2.NET/Core/AutoGenDto/Usage.cs index 6a5c5f79..cee8ad7f 100644 --- a/SysML2.NET/Core/AutoGenDto/Usage.cs +++ b/SysML2.NET/Core/AutoGenDto/Usage.cs @@ -134,6 +134,7 @@ public partial class Usage : IUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -625,6 +626,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -898,6 +900,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/UseCaseDefinition.cs b/SysML2.NET/Core/AutoGenDto/UseCaseDefinition.cs index 633982b8..3789cd21 100644 --- a/SysML2.NET/Core/AutoGenDto/UseCaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/UseCaseDefinition.cs @@ -53,6 +53,7 @@ public partial class UseCaseDefinition : IUseCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -61,6 +62,7 @@ public partial class UseCaseDefinition : IUseCaseDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -75,6 +77,7 @@ public partial class UseCaseDefinition : IUseCaseDefinition /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation { get; internal set; } = []; @@ -123,6 +126,7 @@ public partial class UseCaseDefinition : IUseCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -685,6 +689,7 @@ public partial class UseCaseDefinition : IUseCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; @@ -807,6 +812,7 @@ public partial class UseCaseDefinition : IUseCaseDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/UseCaseUsage.cs b/SysML2.NET/Core/AutoGenDto/UseCaseUsage.cs index 6f67f057..a67bf774 100644 --- a/SysML2.NET/Core/AutoGenDto/UseCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/UseCaseUsage.cs @@ -54,14 +54,17 @@ public partial class UseCaseUsage : IUseCaseUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.HasValue ? [((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.Value] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -88,6 +91,7 @@ public partial class UseCaseUsage : IUseCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] Guid? Systems.Calculations.ICalculationUsage.calculationDefinition => ((SysML2.NET.Core.DTO.Systems.Cases.ICaseUsage)this).caseDefinition.HasValue ? ((SysML2.NET.Core.DTO.Systems.Cases.ICaseUsage)this).caseDefinition.Value : Guid.Empty; @@ -149,7 +153,7 @@ public partial class UseCaseUsage : IUseCaseUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -178,6 +182,7 @@ public partial class UseCaseUsage : IUseCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -710,6 +715,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -760,8 +766,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1001,6 +1008,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1112,6 +1120,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/VerificationCaseDefinition.cs b/SysML2.NET/Core/AutoGenDto/VerificationCaseDefinition.cs index 9ddd0adc..9c85a5a9 100644 --- a/SysML2.NET/Core/AutoGenDto/VerificationCaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/VerificationCaseDefinition.cs @@ -52,6 +52,7 @@ public partial class VerificationCaseDefinition : IVerificationCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action { get; internal set; } = []; @@ -60,6 +61,7 @@ public partial class VerificationCaseDefinition : IVerificationCaseDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -74,6 +76,7 @@ public partial class VerificationCaseDefinition : IVerificationCaseDefinition /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation { get; internal set; } = []; @@ -122,6 +125,7 @@ public partial class VerificationCaseDefinition : IVerificationCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -676,6 +680,7 @@ public partial class VerificationCaseDefinition : IVerificationCaseDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; @@ -798,6 +803,7 @@ public partial class VerificationCaseDefinition : IVerificationCaseDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/VerificationCaseUsage.cs b/SysML2.NET/Core/AutoGenDto/VerificationCaseUsage.cs index 9e18c94f..65cd85e8 100644 --- a/SysML2.NET/Core/AutoGenDto/VerificationCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/VerificationCaseUsage.cs @@ -54,14 +54,17 @@ public partial class VerificationCaseUsage : IVerificationCaseUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition { get; internal set; } = []; + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.HasValue ? [((SysML2.NET.Core.DTO.Systems.Calculations.ICalculationUsage)this).calculationDefinition.Value] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -88,6 +91,7 @@ public partial class VerificationCaseUsage : IVerificationCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] Guid? Systems.Calculations.ICalculationUsage.calculationDefinition => this.caseDefinition.HasValue ? this.caseDefinition.Value : Guid.Empty; @@ -148,7 +152,7 @@ public partial class VerificationCaseUsage : IVerificationCaseUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -177,6 +181,7 @@ public partial class VerificationCaseUsage : IVerificationCaseUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -701,6 +706,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -751,8 +757,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.DTO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -992,6 +999,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1103,6 +1111,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ViewDefinition.cs b/SysML2.NET/Core/AutoGenDto/ViewDefinition.cs index fc9985ad..7a8358dd 100644 --- a/SysML2.NET/Core/AutoGenDto/ViewDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ViewDefinition.cs @@ -97,6 +97,7 @@ public partial class ViewDefinition : IViewDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -624,6 +625,7 @@ public partial class ViewDefinition : IViewDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; diff --git a/SysML2.NET/Core/AutoGenDto/ViewUsage.cs b/SysML2.NET/Core/AutoGenDto/ViewUsage.cs index f2a648b0..46766d39 100644 --- a/SysML2.NET/Core/AutoGenDto/ViewUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ViewUsage.cs @@ -132,6 +132,7 @@ public partial class ViewUsage : IViewUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -658,6 +659,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -941,6 +943,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ViewpointDefinition.cs b/SysML2.NET/Core/AutoGenDto/ViewpointDefinition.cs index e5b1687e..273f5345 100644 --- a/SysML2.NET/Core/AutoGenDto/ViewpointDefinition.cs +++ b/SysML2.NET/Core/AutoGenDto/ViewpointDefinition.cs @@ -51,6 +51,7 @@ public partial class ViewpointDefinition : IViewpointDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -123,6 +124,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -678,6 +680,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage { get; internal set; } = []; @@ -812,6 +815,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -828,6 +832,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/ViewpointUsage.cs b/SysML2.NET/Core/AutoGenDto/ViewpointUsage.cs index a8c327da..67f0df27 100644 --- a/SysML2.NET/Core/AutoGenDto/ViewpointUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/ViewpointUsage.cs @@ -52,6 +52,7 @@ public partial class ViewpointUsage : IViewpointUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter { get; internal set; } = []; @@ -177,6 +178,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -710,6 +712,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -993,6 +996,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } @@ -1142,6 +1146,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter { get; internal set; } = []; @@ -1150,6 +1155,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public Guid subjectParameter { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenDto/WhileLoopActionUsage.cs b/SysML2.NET/Core/AutoGenDto/WhileLoopActionUsage.cs index 0f1fbfe6..7d5cdf74 100644 --- a/SysML2.NET/Core/AutoGenDto/WhileLoopActionUsage.cs +++ b/SysML2.NET/Core/AutoGenDto/WhileLoopActionUsage.cs @@ -57,6 +57,7 @@ public partial class WhileLoopActionUsage : IWhileLoopActionUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition { get; internal set; } = []; @@ -132,7 +133,7 @@ public partial class WhileLoopActionUsage : IWhileLoopActionUsage [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.DTO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -161,6 +162,7 @@ public partial class WhileLoopActionUsage : IWhileLoopActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage { get; internal set; } = []; @@ -668,6 +670,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage { get; internal set; } = []; @@ -710,8 +713,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition { get; internal set; } = []; + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -951,6 +955,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public Guid? owningDefinition { get; internal set; } diff --git a/SysML2.NET/Core/AutoGenPoco/AcceptActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/AcceptActionUsage.cs index 0bab4fc7..b3c494a6 100644 --- a/SysML2.NET/Core/AutoGenPoco/AcceptActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/AcceptActionUsage.cs @@ -101,6 +101,7 @@ public AcceptActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -168,7 +169,7 @@ public AcceptActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -197,6 +198,7 @@ public AcceptActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -704,6 +706,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -746,8 +749,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -990,6 +994,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1070,6 +1075,7 @@ bool Core.Features.IFeature.IsVariable /// base AcceptActionUsage AcceptAction from the Systems Model Library. /// [Property(xmiId: "_19_0_4_12e503d9_1642701018287_478584_4462", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591477541360_47573_933")] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] [Implements(implementation: "IAcceptActionUsage.PayloadParameter")] public IReferenceUsage payloadParameter => this.ComputePayloadParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/ActionDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ActionDefinition.cs index 16847132..0be263ff 100644 --- a/SysML2.NET/Core/AutoGenPoco/ActionDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ActionDefinition.cs @@ -94,6 +94,7 @@ public ActionDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -148,6 +149,7 @@ public ActionDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -678,6 +680,7 @@ public ActionDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/ActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/ActionUsage.cs index b7448635..68bae67d 100644 --- a/SysML2.NET/Core/AutoGenPoco/ActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ActionUsage.cs @@ -100,6 +100,7 @@ public ActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -167,7 +168,7 @@ public ActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -196,6 +197,7 @@ public ActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -703,6 +705,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -745,8 +748,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -989,6 +993,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/AllocationDefinition.cs b/SysML2.NET/Core/AutoGenPoco/AllocationDefinition.cs index 080b3b2c..f1da9133 100644 --- a/SysML2.NET/Core/AutoGenPoco/AllocationDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/AllocationDefinition.cs @@ -173,6 +173,7 @@ public AllocationDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -739,6 +740,7 @@ bool Core.Types.IType.IsSufficient /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/AllocationUsage.cs b/SysML2.NET/Core/AutoGenPoco/AllocationUsage.cs index 1ae894fe..b90f9f0a 100644 --- a/SysML2.NET/Core/AutoGenPoco/AllocationUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/AllocationUsage.cs @@ -227,6 +227,7 @@ public AllocationUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -753,6 +754,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1050,6 +1052,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/AnalysisCaseDefinition.cs b/SysML2.NET/Core/AutoGenPoco/AnalysisCaseDefinition.cs index 0c05b10b..478327a8 100644 --- a/SysML2.NET/Core/AutoGenPoco/AnalysisCaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/AnalysisCaseDefinition.cs @@ -94,6 +94,7 @@ public AnalysisCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -102,6 +103,7 @@ public AnalysisCaseDefinition() /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -116,6 +118,7 @@ public AnalysisCaseDefinition() /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation => this.ComputeCalculation(); @@ -164,6 +167,7 @@ public AnalysisCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -721,6 +725,7 @@ public AnalysisCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); @@ -856,6 +861,7 @@ public AnalysisCaseDefinition() /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/AnalysisCaseUsage.cs b/SysML2.NET/Core/AutoGenPoco/AnalysisCaseUsage.cs index 8c2a7495..64d0eced 100644 --- a/SysML2.NET/Core/AutoGenPoco/AnalysisCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/AnalysisCaseUsage.cs @@ -97,14 +97,17 @@ public AnalysisCaseUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition != null ? [((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -139,6 +142,7 @@ public AnalysisCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] IFunction Systems.Calculations.ICalculationUsage.calculationDefinition => ((SysML2.NET.Core.POCO.Systems.Cases.ICaseUsage)this).caseDefinition; @@ -200,7 +204,7 @@ public AnalysisCaseUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -229,6 +233,7 @@ public AnalysisCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -753,6 +758,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -803,8 +809,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1047,6 +1054,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1170,6 +1178,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/AssertConstraintUsage.cs b/SysML2.NET/Core/AutoGenPoco/AssertConstraintUsage.cs index fd0fa8c7..3130b6d0 100644 --- a/SysML2.NET/Core/AutoGenPoco/AssertConstraintUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/AssertConstraintUsage.cs @@ -204,6 +204,7 @@ public AssertConstraintUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -735,6 +736,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1021,6 +1023,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/AssignmentActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/AssignmentActionUsage.cs index 8e2cdc34..8aaf3c3d 100644 --- a/SysML2.NET/Core/AutoGenPoco/AssignmentActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/AssignmentActionUsage.cs @@ -100,6 +100,7 @@ public AssignmentActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -167,7 +168,7 @@ public AssignmentActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -196,6 +197,7 @@ public AssignmentActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -703,6 +705,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -745,8 +748,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -989,6 +993,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/AttributeDefinition.cs b/SysML2.NET/Core/AutoGenPoco/AttributeDefinition.cs index 8c0f9de9..4f762b10 100644 --- a/SysML2.NET/Core/AutoGenPoco/AttributeDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/AttributeDefinition.cs @@ -141,6 +141,7 @@ public AttributeDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -664,6 +665,7 @@ public AttributeDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/AttributeUsage.cs b/SysML2.NET/Core/AutoGenPoco/AttributeUsage.cs index 9478814a..06024676 100644 --- a/SysML2.NET/Core/AutoGenPoco/AttributeUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/AttributeUsage.cs @@ -185,6 +185,7 @@ public AttributeUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -685,6 +686,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -961,6 +963,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/BindingConnectorAsUsage.cs b/SysML2.NET/Core/AutoGenPoco/BindingConnectorAsUsage.cs index 44b9c1f9..58228915 100644 --- a/SysML2.NET/Core/AutoGenPoco/BindingConnectorAsUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/BindingConnectorAsUsage.cs @@ -201,6 +201,7 @@ public BindingConnectorAsUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -701,6 +702,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -988,6 +990,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/CalculationDefinition.cs b/SysML2.NET/Core/AutoGenPoco/CalculationDefinition.cs index 2e25d8aa..a1d1d2a3 100644 --- a/SysML2.NET/Core/AutoGenPoco/CalculationDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/CalculationDefinition.cs @@ -95,6 +95,7 @@ public CalculationDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -109,6 +110,7 @@ public CalculationDefinition() /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation => this.ComputeCalculation(); @@ -157,6 +159,7 @@ public CalculationDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -706,6 +709,7 @@ public CalculationDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/CalculationUsage.cs b/SysML2.NET/Core/AutoGenPoco/CalculationUsage.cs index 04d81679..5c8a7e49 100644 --- a/SysML2.NET/Core/AutoGenPoco/CalculationUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/CalculationUsage.cs @@ -100,8 +100,10 @@ public CalculationUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => this.calculationDefinition != null ? [this.calculationDefinition] : []; /// /// Various alternative identifiers for this Element. Generally, these will be set by tools. @@ -126,6 +128,7 @@ public CalculationUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] public IFunction calculationDefinition => this.ComputeCalculationDefinition(); @@ -177,7 +180,7 @@ public CalculationUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -206,6 +209,7 @@ public CalculationUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -730,6 +734,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -772,8 +777,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1016,6 +1022,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/CaseDefinition.cs b/SysML2.NET/Core/AutoGenPoco/CaseDefinition.cs index bef7d884..33cddbb7 100644 --- a/SysML2.NET/Core/AutoGenPoco/CaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/CaseDefinition.cs @@ -96,6 +96,7 @@ public CaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -104,6 +105,7 @@ public CaseDefinition() /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -118,6 +120,7 @@ public CaseDefinition() /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation => this.ComputeCalculation(); @@ -166,6 +169,7 @@ public CaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -723,6 +727,7 @@ public CaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); @@ -848,6 +853,7 @@ public CaseDefinition() /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/CaseUsage.cs b/SysML2.NET/Core/AutoGenPoco/CaseUsage.cs index bdf9f500..86edad0e 100644 --- a/SysML2.NET/Core/AutoGenPoco/CaseUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/CaseUsage.cs @@ -97,14 +97,17 @@ public CaseUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition != null ? [((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -131,6 +134,7 @@ public CaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] IFunction Systems.Calculations.ICalculationUsage.calculationDefinition => this.caseDefinition; @@ -191,7 +195,7 @@ public CaseUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -220,6 +224,7 @@ public CaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -744,6 +749,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -794,8 +800,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1038,6 +1045,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1152,6 +1160,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/ConcernDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ConcernDefinition.cs index 0b35b6b5..5bce642c 100644 --- a/SysML2.NET/Core/AutoGenPoco/ConcernDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ConcernDefinition.cs @@ -95,6 +95,7 @@ public ConcernDefinition() /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -167,6 +168,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -725,6 +727,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); @@ -862,6 +865,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -878,6 +882,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/ConcernUsage.cs b/SysML2.NET/Core/AutoGenPoco/ConcernUsage.cs index 7cdd839d..6736de3d 100644 --- a/SysML2.NET/Core/AutoGenPoco/ConcernUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ConcernUsage.cs @@ -98,6 +98,7 @@ public ConcernUsage() /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -231,6 +232,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -764,6 +766,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1050,6 +1053,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1202,6 +1206,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -1210,6 +1215,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/ConjugatedPortDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ConjugatedPortDefinition.cs index 6b3a4462..6c798f7a 100644 --- a/SysML2.NET/Core/AutoGenPoco/ConjugatedPortDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ConjugatedPortDefinition.cs @@ -150,6 +150,7 @@ public ConjugatedPortDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -699,6 +700,7 @@ public ConjugatedPortDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/ConnectionDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ConnectionDefinition.cs index 8b8af231..f1ed6898 100644 --- a/SysML2.NET/Core/AutoGenPoco/ConnectionDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ConnectionDefinition.cs @@ -161,6 +161,7 @@ public ConnectionDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -727,6 +728,7 @@ bool Core.Types.IType.IsSufficient /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/ConnectionUsage.cs b/SysML2.NET/Core/AutoGenPoco/ConnectionUsage.cs index 58eb8f2d..7f3806da 100644 --- a/SysML2.NET/Core/AutoGenPoco/ConnectionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ConnectionUsage.cs @@ -220,6 +220,7 @@ public ConnectionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -746,6 +747,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1043,6 +1045,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/ConstraintDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ConstraintDefinition.cs index 436806ef..ceff20f9 100644 --- a/SysML2.NET/Core/AutoGenPoco/ConstraintDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ConstraintDefinition.cs @@ -140,6 +140,7 @@ public ConstraintDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -689,6 +690,7 @@ public ConstraintDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/ConstraintUsage.cs b/SysML2.NET/Core/AutoGenPoco/ConstraintUsage.cs index aa8e0bd2..19fbbbfb 100644 --- a/SysML2.NET/Core/AutoGenPoco/ConstraintUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ConstraintUsage.cs @@ -196,6 +196,7 @@ public ConstraintUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -720,6 +721,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1006,6 +1008,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/DecisionNode.cs b/SysML2.NET/Core/AutoGenPoco/DecisionNode.cs index 414066bd..daeabdd1 100644 --- a/SysML2.NET/Core/AutoGenPoco/DecisionNode.cs +++ b/SysML2.NET/Core/AutoGenPoco/DecisionNode.cs @@ -97,6 +97,7 @@ public DecisionNode() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -164,7 +165,7 @@ public DecisionNode() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -193,6 +194,7 @@ public DecisionNode() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -700,6 +702,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -742,8 +745,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -986,6 +990,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/Definition.cs b/SysML2.NET/Core/AutoGenPoco/Definition.cs index b20b8043..ccd90212 100644 --- a/SysML2.NET/Core/AutoGenPoco/Definition.cs +++ b/SysML2.NET/Core/AutoGenPoco/Definition.cs @@ -145,6 +145,7 @@ public Definition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -668,6 +669,7 @@ public Definition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/EnumerationDefinition.cs b/SysML2.NET/Core/AutoGenPoco/EnumerationDefinition.cs index 592f7f4c..670e12fe 100644 --- a/SysML2.NET/Core/AutoGenPoco/EnumerationDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/EnumerationDefinition.cs @@ -138,6 +138,7 @@ public EnumerationDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -687,6 +688,7 @@ bool Systems.DefinitionAndUsage.IDefinition.IsVariation /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/EnumerationUsage.cs b/SysML2.NET/Core/AutoGenPoco/EnumerationUsage.cs index b06aa228..1ae84767 100644 --- a/SysML2.NET/Core/AutoGenPoco/EnumerationUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/EnumerationUsage.cs @@ -181,6 +181,7 @@ public EnumerationUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -689,6 +690,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -965,6 +967,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/EventOccurrenceUsage.cs b/SysML2.NET/Core/AutoGenPoco/EventOccurrenceUsage.cs index 15308406..1ea8b329 100644 --- a/SysML2.NET/Core/AutoGenPoco/EventOccurrenceUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/EventOccurrenceUsage.cs @@ -176,6 +176,7 @@ public EventOccurrenceUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -701,6 +702,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -987,6 +989,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/ExhibitStateUsage.cs b/SysML2.NET/Core/AutoGenPoco/ExhibitStateUsage.cs index a4d333d6..dcb69f78 100644 --- a/SysML2.NET/Core/AutoGenPoco/ExhibitStateUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ExhibitStateUsage.cs @@ -100,6 +100,7 @@ public ExhibitStateUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [RedefinedByProperty("IStateUsage.StateDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] List Systems.Actions.IActionUsage.actionDefinition => [.. this.stateDefinition]; @@ -168,7 +169,7 @@ public ExhibitStateUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -197,6 +198,7 @@ public ExhibitStateUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -768,6 +770,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -810,8 +813,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1054,6 +1058,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/FlowDefinition.cs b/SysML2.NET/Core/AutoGenPoco/FlowDefinition.cs index 4f4032e0..fb732ba7 100644 --- a/SysML2.NET/Core/AutoGenPoco/FlowDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/FlowDefinition.cs @@ -100,6 +100,7 @@ public FlowDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -165,6 +166,7 @@ public FlowDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -723,6 +725,7 @@ public FlowDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/FlowUsage.cs b/SysML2.NET/Core/AutoGenPoco/FlowUsage.cs index 18f01fa8..0f7d7fc7 100644 --- a/SysML2.NET/Core/AutoGenPoco/FlowUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/FlowUsage.cs @@ -104,8 +104,10 @@ public FlowUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("IFlowUsage.FlowDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => [.. this.flowDefinition]; /// /// Various alternative identifiers for this Element. Generally, these will be set by tools. @@ -199,7 +201,7 @@ public FlowUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -228,6 +230,7 @@ public FlowUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -315,6 +318,7 @@ public FlowUsage() /// Model Libraries. /// [Property(xmiId: "_19_0_4_12e503d9_1661892878973_977062_185", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1661900477937_518125_727")] [Implements(implementation: "IFlowUsage.FlowDefinition")] public List flowDefinition => this.ComputeFlowDefinition(); @@ -773,6 +777,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -815,8 +820,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1070,6 +1076,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/ForLoopActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/ForLoopActionUsage.cs index a36c7482..8afacedb 100644 --- a/SysML2.NET/Core/AutoGenPoco/ForLoopActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ForLoopActionUsage.cs @@ -99,6 +99,7 @@ public ForLoopActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -174,7 +175,7 @@ public ForLoopActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -203,6 +204,7 @@ public ForLoopActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -719,6 +721,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -761,8 +764,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1005,6 +1009,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/ForkNode.cs b/SysML2.NET/Core/AutoGenPoco/ForkNode.cs index a480cb92..b40cd9af 100644 --- a/SysML2.NET/Core/AutoGenPoco/ForkNode.cs +++ b/SysML2.NET/Core/AutoGenPoco/ForkNode.cs @@ -98,6 +98,7 @@ public ForkNode() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -165,7 +166,7 @@ public ForkNode() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -194,6 +195,7 @@ public ForkNode() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -701,6 +703,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -743,8 +746,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -987,6 +991,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/IAcceptActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/IAcceptActionUsage.cs index a77345ff..489bb92d 100644 --- a/SysML2.NET/Core/AutoGenPoco/IAcceptActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IAcceptActionUsage.cs @@ -86,6 +86,7 @@ public partial interface IAcceptActionUsage : IActionUsage /// base AcceptActionUsage AcceptAction from the Systems Model Library. /// [Property(xmiId: "_19_0_4_12e503d9_1642701018287_478584_4462", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591477541360_47573_933")] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] IReferenceUsage payloadParameter { get; } diff --git a/SysML2.NET/Core/AutoGenPoco/IActionDefinition.cs b/SysML2.NET/Core/AutoGenPoco/IActionDefinition.cs index c773152a..dc2a991c 100644 --- a/SysML2.NET/Core/AutoGenPoco/IActionDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/IActionDefinition.cs @@ -74,6 +74,7 @@ public partial interface IActionDefinition : IBehavior, IOccurrenceDefinition /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List action { get; } } diff --git a/SysML2.NET/Core/AutoGenPoco/IActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/IActionUsage.cs index 05dbc0a6..00308f1a 100644 --- a/SysML2.NET/Core/AutoGenPoco/IActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IActionUsage.cs @@ -80,6 +80,7 @@ public partial interface IActionUsage : IStep, IOccurrenceUsage /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] List actionDefinition { get; } /// diff --git a/SysML2.NET/Core/AutoGenPoco/ICalculationDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ICalculationDefinition.cs index 9d416401..4fde4590 100644 --- a/SysML2.NET/Core/AutoGenPoco/ICalculationDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ICalculationDefinition.cs @@ -73,6 +73,7 @@ public partial interface ICalculationDefinition : IFunction, IActionDefinition /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] List calculation { get; } diff --git a/SysML2.NET/Core/AutoGenPoco/ICalculationUsage.cs b/SysML2.NET/Core/AutoGenPoco/ICalculationUsage.cs index ddc70232..05066aac 100644 --- a/SysML2.NET/Core/AutoGenPoco/ICalculationUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ICalculationUsage.cs @@ -80,6 +80,7 @@ public partial interface ICalculationUsage : IExpression, IActionUsage /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] IFunction calculationDefinition { get; } /// diff --git a/SysML2.NET/Core/AutoGenPoco/ICaseDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ICaseDefinition.cs index f6b5b8d7..1b335598 100644 --- a/SysML2.NET/Core/AutoGenPoco/ICaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ICaseDefinition.cs @@ -75,6 +75,7 @@ public partial interface ICaseDefinition : ICalculationDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List actorParameter { get; } /// @@ -89,6 +90,7 @@ public partial interface ICaseDefinition : ICalculationDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] IUsage subjectParameter { get; } } diff --git a/SysML2.NET/Core/AutoGenPoco/ICaseUsage.cs b/SysML2.NET/Core/AutoGenPoco/ICaseUsage.cs index 07ebb52f..ef0f7e62 100644 --- a/SysML2.NET/Core/AutoGenPoco/ICaseUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ICaseUsage.cs @@ -75,6 +75,7 @@ public partial interface ICaseUsage : ICalculationUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List actorParameter { get; } /// @@ -96,6 +97,7 @@ public partial interface ICaseUsage : ICalculationUsage /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] IUsage subjectParameter { get; } } diff --git a/SysML2.NET/Core/AutoGenPoco/IDefinition.cs b/SysML2.NET/Core/AutoGenPoco/IDefinition.cs index 247d09e5..1432ab09 100644 --- a/SysML2.NET/Core/AutoGenPoco/IDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/IDefinition.cs @@ -80,6 +80,7 @@ public partial interface IDefinition : IClassifier /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List directedUsage { get; } /// @@ -250,6 +251,7 @@ public partial interface IDefinition : IClassifier /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List ownedUsage { get; } /// diff --git a/SysML2.NET/Core/AutoGenPoco/IFlowUsage.cs b/SysML2.NET/Core/AutoGenPoco/IFlowUsage.cs index 2bd89208..e2ff503a 100644 --- a/SysML2.NET/Core/AutoGenPoco/IFlowUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IFlowUsage.cs @@ -79,6 +79,7 @@ public partial interface IFlowUsage : IConnectorAsUsage, IFlow, IActionUsage /// Model Libraries. /// [Property(xmiId: "_19_0_4_12e503d9_1661892878973_977062_185", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1661900477937_518125_727")] List flowDefinition { get; } diff --git a/SysML2.NET/Core/AutoGenPoco/IMetadataUsage.cs b/SysML2.NET/Core/AutoGenPoco/IMetadataUsage.cs index 49b5115b..fb0b10fe 100644 --- a/SysML2.NET/Core/AutoGenPoco/IMetadataUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IMetadataUsage.cs @@ -77,6 +77,7 @@ public partial interface IMetadataUsage : IItemUsage, IMetadataFeature /// The MetadataDefinition that is the definition of this MetadataUsage. /// [Property(xmiId: "_19_0_4_12e503d9_1647727047674_847094_2563", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565471361757_649736_20796")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1606345564958_925589_327")] IMetaclass metadataDefinition { get; } diff --git a/SysML2.NET/Core/AutoGenPoco/IRequirementDefinition.cs b/SysML2.NET/Core/AutoGenPoco/IRequirementDefinition.cs index 3757fa1c..26a97e92 100644 --- a/SysML2.NET/Core/AutoGenPoco/IRequirementDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/IRequirementDefinition.cs @@ -75,6 +75,7 @@ public partial interface IRequirementDefinition : IConstraintDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List actorParameter { get; } /// @@ -117,6 +118,7 @@ public partial interface IRequirementDefinition : IConstraintDefinition /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] List stakeholderParameter { get; } /// @@ -124,6 +126,7 @@ public partial interface IRequirementDefinition : IConstraintDefinition /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] IUsage subjectParameter { get; } /// diff --git a/SysML2.NET/Core/AutoGenPoco/IRequirementUsage.cs b/SysML2.NET/Core/AutoGenPoco/IRequirementUsage.cs index 896e82a6..a5d4101e 100644 --- a/SysML2.NET/Core/AutoGenPoco/IRequirementUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IRequirementUsage.cs @@ -75,6 +75,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List actorParameter { get; } /// @@ -124,6 +125,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List stakeholderParameter { get; } /// @@ -131,6 +133,7 @@ public partial interface IRequirementUsage : IConstraintUsage /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] IUsage subjectParameter { get; } /// diff --git a/SysML2.NET/Core/AutoGenPoco/IUsage.cs b/SysML2.NET/Core/AutoGenPoco/IUsage.cs index 8b6b2481..44899a0f 100644 --- a/SysML2.NET/Core/AutoGenPoco/IUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IUsage.cs @@ -86,6 +86,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List directedUsage { get; } /// @@ -274,6 +275,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] List nestedUsage { get; } /// @@ -309,6 +311,7 @@ public partial interface IUsage : IFeature /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] IDefinition owningDefinition { get; } /// diff --git a/SysML2.NET/Core/AutoGenPoco/IfActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/IfActionUsage.cs index 4ca766d2..159bcd7d 100644 --- a/SysML2.NET/Core/AutoGenPoco/IfActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IfActionUsage.cs @@ -99,6 +99,7 @@ public IfActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -166,7 +167,7 @@ public IfActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -195,6 +196,7 @@ public IfActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -718,6 +720,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -760,8 +763,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1004,6 +1008,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/IncludeUseCaseUsage.cs b/SysML2.NET/Core/AutoGenPoco/IncludeUseCaseUsage.cs index df198dfb..d441fdb8 100644 --- a/SysML2.NET/Core/AutoGenPoco/IncludeUseCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/IncludeUseCaseUsage.cs @@ -100,14 +100,17 @@ public IncludeUseCaseUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition != null ? [((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -134,6 +137,7 @@ public IncludeUseCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] IFunction Systems.Calculations.ICalculationUsage.calculationDefinition => ((SysML2.NET.Core.POCO.Systems.Cases.ICaseUsage)this).caseDefinition; @@ -195,7 +199,7 @@ public IncludeUseCaseUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -224,6 +228,7 @@ public IncludeUseCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -775,6 +780,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -825,8 +831,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1069,6 +1076,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1193,6 +1201,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/InterfaceDefinition.cs b/SysML2.NET/Core/AutoGenPoco/InterfaceDefinition.cs index ce91241b..01ea36e0 100644 --- a/SysML2.NET/Core/AutoGenPoco/InterfaceDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/InterfaceDefinition.cs @@ -162,6 +162,7 @@ public InterfaceDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -736,6 +737,7 @@ bool Core.Types.IType.IsSufficient /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/InterfaceUsage.cs b/SysML2.NET/Core/AutoGenPoco/InterfaceUsage.cs index 0df9c558..e5e6f2ff 100644 --- a/SysML2.NET/Core/AutoGenPoco/InterfaceUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/InterfaceUsage.cs @@ -219,6 +219,7 @@ public InterfaceUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -753,6 +754,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1050,6 +1052,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/ItemDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ItemDefinition.cs index 741b9cea..2a981ab2 100644 --- a/SysML2.NET/Core/AutoGenPoco/ItemDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ItemDefinition.cs @@ -140,6 +140,7 @@ public ItemDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -670,6 +671,7 @@ public ItemDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/ItemUsage.cs b/SysML2.NET/Core/AutoGenPoco/ItemUsage.cs index c2d8166f..a19e7cb4 100644 --- a/SysML2.NET/Core/AutoGenPoco/ItemUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ItemUsage.cs @@ -175,6 +175,7 @@ public ItemUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -692,6 +693,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -978,6 +980,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/JoinNode.cs b/SysML2.NET/Core/AutoGenPoco/JoinNode.cs index 98b4e343..61bd7ce7 100644 --- a/SysML2.NET/Core/AutoGenPoco/JoinNode.cs +++ b/SysML2.NET/Core/AutoGenPoco/JoinNode.cs @@ -98,6 +98,7 @@ public JoinNode() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -165,7 +166,7 @@ public JoinNode() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -194,6 +195,7 @@ public JoinNode() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -701,6 +703,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -743,8 +746,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -987,6 +991,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/MergeNode.cs b/SysML2.NET/Core/AutoGenPoco/MergeNode.cs index cf10cd76..fa24087e 100644 --- a/SysML2.NET/Core/AutoGenPoco/MergeNode.cs +++ b/SysML2.NET/Core/AutoGenPoco/MergeNode.cs @@ -98,6 +98,7 @@ public MergeNode() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -165,7 +166,7 @@ public MergeNode() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -194,6 +195,7 @@ public MergeNode() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -701,6 +703,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -743,8 +746,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -987,6 +991,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/MetadataDefinition.cs b/SysML2.NET/Core/AutoGenPoco/MetadataDefinition.cs index fbb20376..8b58e230 100644 --- a/SysML2.NET/Core/AutoGenPoco/MetadataDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/MetadataDefinition.cs @@ -137,6 +137,7 @@ public MetadataDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -667,6 +668,7 @@ public MetadataDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/MetadataUsage.cs b/SysML2.NET/Core/AutoGenPoco/MetadataUsage.cs index b8b6958e..b9fdd523 100644 --- a/SysML2.NET/Core/AutoGenPoco/MetadataUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/MetadataUsage.cs @@ -194,6 +194,7 @@ public MetadataUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -476,8 +477,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565471361757_649736_20796", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("IMetadataUsage.MetadataDefinition")] [Implements(implementation: "IItemUsage.ItemDefinition")] - public List itemDefinition => this.ComputeItemDefinition(); + List Systems.Items.IItemUsage.itemDefinition => this.metadataDefinition != null ? [this.metadataDefinition] : []; /// /// Whether this Usage may be time varying (that is, whether it is featured by the snapshots of its @@ -521,6 +523,7 @@ bool Core.Features.IFeature.IsVariable /// The MetadataDefinition that is the definition of this MetadataUsage. /// [Property(xmiId: "_19_0_4_12e503d9_1647727047674_847094_2563", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565471361757_649736_20796")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1606345564958_925589_327")] [Implements(implementation: "IMetadataUsage.MetadataDefinition")] public IMetaclass metadataDefinition => this.ComputeMetadataDefinition(); @@ -728,6 +731,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1033,6 +1037,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/OccurrenceDefinition.cs b/SysML2.NET/Core/AutoGenPoco/OccurrenceDefinition.cs index 1652a99b..ed782ecf 100644 --- a/SysML2.NET/Core/AutoGenPoco/OccurrenceDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/OccurrenceDefinition.cs @@ -140,6 +140,7 @@ public OccurrenceDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -670,6 +671,7 @@ public OccurrenceDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/OccurrenceUsage.cs b/SysML2.NET/Core/AutoGenPoco/OccurrenceUsage.cs index b85c328f..f3f0935e 100644 --- a/SysML2.NET/Core/AutoGenPoco/OccurrenceUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/OccurrenceUsage.cs @@ -174,6 +174,7 @@ public OccurrenceUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -681,6 +682,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -967,6 +969,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/PartDefinition.cs b/SysML2.NET/Core/AutoGenPoco/PartDefinition.cs index 8bde288c..246de284 100644 --- a/SysML2.NET/Core/AutoGenPoco/PartDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/PartDefinition.cs @@ -138,6 +138,7 @@ public PartDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -668,6 +669,7 @@ public PartDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/PartUsage.cs b/SysML2.NET/Core/AutoGenPoco/PartUsage.cs index fd1e02ab..469d0f08 100644 --- a/SysML2.NET/Core/AutoGenPoco/PartUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/PartUsage.cs @@ -174,6 +174,7 @@ public PartUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -691,6 +692,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -977,6 +979,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/PerformActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/PerformActionUsage.cs index bead4436..78b5488a 100644 --- a/SysML2.NET/Core/AutoGenPoco/PerformActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/PerformActionUsage.cs @@ -100,6 +100,7 @@ public PerformActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -167,7 +168,7 @@ public PerformActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -196,6 +197,7 @@ public PerformActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -722,6 +724,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -764,8 +767,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1008,6 +1012,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/PortDefinition.cs b/SysML2.NET/Core/AutoGenPoco/PortDefinition.cs index 9fb5c2c5..7c8fd0fb 100644 --- a/SysML2.NET/Core/AutoGenPoco/PortDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/PortDefinition.cs @@ -147,6 +147,7 @@ public PortDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -677,6 +678,7 @@ public PortDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/PortUsage.cs b/SysML2.NET/Core/AutoGenPoco/PortUsage.cs index 5df3b23e..0e975aa5 100644 --- a/SysML2.NET/Core/AutoGenPoco/PortUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/PortUsage.cs @@ -172,6 +172,7 @@ public PortUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -679,6 +680,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -966,6 +968,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/ReferenceUsage.cs b/SysML2.NET/Core/AutoGenPoco/ReferenceUsage.cs index 0d7f2a49..a1435f52 100644 --- a/SysML2.NET/Core/AutoGenPoco/ReferenceUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ReferenceUsage.cs @@ -172,6 +172,7 @@ public ReferenceUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -672,6 +673,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -948,6 +950,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/RenderingDefinition.cs b/SysML2.NET/Core/AutoGenPoco/RenderingDefinition.cs index 739ad9e7..cee20717 100644 --- a/SysML2.NET/Core/AutoGenPoco/RenderingDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/RenderingDefinition.cs @@ -137,6 +137,7 @@ public RenderingDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -667,6 +668,7 @@ public RenderingDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/RenderingUsage.cs b/SysML2.NET/Core/AutoGenPoco/RenderingUsage.cs index 010ac425..29dc579b 100644 --- a/SysML2.NET/Core/AutoGenPoco/RenderingUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/RenderingUsage.cs @@ -173,6 +173,7 @@ public RenderingUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -690,6 +691,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -976,6 +978,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/RequirementDefinition.cs b/SysML2.NET/Core/AutoGenPoco/RequirementDefinition.cs index 623d2df5..7650a56f 100644 --- a/SysML2.NET/Core/AutoGenPoco/RequirementDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/RequirementDefinition.cs @@ -95,6 +95,7 @@ public RequirementDefinition() /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -167,6 +168,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -725,6 +727,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); @@ -862,6 +865,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -878,6 +882,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/RequirementUsage.cs b/SysML2.NET/Core/AutoGenPoco/RequirementUsage.cs index e31051b5..d06f59d2 100644 --- a/SysML2.NET/Core/AutoGenPoco/RequirementUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/RequirementUsage.cs @@ -95,6 +95,7 @@ public RequirementUsage() /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -220,6 +221,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -753,6 +755,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1039,6 +1042,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1190,6 +1194,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -1198,6 +1203,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/SatisfyRequirementUsage.cs b/SysML2.NET/Core/AutoGenPoco/SatisfyRequirementUsage.cs index 9505fb55..76e2d0fb 100644 --- a/SysML2.NET/Core/AutoGenPoco/SatisfyRequirementUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/SatisfyRequirementUsage.cs @@ -98,6 +98,7 @@ public SatisfyRequirementUsage() /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -233,6 +234,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -773,6 +775,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1059,6 +1062,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1228,6 +1232,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -1236,6 +1241,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/SendActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/SendActionUsage.cs index 3899d91f..7d5f3846 100644 --- a/SysML2.NET/Core/AutoGenPoco/SendActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/SendActionUsage.cs @@ -102,6 +102,7 @@ public SendActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -169,7 +170,7 @@ public SendActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -198,6 +199,7 @@ public SendActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -705,6 +707,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -747,8 +750,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -991,6 +995,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/StateDefinition.cs b/SysML2.NET/Core/AutoGenPoco/StateDefinition.cs index bc0e69f6..ece0269b 100644 --- a/SysML2.NET/Core/AutoGenPoco/StateDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/StateDefinition.cs @@ -96,6 +96,7 @@ public StateDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -150,6 +151,7 @@ public StateDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -716,6 +718,7 @@ public StateDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/StateUsage.cs b/SysML2.NET/Core/AutoGenPoco/StateUsage.cs index 0342483a..e45b06ca 100644 --- a/SysML2.NET/Core/AutoGenPoco/StateUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/StateUsage.cs @@ -100,6 +100,7 @@ public StateUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [RedefinedByProperty("IStateUsage.StateDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] List Systems.Actions.IActionUsage.actionDefinition => [.. this.stateDefinition]; @@ -168,7 +169,7 @@ public StateUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -197,6 +198,7 @@ public StateUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -740,6 +742,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -782,8 +785,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1026,6 +1030,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/SuccessionAsUsage.cs b/SysML2.NET/Core/AutoGenPoco/SuccessionAsUsage.cs index 7d36aaf1..d1eb29b8 100644 --- a/SysML2.NET/Core/AutoGenPoco/SuccessionAsUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/SuccessionAsUsage.cs @@ -201,6 +201,7 @@ public SuccessionAsUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -701,6 +702,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -988,6 +990,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/SuccessionFlowUsage.cs b/SysML2.NET/Core/AutoGenPoco/SuccessionFlowUsage.cs index 6fd16105..5e804d5f 100644 --- a/SysML2.NET/Core/AutoGenPoco/SuccessionFlowUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/SuccessionFlowUsage.cs @@ -104,8 +104,10 @@ public SuccessionFlowUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("IFlowUsage.FlowDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => [.. this.flowDefinition]; /// /// Various alternative identifiers for this Element. Generally, these will be set by tools. @@ -199,7 +201,7 @@ public SuccessionFlowUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -228,6 +230,7 @@ public SuccessionFlowUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -315,6 +318,7 @@ public SuccessionFlowUsage() /// Model Libraries. /// [Property(xmiId: "_19_0_4_12e503d9_1661892878973_977062_185", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1661900477937_518125_727")] [Implements(implementation: "IFlowUsage.FlowDefinition")] public List flowDefinition => this.ComputeFlowDefinition(); @@ -773,6 +777,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -815,8 +820,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1070,6 +1076,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/TerminateActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/TerminateActionUsage.cs index 0c3804ee..0bec112e 100644 --- a/SysML2.NET/Core/AutoGenPoco/TerminateActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/TerminateActionUsage.cs @@ -101,6 +101,7 @@ public TerminateActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -168,7 +169,7 @@ public TerminateActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -197,6 +198,7 @@ public TerminateActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -704,6 +706,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -746,8 +749,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -990,6 +994,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/TransitionUsage.cs b/SysML2.NET/Core/AutoGenPoco/TransitionUsage.cs index 5fd5947e..363d8dae 100644 --- a/SysML2.NET/Core/AutoGenPoco/TransitionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/TransitionUsage.cs @@ -103,6 +103,7 @@ public TransitionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -170,7 +171,7 @@ public TransitionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -199,6 +200,7 @@ public TransitionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -726,6 +728,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -768,8 +771,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1012,6 +1016,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/Usage.cs b/SysML2.NET/Core/AutoGenPoco/Usage.cs index b644eb56..2ee9f6b6 100644 --- a/SysML2.NET/Core/AutoGenPoco/Usage.cs +++ b/SysML2.NET/Core/AutoGenPoco/Usage.cs @@ -174,6 +174,7 @@ public Usage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -665,6 +666,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -941,6 +943,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/UseCaseDefinition.cs b/SysML2.NET/Core/AutoGenPoco/UseCaseDefinition.cs index 62de9f59..1218d1fa 100644 --- a/SysML2.NET/Core/AutoGenPoco/UseCaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/UseCaseDefinition.cs @@ -96,6 +96,7 @@ public UseCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -104,6 +105,7 @@ public UseCaseDefinition() /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -118,6 +120,7 @@ public UseCaseDefinition() /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation => this.ComputeCalculation(); @@ -166,6 +169,7 @@ public UseCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -731,6 +735,7 @@ public UseCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); @@ -856,6 +861,7 @@ public UseCaseDefinition() /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/UseCaseUsage.cs b/SysML2.NET/Core/AutoGenPoco/UseCaseUsage.cs index bb0b8c2d..5f413e70 100644 --- a/SysML2.NET/Core/AutoGenPoco/UseCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/UseCaseUsage.cs @@ -97,14 +97,17 @@ public UseCaseUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition != null ? [((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -131,6 +134,7 @@ public UseCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] IFunction Systems.Calculations.ICalculationUsage.calculationDefinition => ((SysML2.NET.Core.POCO.Systems.Cases.ICaseUsage)this).caseDefinition; @@ -192,7 +196,7 @@ public UseCaseUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -221,6 +225,7 @@ public UseCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -753,6 +758,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -803,8 +809,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1047,6 +1054,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1161,6 +1169,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/VerificationCaseDefinition.cs b/SysML2.NET/Core/AutoGenPoco/VerificationCaseDefinition.cs index 41ea00cd..b2c9ab15 100644 --- a/SysML2.NET/Core/AutoGenPoco/VerificationCaseDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/VerificationCaseDefinition.cs @@ -95,6 +95,7 @@ public VerificationCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565500809065_170841_30688", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_b9102da_1536346067212_587255_17343")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IActionDefinition.Action")] public List action => this.ComputeAction(); @@ -103,6 +104,7 @@ public VerificationCaseDefinition() /// [Property(xmiId: "_19_0_4_12e503d9_1621464609772_382176_1612", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -117,6 +119,7 @@ public VerificationCaseDefinition() /// The actions of this CalculationDefinition that are CalculationUsages. /// [Property(xmiId: "_19_0_2_12e503d9_1588214479224_101961_594", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565500809065_170841_30688")] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948400639_301251_20841")] [Implements(implementation: "ICalculationDefinition.Calculation")] public List calculation => this.ComputeCalculation(); @@ -165,6 +168,7 @@ public VerificationCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -722,6 +726,7 @@ public VerificationCaseDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); @@ -847,6 +852,7 @@ public VerificationCaseDefinition() /// [Property(xmiId: "_19_0_2_12e503d9_1595189932946_106647_973", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "ICaseDefinition.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/VerificationCaseUsage.cs b/SysML2.NET/Core/AutoGenPoco/VerificationCaseUsage.cs index c623d8fe..6fc850a4 100644 --- a/SysML2.NET/Core/AutoGenPoco/VerificationCaseUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/VerificationCaseUsage.cs @@ -97,14 +97,17 @@ public VerificationCaseUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] + [RedefinedByProperty("ICalculationUsage.CalculationDefinition")] [Implements(implementation: "IActionUsage.ActionDefinition")] - public List actionDefinition => this.ComputeActionDefinition(); + List Systems.Actions.IActionUsage.actionDefinition => ((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition != null ? [((SysML2.NET.Core.POCO.Systems.Calculations.ICalculationUsage)this).calculationDefinition] : []; /// /// The parameters of this CaseUsage that represent actors involved in the case. /// [Property(xmiId: "_19_0_4_12e503d9_1621464633171_380461_1655", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -131,6 +134,7 @@ public VerificationCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1588213526305_899324_302", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1543948477241_299049_20934")] + [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1565500905804_589845_30779")] [RedefinedByProperty("ICaseUsage.CaseDefinition")] [Implements(implementation: "ICalculationUsage.CalculationDefinition")] IFunction Systems.Calculations.ICalculationUsage.calculationDefinition => this.caseDefinition; @@ -191,7 +195,7 @@ public VerificationCaseUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -220,6 +224,7 @@ public VerificationCaseUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -744,6 +749,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -794,8 +800,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. ((SysML2.NET.Core.POCO.Systems.Actions.IActionUsage)this).actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -1038,6 +1045,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1152,6 +1160,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595190279083_51021_1128", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "ICaseUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/ViewDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ViewDefinition.cs index 629e2669..753cfa0c 100644 --- a/SysML2.NET/Core/AutoGenPoco/ViewDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ViewDefinition.cs @@ -139,6 +139,7 @@ public ViewDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -669,6 +670,7 @@ public ViewDefinition() /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); diff --git a/SysML2.NET/Core/AutoGenPoco/ViewUsage.cs b/SysML2.NET/Core/AutoGenPoco/ViewUsage.cs index ad3c9003..3767338e 100644 --- a/SysML2.NET/Core/AutoGenPoco/ViewUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ViewUsage.cs @@ -175,6 +175,7 @@ public ViewUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -701,6 +702,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -987,6 +989,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Core/AutoGenPoco/ViewpointDefinition.cs b/SysML2.NET/Core/AutoGenPoco/ViewpointDefinition.cs index 94ffce6f..d2c2d5f0 100644 --- a/SysML2.NET/Core/AutoGenPoco/ViewpointDefinition.cs +++ b/SysML2.NET/Core/AutoGenPoco/ViewpointDefinition.cs @@ -94,6 +94,7 @@ public ViewpointDefinition() /// [Property(xmiId: "_19_0_4_12e503d9_1621564041941_652319_2722", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -166,6 +167,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565495064714_974634_26150", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -724,6 +726,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_18_5_3_12e503d9_1565479686637_967933_23236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IDefinition.OwnedUsage")] public List ownedUsage => this.ComputeOwnedUsage(); @@ -861,6 +864,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_4_12e503d9_1624033010374_29375_40166", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -877,6 +881,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1595189007408_784255_586", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1543948010065_362066_20413")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_48981_27786")] [Implements(implementation: "IRequirementDefinition.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/ViewpointUsage.cs b/SysML2.NET/Core/AutoGenPoco/ViewpointUsage.cs index b3192031..0efed213 100644 --- a/SysML2.NET/Core/AutoGenPoco/ViewpointUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/ViewpointUsage.cs @@ -95,6 +95,7 @@ public ViewpointUsage() /// [Property(xmiId: "_19_0_4_12e503d9_1621564075474_350859_2735", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.ActorParameter")] public List actorParameter => this.ComputeActorParameter(); @@ -220,6 +221,7 @@ string Root.Elements.IElement.DeclaredShortName /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -753,6 +755,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -1039,6 +1042,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); @@ -1191,6 +1195,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1624032823963_328647_40107", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.StakeholderParameter")] public List stakeholderParameter => this.ComputeStakeholderParameter(); @@ -1199,6 +1204,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_2_12e503d9_1595189397261_941898_844", aggregation: AggregationKind.None, lowerValue: 1, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1595189174990_213826_657")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IRequirementUsage.SubjectParameter")] public IUsage subjectParameter => this.ComputeSubjectParameter(); diff --git a/SysML2.NET/Core/AutoGenPoco/WhileLoopActionUsage.cs b/SysML2.NET/Core/AutoGenPoco/WhileLoopActionUsage.cs index 86ab9ff4..7c3b3eb9 100644 --- a/SysML2.NET/Core/AutoGenPoco/WhileLoopActionUsage.cs +++ b/SysML2.NET/Core/AutoGenPoco/WhileLoopActionUsage.cs @@ -101,6 +101,7 @@ public WhileLoopActionUsage() /// [Property(xmiId: "_18_5_3_12e503d9_1565500905804_589845_30779", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_18_5_3_b9102da_1536346315176_954314_17388")] + [RedefinedProperty(propertyName: "_19_0_4_12e503d9_1618943843466_158863_236")] [Implements(implementation: "IActionUsage.ActionDefinition")] public List actionDefinition => this.ComputeActionDefinition(); @@ -176,7 +177,7 @@ public WhileLoopActionUsage() [RedefinedProperty(propertyName: "_18_5_3_12e503d9_1533160674969_376003_43216")] [RedefinedByProperty("IOccurrenceUsage.OccurrenceDefinition")] [Implements(implementation: "IUsage.Definition")] - List Systems.DefinitionAndUsage.IUsage.definition => [.. this.occurrenceDefinition]; + List Systems.DefinitionAndUsage.IUsage.definition => [.. ((SysML2.NET.Core.POCO.Systems.Occurrences.IOccurrenceUsage)this).occurrenceDefinition]; /// /// The interpretations of a Type with differencingTypes are asserted to be those of the first of those @@ -205,6 +206,7 @@ public WhileLoopActionUsage() /// [Property(xmiId: "_19_0_2_12e503d9_1591217699198_66279_508", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_19_0_4_12e503d9_1623952188842_882068_37169")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.DirectedUsage")] public List directedUsage => this.ComputeDirectedUsage(); @@ -712,6 +714,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565472757327_162097_21259", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674959_226999_43167")] + [SubsettedProperty(propertyName: "_19_0_2_12e503d9_1591217543254_26688_475")] [Implements(implementation: "IUsage.NestedUsage")] public List nestedUsage => this.ComputeNestedUsage(); @@ -754,8 +757,9 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_19_0_4_12e503d9_1618943843466_158863_236", aggregation: AggregationKind.None, lowerValue: 0, upperValue: int.MaxValue, isOrdered: true, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [RedefinedProperty(propertyName: "_19_0_2_12e503d9_1591477641252_179221_958")] + [RedefinedByProperty("IActionUsage.ActionDefinition")] [Implements(implementation: "IOccurrenceUsage.OccurrenceDefinition")] - public List occurrenceDefinition => this.ComputeOccurrenceDefinition(); + List Systems.Occurrences.IOccurrenceUsage.occurrenceDefinition => [.. this.actionDefinition]; /// /// All features related to this Type by FeatureMemberships that have direction out or inout. @@ -998,6 +1002,7 @@ bool Core.Features.IFeature.IsVariable /// [Property(xmiId: "_18_5_3_12e503d9_1565479686638_420576_23237", aggregation: AggregationKind.None, lowerValue: 0, upperValue: 1, isOrdered: false, isReadOnly: false, isDerived: true, isDerivedUnion: false, isUnique: true, defaultValue: null)] [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1533160674965_592215_43200")] + [SubsettedProperty(propertyName: "_18_5_3_12e503d9_1565498571495_18876_27787")] [Implements(implementation: "IUsage.OwningDefinition")] public IDefinition owningDefinition => this.ComputeOwningDefinition(); diff --git a/SysML2.NET/Extend/ActionUsageExtensions.cs b/SysML2.NET/Extend/ActionUsageExtensions.cs index 618be645..2b2f3dc7 100644 --- a/SysML2.NET/Extend/ActionUsageExtensions.cs +++ b/SysML2.NET/Extend/ActionUsageExtensions.cs @@ -50,7 +50,7 @@ internal static List ComputeActionDefinition(this IActionUsage action { return actionUsageSubject == null ? throw new ArgumentNullException(nameof(actionUsageSubject)) - : [.. actionUsageSubject.OwnedRelationship.OfType().Select(featureTyping => featureTyping.Type).OfType()]; + : [.. FeatureExtensions.ComputeType(actionUsageSubject).OfType()]; } /// diff --git a/SysML2.NET/Extend/AllocationUsageExtensions.cs b/SysML2.NET/Extend/AllocationUsageExtensions.cs index ea4268e7..adb266bd 100644 --- a/SysML2.NET/Extend/AllocationUsageExtensions.cs +++ b/SysML2.NET/Extend/AllocationUsageExtensions.cs @@ -78,10 +78,7 @@ internal static List ComputeAllocationDefinition(this IAl { return allocationUsageSubject == null ? throw new ArgumentNullException(nameof(allocationUsageSubject)) - : [..allocationUsageSubject.OwnedRelationship - .OfType() - .Select(featureTyping => featureTyping.Type) - .OfType()]; + : [..FeatureExtensions.ComputeType(allocationUsageSubject).OfType()]; } } diff --git a/SysML2.NET/Extend/AnalysisCaseUsageExtensions.cs b/SysML2.NET/Extend/AnalysisCaseUsageExtensions.cs index 1a4bc157..fd80fab5 100644 --- a/SysML2.NET/Extend/AnalysisCaseUsageExtensions.cs +++ b/SysML2.NET/Extend/AnalysisCaseUsageExtensions.cs @@ -89,7 +89,7 @@ internal static IAnalysisCaseDefinition ComputeAnalysisCaseDefinition(this IAnal { return analysisCaseUsageSubject == null ? throw new ArgumentNullException(nameof(analysisCaseUsageSubject)) - : analysisCaseUsageSubject.definition.SingleOrDefaultStrict(nameof(analysisCaseUsageSubject)); + : FeatureExtensions.ComputeType(analysisCaseUsageSubject).SingleOrDefaultStrict(nameof(analysisCaseUsageSubject)); } /// diff --git a/SysML2.NET/Extend/AttributeUsageExtensions.cs b/SysML2.NET/Extend/AttributeUsageExtensions.cs index 9d52443e..cd9742a2 100644 --- a/SysML2.NET/Extend/AttributeUsageExtensions.cs +++ b/SysML2.NET/Extend/AttributeUsageExtensions.cs @@ -82,7 +82,7 @@ internal static List ComputeAttributeDefinition(this IAttributeUsage { return attributeUsageSubject == null ? throw new ArgumentNullException(nameof(attributeUsageSubject)) - : [..attributeUsageSubject.OwnedRelationship.OfType().Select(featureTyping => featureTyping.Type).OfType()]; + : [.. FeatureExtensions.ComputeType(attributeUsageSubject).OfType()]; } /// diff --git a/SysML2.NET/Extend/CalculationUsageExtensions.cs b/SysML2.NET/Extend/CalculationUsageExtensions.cs index 18fcd4de..4b9aa63b 100644 --- a/SysML2.NET/Extend/CalculationUsageExtensions.cs +++ b/SysML2.NET/Extend/CalculationUsageExtensions.cs @@ -88,7 +88,7 @@ internal static IFunction ComputeCalculationDefinition(this ICalculationUsage ca { return calculationUsageSubject == null ? throw new ArgumentNullException(nameof(calculationUsageSubject)) - : calculationUsageSubject.definition.SingleOrDefaultStrict(nameof(calculationUsageSubject)); + : FeatureExtensions.ComputeType(calculationUsageSubject).SingleOrDefaultStrict(nameof(calculationUsageSubject)); } /// diff --git a/SysML2.NET/Extend/CaseUsageExtensions.cs b/SysML2.NET/Extend/CaseUsageExtensions.cs index d8628daf..19c26da5 100644 --- a/SysML2.NET/Extend/CaseUsageExtensions.cs +++ b/SysML2.NET/Extend/CaseUsageExtensions.cs @@ -113,7 +113,7 @@ internal static ICaseDefinition ComputeCaseDefinition(this ICaseUsage caseUsageS { return caseUsageSubject == null ? throw new ArgumentNullException(nameof(caseUsageSubject)) - : caseUsageSubject.definition.SingleOrDefaultStrict(nameof(caseUsageSubject)); + : FeatureExtensions.ComputeType(caseUsageSubject).SingleOrDefaultStrict(nameof(caseUsageSubject)); } /// diff --git a/SysML2.NET/Extend/ConcernUsageExtensions.cs b/SysML2.NET/Extend/ConcernUsageExtensions.cs index c0be88bb..1cd0cd6b 100644 --- a/SysML2.NET/Extend/ConcernUsageExtensions.cs +++ b/SysML2.NET/Extend/ConcernUsageExtensions.cs @@ -45,11 +45,7 @@ internal static IConcernDefinition ComputeConcernDefinition(this IConcernUsage c { return concernUsageSubject == null ? throw new ArgumentNullException(nameof(concernUsageSubject)) - : concernUsageSubject.OwnedRelationship - .OfType() - .Select(featureTyping => featureTyping.Type) - .OfType() - .SingleOrDefaultStrict(nameof(concernUsageSubject)); + : FeatureExtensions.ComputeType(concernUsageSubject).SingleOrDefaultStrict(nameof(concernUsageSubject)); } } } diff --git a/SysML2.NET/Extend/ConnectionUsageExtensions.cs b/SysML2.NET/Extend/ConnectionUsageExtensions.cs index 89fdf71a..1f59bed0 100644 --- a/SysML2.NET/Extend/ConnectionUsageExtensions.cs +++ b/SysML2.NET/Extend/ConnectionUsageExtensions.cs @@ -78,10 +78,7 @@ internal static List ComputeConnectionDefinition(this ICo { return connectionUsageSubject == null ? throw new ArgumentNullException(nameof(connectionUsageSubject)) - : [..connectionUsageSubject.OwnedRelationship - .OfType() - .Select(featureTyping => featureTyping.Type) - .OfType()]; + : [.. FeatureExtensions.ComputeType(connectionUsageSubject).OfType()]; } } diff --git a/SysML2.NET/Extend/ConnectorExtensions.cs b/SysML2.NET/Extend/ConnectorExtensions.cs index 57b9359e..9d563278 100644 --- a/SysML2.NET/Extend/ConnectorExtensions.cs +++ b/SysML2.NET/Extend/ConnectorExtensions.cs @@ -47,10 +47,7 @@ internal static List ComputeAssociation(this IConnector connectorS { return connectorSubject == null ? throw new ArgumentNullException(nameof(connectorSubject)) - : [..connectorSubject.OwnedRelationship - .OfType() - .Select(featureTyping => featureTyping.Type) - .OfType()]; + : [.. FeatureExtensions.ComputeType(connectorSubject).OfType()]; } /// diff --git a/SysML2.NET/Extend/ConstraintUsageExtensions.cs b/SysML2.NET/Extend/ConstraintUsageExtensions.cs index e529610f..71f49cc2 100644 --- a/SysML2.NET/Extend/ConstraintUsageExtensions.cs +++ b/SysML2.NET/Extend/ConstraintUsageExtensions.cs @@ -88,7 +88,7 @@ internal static IPredicate ComputeConstraintDefinition(this IConstraintUsage con { return constraintUsageSubject == null ? throw new ArgumentNullException(nameof(constraintUsageSubject)) - : constraintUsageSubject.definition.SingleOrDefaultStrict(nameof(constraintUsageSubject)); + : FeatureExtensions.ComputeType(constraintUsageSubject).SingleOrDefaultStrict(nameof(constraintUsageSubject)); } /// diff --git a/SysML2.NET/Extend/FlowExtensions.cs b/SysML2.NET/Extend/FlowExtensions.cs index c0e10983..8c098695 100644 --- a/SysML2.NET/Extend/FlowExtensions.cs +++ b/SysML2.NET/Extend/FlowExtensions.cs @@ -72,7 +72,7 @@ internal static List ComputeInteraction(this IFlow flowSubject) { return flowSubject == null ? throw new ArgumentNullException(nameof(flowSubject)) - : [..flowSubject.OwnedRelationship.OfType().Select(featureTyping => featureTyping.Type).OfType()]; + : [.. FeatureExtensions.ComputeType(flowSubject).OfType()]; } /// diff --git a/SysML2.NET/Extend/InterfaceUsageExtensions.cs b/SysML2.NET/Extend/InterfaceUsageExtensions.cs index 277c91f2..cf0c872e 100644 --- a/SysML2.NET/Extend/InterfaceUsageExtensions.cs +++ b/SysML2.NET/Extend/InterfaceUsageExtensions.cs @@ -45,13 +45,7 @@ internal static List ComputeInterfaceDefinition(this IInte { return interfaceUsageSubject == null ? throw new ArgumentNullException(nameof(interfaceUsageSubject)) - : - [ - ..interfaceUsageSubject.OwnedRelationship - .OfType() - .Select(featureTyping => featureTyping.Type) - .OfType() - ]; + : [.. FeatureExtensions.ComputeType(interfaceUsageSubject).OfType()]; } } } diff --git a/SysML2.NET/Extend/PartUsageExtensions.cs b/SysML2.NET/Extend/PartUsageExtensions.cs index 9a53751e..707f0a29 100644 --- a/SysML2.NET/Extend/PartUsageExtensions.cs +++ b/SysML2.NET/Extend/PartUsageExtensions.cs @@ -82,7 +82,7 @@ internal static List ComputePartDefinition(this IPartUsage part { return partUsageSubject == null ? throw new ArgumentNullException(nameof(partUsageSubject)) - : [..partUsageSubject.itemDefinition.OfType()]; + : [.. FeatureExtensions.ComputeType(partUsageSubject).OfType()]; } } diff --git a/SysML2.NET/Extend/PortUsageExtensions.cs b/SysML2.NET/Extend/PortUsageExtensions.cs index 0afedf15..3e26b85f 100644 --- a/SysML2.NET/Extend/PortUsageExtensions.cs +++ b/SysML2.NET/Extend/PortUsageExtensions.cs @@ -45,13 +45,7 @@ internal static List ComputePortDefinition(this IPortUsage port { return portUsageSubject == null ? throw new ArgumentNullException(nameof(portUsageSubject)) - : - [ - ..portUsageSubject.OwnedRelationship - .OfType() - .Select(featureTyping => featureTyping.Type) - .OfType() - ]; + : [.. FeatureExtensions.ComputeType(portUsageSubject).OfType()]; } } } diff --git a/SysML2.NET/Extend/RenderingUsageExtensions.cs b/SysML2.NET/Extend/RenderingUsageExtensions.cs index 0db3bfed..581c532b 100644 --- a/SysML2.NET/Extend/RenderingUsageExtensions.cs +++ b/SysML2.NET/Extend/RenderingUsageExtensions.cs @@ -88,7 +88,7 @@ internal static IRenderingDefinition ComputeRenderingDefinition(this IRenderingU { return renderingUsageSubject == null ? throw new ArgumentNullException(nameof(renderingUsageSubject)) - : renderingUsageSubject.definition.SingleOrDefaultStrict(nameof(renderingUsageSubject)); + : FeatureExtensions.ComputeType(renderingUsageSubject).SingleOrDefaultStrict(nameof(renderingUsageSubject)); } } diff --git a/SysML2.NET/Extend/RequirementUsageExtensions.cs b/SysML2.NET/Extend/RequirementUsageExtensions.cs index 88201708..6a59c166 100644 --- a/SysML2.NET/Extend/RequirementUsageExtensions.cs +++ b/SysML2.NET/Extend/RequirementUsageExtensions.cs @@ -167,7 +167,7 @@ internal static IRequirementDefinition ComputeRequirementDefinition(this IRequir { return requirementUsageSubject == null ? throw new ArgumentNullException(nameof(requirementUsageSubject)) - : requirementUsageSubject.definition.SingleOrDefaultStrict(nameof(requirementUsageSubject)); + : FeatureExtensions.ComputeType(requirementUsageSubject).SingleOrDefaultStrict(nameof(requirementUsageSubject)); } /// diff --git a/SysML2.NET/Extend/StateUsageExtensions.cs b/SysML2.NET/Extend/StateUsageExtensions.cs index 7c71586a..b2d2ced1 100644 --- a/SysML2.NET/Extend/StateUsageExtensions.cs +++ b/SysML2.NET/Extend/StateUsageExtensions.cs @@ -153,11 +153,7 @@ internal static List ComputeStateDefinition(this IStateUsage stateUsa { return stateUsageSubject == null ? throw new ArgumentNullException(nameof(stateUsageSubject)) - : [ - .. stateUsageSubject.OwnedRelationship.OfType() - .Select(featureTyping => featureTyping.Type) - .OfType() - ]; + : [.. FeatureExtensions.ComputeType(stateUsageSubject).OfType()]; } /// diff --git a/SysML2.NET/Extend/UsageExtensions.cs b/SysML2.NET/Extend/UsageExtensions.cs index 754beb12..e694d7eb 100644 --- a/SysML2.NET/Extend/UsageExtensions.cs +++ b/SysML2.NET/Extend/UsageExtensions.cs @@ -65,13 +65,13 @@ internal static class UsageExtensions /// internal static List ComputeDefinition(this IUsage usageSubject) { - // Walk OwnedRelationship → IFeatureTyping → Type directly. Cannot use - // usageSubject.type because the Usage POCO's IFeature.type explicitly delegates - // to .definition (the redefining property), which calls back into this method + // Route through the shared static ComputeType (Pilot-style shared computation). + // Cannot use usageSubject.type: under strict-UML delegation the POCO's IFeature.type + // delegates to the narrowest redefinition, whose getter calls back into this method // → infinite recursion + stack overflow. return usageSubject == null ? throw new ArgumentNullException(nameof(usageSubject)) - : [..usageSubject.OwnedRelationship.OfType().Select(featureTyping => featureTyping.Type).OfType()]; + : [.. FeatureExtensions.ComputeType(usageSubject).OfType()]; } /// diff --git a/SysML2.NET/Extend/VerificationCaseUsageExtensions.cs b/SysML2.NET/Extend/VerificationCaseUsageExtensions.cs index c233b515..e6308d69 100644 --- a/SysML2.NET/Extend/VerificationCaseUsageExtensions.cs +++ b/SysML2.NET/Extend/VerificationCaseUsageExtensions.cs @@ -89,7 +89,7 @@ internal static IVerificationCaseDefinition ComputeVerificationCaseDefinition(th { return verificationCaseUsageSubject == null ? throw new ArgumentNullException(nameof(verificationCaseUsageSubject)) - : verificationCaseUsageSubject.definition.SingleOrDefaultStrict(nameof(verificationCaseUsageSubject)); + : FeatureExtensions.ComputeType(verificationCaseUsageSubject).SingleOrDefaultStrict(nameof(verificationCaseUsageSubject)); } /// diff --git a/SysML2.NET/Extend/ViewUsageExtensions.cs b/SysML2.NET/Extend/ViewUsageExtensions.cs index a771f94b..2abaa6f7 100644 --- a/SysML2.NET/Extend/ViewUsageExtensions.cs +++ b/SysML2.NET/Extend/ViewUsageExtensions.cs @@ -148,7 +148,7 @@ internal static List ComputeViewCondition(this IViewUsage viewUsage /// internal static IViewDefinition ComputeViewDefinition(this IViewUsage viewUsageSubject) { - return viewUsageSubject is null ? throw new ArgumentNullException(nameof(viewUsageSubject)) : viewUsageSubject.definition.SingleOrDefaultStrict(nameof(viewUsageSubject)); + return viewUsageSubject is null ? throw new ArgumentNullException(nameof(viewUsageSubject)) : FeatureExtensions.ComputeType(viewUsageSubject).SingleOrDefaultStrict(nameof(viewUsageSubject)); } /// diff --git a/SysML2.NET/Extend/ViewpointUsageExtensions.cs b/SysML2.NET/Extend/ViewpointUsageExtensions.cs index 8e980dcc..68c3cf72 100644 --- a/SysML2.NET/Extend/ViewpointUsageExtensions.cs +++ b/SysML2.NET/Extend/ViewpointUsageExtensions.cs @@ -89,7 +89,7 @@ internal static IViewpointDefinition ComputeViewpointDefinition(this IViewpointU { return viewpointUsageSubject == null ? throw new ArgumentNullException(nameof(viewpointUsageSubject)) - : viewpointUsageSubject.definition.SingleOrDefaultStrict(nameof(viewpointUsageSubject)); + : FeatureExtensions.ComputeType(viewpointUsageSubject).SingleOrDefaultStrict(nameof(viewpointUsageSubject)); } ///