Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -172,14 +172,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_HydraulicData))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_InsideWaterLevel_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_InsideWaterLevel_Description))] - public ConfirmingNormalDistributionProperties InsideWaterLevel + public ConfirmingNormalDistributionProperties InsideWaterLevel { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.InsideWaterLevel, - data.WrappedData, PropertyChangeHandler); } } @@ -189,7 +188,7 @@ #region Model factors [DynamicVisible] - public override ConfirmingNormalDistributionProperties ModelFactorSuperCriticalFlow + public override ConfirmingNormalDistributionProperties ModelFactorSuperCriticalFlow { get { @@ -203,14 +202,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_DrainCoefficient_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_DrainCoefficient_Description))] - public ConfirmingNormalDistributionProperties DrainCoefficient + public ConfirmingNormalDistributionProperties DrainCoefficient { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.StandardDeviation, data.WrappedData.DrainCoefficient, - data.WrappedData, PropertyChangeHandler); } } @@ -249,7 +247,7 @@ } [DynamicVisible] - public override ConfirmingNormalDistributionProperties WidthFlowApertures + public override ConfirmingNormalDistributionProperties WidthFlowApertures { get { @@ -280,14 +278,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ThresholdHeightOpenWeir_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ThresholdHeightOpenWeir_Description))] - public ConfirmingNormalDistributionProperties ThresholdHeightOpenWeir + public ConfirmingNormalDistributionProperties ThresholdHeightOpenWeir { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.ThresholdHeightOpenWeir, - data.WrappedData, PropertyChangeHandler); } } @@ -298,14 +295,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_AreaFlowApertures_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_AreaFlowApertures_Description))] - public ConfirmingLogNormalDistributionProperties AreaFlowApertures + public ConfirmingLogNormalDistributionProperties AreaFlowApertures { get { - return new ConfirmingLogNormalDistributionProperties( + return new ConfirmingLogNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.AreaFlowApertures, - data.WrappedData, PropertyChangeHandler); } } @@ -372,14 +368,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.LevelCrestStructureNotClosing_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.LevelCrestStructureNotClosing_Description))] - public ConfirmingNormalDistributionProperties LevelCrestStructureNotClosing + public ConfirmingNormalDistributionProperties LevelCrestStructureNotClosing { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.LevelCrestStructureNotClosing, - data.WrappedData, PropertyChangeHandler); } } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingDistributionPropertiesBase.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingDistributionPropertiesBase.cs (.../ConfirmingDistributionPropertiesBase.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingDistributionPropertiesBase.cs (.../ConfirmingDistributionPropertiesBase.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -34,29 +34,25 @@ /// /// Properties class for implementations of . /// - public abstract class ConfirmingDistributionPropertiesBase : ObjectProperties + public abstract class ConfirmingDistributionPropertiesBase : ObjectProperties where TDistribution : IDistribution - where TPropertyOwner : IObservable { private const string meanPropertyName = nameof(Mean); private const string standardDeviationPropertyName = nameof(StandardDeviation); private readonly bool isMeanReadOnly; private readonly bool isStandardDeviationReadOnly; - private readonly TPropertyOwner propertyOwner; private readonly IObservablePropertyChangeHandler changeHandler; /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// Indicates which properties, if any, should be marked as read-only. /// The data of the to create the properties for. - /// The owner of the property. /// The handler responsible for handling effects of a property change. /// Thrown when is null /// or when any number of properties in this class is editable and any other parameter is null. protected ConfirmingDistributionPropertiesBase(DistributionPropertiesReadOnly propertiesReadOnly, TDistribution distribution, - TPropertyOwner propertyOwner, IObservablePropertyChangeHandler handler) { if (distribution == null) @@ -65,10 +61,6 @@ } if (!propertiesReadOnly.HasFlag(DistributionPropertiesReadOnly.All)) { - if (propertyOwner == null) - { - throw new ArgumentException(@"PropertyOwner required if changes are possible.", nameof(propertyOwner)); - } if (handler == null) { throw new ArgumentException(@"Change handler required if changes are possible.", nameof(handler)); @@ -79,7 +71,6 @@ isMeanReadOnly = propertiesReadOnly.HasFlag(DistributionPropertiesReadOnly.Mean); isStandardDeviationReadOnly = propertiesReadOnly.HasFlag(DistributionPropertiesReadOnly.StandardDeviation); - this.propertyOwner = propertyOwner; changeHandler = handler; } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingLogNormalDistributionProperties.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingLogNormalDistributionProperties.cs (.../ConfirmingLogNormalDistributionProperties.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingLogNormalDistributionProperties.cs (.../ConfirmingLogNormalDistributionProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -20,11 +20,9 @@ // All rights reserved. using System; -using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; -using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.Properties; @@ -34,26 +32,22 @@ /// An implementation for /// properties. /// - public class ConfirmingLogNormalDistributionProperties - : ConfirmingDistributionPropertiesBase - where TPropertyOwner : IObservable + public class ConfirmingLogNormalDistributionProperties : ConfirmingDistributionPropertiesBase { /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. - /// The owner of the property. /// Optional handler that is used to handle property changes. /// Thrown when is null /// or when any number of properties in this class is editable and any other parameter is null. public ConfirmingLogNormalDistributionProperties( DistributionPropertiesReadOnly propertiesReadOnly, LogNormalDistribution distribution, - TPropertyOwner propertyOwner, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, propertyOwner, handler) {} + : base(propertiesReadOnly, distribution, handler) {} public override string DistributionType { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingNormalDistributionProperties.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingNormalDistributionProperties.cs (.../ConfirmingNormalDistributionProperties.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingNormalDistributionProperties.cs (.../ConfirmingNormalDistributionProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; @@ -33,26 +32,22 @@ /// An implementation for /// properties. /// - public class ConfirmingNormalDistributionProperties - : ConfirmingDistributionPropertiesBase - where TPropertyOwner : IObservable + public class ConfirmingNormalDistributionProperties : ConfirmingDistributionPropertiesBase { /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. - /// The owner of the property. /// Optional handler that is used to handle property changes. /// Thrown when is null /// or when any number of properties in this class is editable and any other parameter is null. public ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly propertiesReadOnly, NormalDistribution distribution, - TPropertyOwner propertyOwner, IObservablePropertyChangeHandler handler) : - base(propertiesReadOnly, distribution, propertyOwner, handler) {} + base(propertiesReadOnly, distribution, handler) {} public override string DistributionType { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientDistributionPropertiesBase.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientDistributionPropertiesBase.cs (.../ConfirmingVariationCoefficientDistributionPropertiesBase.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientDistributionPropertiesBase.cs (.../ConfirmingVariationCoefficientDistributionPropertiesBase.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -34,30 +34,26 @@ /// /// Properties class for implementations of . /// - public abstract class ConfirmingVariationCoefficientDistributionPropertiesBase : ObjectProperties + public abstract class ConfirmingVariationCoefficientDistributionPropertiesBase : ObjectProperties where TDistribution : IVariationCoefficientDistribution - where TPropertyOwner : IObservable { private const string meanPropertyName = nameof(Mean); private readonly string variationCoefficientPropertyName = nameof(CoefficientOfVariation); private readonly bool isMeanReadOnly; private readonly bool isVariationCoefficientReadOnly; - private readonly TPropertyOwner propertyOwner; private readonly IObservablePropertyChangeHandler changeHandler; /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// Indicates which properties, if any, should be marked as read-only. /// The data of the to create the properties for. - /// The owner of the property. /// The handler responsible for handling effects of a property change. /// Thrown when is null /// or when any number of properties in this class is editable and any other parameter is null. protected ConfirmingVariationCoefficientDistributionPropertiesBase( VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, TDistribution distribution, - TPropertyOwner propertyOwner, IObservablePropertyChangeHandler handler) { if (distribution == null) @@ -66,10 +62,6 @@ } if (!propertiesReadOnly.HasFlag(VariationCoefficientDistributionPropertiesReadOnly.All)) { - if (propertyOwner == null) - { - throw new ArgumentException(@"PropertyOwner required if changes are possible.", nameof(propertyOwner)); - } if (handler == null) { throw new ArgumentException(@"Change handler required if changes are possible.", nameof(handler)); @@ -80,7 +72,6 @@ isMeanReadOnly = propertiesReadOnly.HasFlag(VariationCoefficientDistributionPropertiesReadOnly.Mean); isVariationCoefficientReadOnly = propertiesReadOnly.HasFlag(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation); - this.propertyOwner = propertyOwner; changeHandler = handler; } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientLogNormalDistributionProperties.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientLogNormalDistributionProperties.cs (.../ConfirmingVariationCoefficientLogNormalDistributionProperties.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientLogNormalDistributionProperties.cs (.../ConfirmingVariationCoefficientLogNormalDistributionProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; @@ -32,26 +31,22 @@ /// /// An implementation for . /// - public class ConfirmingVariationCoefficientLogNormalDistributionProperties - : ConfirmingVariationCoefficientDistributionPropertiesBase - where TPropertyOwner : IObservable + public class ConfirmingVariationCoefficientLogNormalDistributionProperties : ConfirmingVariationCoefficientDistributionPropertiesBase { /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. - /// The owner of the property. /// Optional handler that is used to handle property changes. /// Thrown when is null /// or when any number of properties in this class is editable and any other parameter is null. public ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, VariationCoefficientLogNormalDistribution distribution, - TPropertyOwner propertyOwner, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, propertyOwner, handler) {} + : base(propertiesReadOnly, distribution, handler) {} public override string DistributionType { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientNormalDistributionProperties.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientNormalDistributionProperties.cs (.../ConfirmingVariationCoefficientNormalDistributionProperties.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/ConfirmingVariationCoefficientNormalDistributionProperties.cs (.../ConfirmingVariationCoefficientNormalDistributionProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; @@ -32,26 +31,22 @@ /// /// An implementation for . /// - public class ConfirmingVariationCoefficientNormalDistributionProperties - : ConfirmingVariationCoefficientDistributionPropertiesBase - where TPropertyOwner : IObservable + public class ConfirmingVariationCoefficientNormalDistributionProperties : ConfirmingVariationCoefficientDistributionPropertiesBase { /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. - /// The owner of the property. /// Optional handler that is used to handle property changes. /// Thrown when is null /// or when any number of properties in this class is editable and any other parameter is null. public ConfirmingVariationCoefficientNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, VariationCoefficientNormalDistribution distribution, - TPropertyOwner propertyOwner, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, propertyOwner, handler) {} + : base(propertiesReadOnly, distribution, handler) {} public override string DistributionType { Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -141,14 +141,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_ModelSettings))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_ModelFactorSuperCriticalFlow_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_ModelFactorSuperCriticalFlow_Description))] - public virtual ConfirmingNormalDistributionProperties ModelFactorSuperCriticalFlow + public virtual ConfirmingNormalDistributionProperties ModelFactorSuperCriticalFlow { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.StandardDeviation, data.WrappedData.ModelFactorSuperCriticalFlow, - data.WrappedData, PropertyChangeHandler); } } @@ -383,14 +382,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_FlowWidthAtBottomProtection_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_FlowWidthAtBottomProtection_Description))] - public ConfirmingLogNormalDistributionProperties FlowWidthAtBottomProtection + public ConfirmingLogNormalDistributionProperties FlowWidthAtBottomProtection { get { - return new ConfirmingLogNormalDistributionProperties( + return new ConfirmingLogNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.FlowWidthAtBottomProtection, - data.WrappedData, PropertyChangeHandler); } } @@ -400,14 +398,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_WidthFlowApertures_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_WidthFlowApertures_Description))] - public virtual ConfirmingNormalDistributionProperties WidthFlowApertures + public virtual ConfirmingNormalDistributionProperties WidthFlowApertures { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.WidthFlowApertures, - data.WrappedData, PropertyChangeHandler); } } @@ -417,14 +414,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_StorageStructureArea_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_StorageStructureArea_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties StorageStructureArea + public ConfirmingVariationCoefficientLogNormalDistributionProperties StorageStructureArea { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.StorageStructureArea, - data.WrappedData, PropertyChangeHandler); } } @@ -434,14 +430,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_AllowedLevelIncreaseStorage_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_AllowedLevelIncreaseStorage_Description))] - public ConfirmingLogNormalDistributionProperties AllowedLevelIncreaseStorage + public ConfirmingLogNormalDistributionProperties AllowedLevelIncreaseStorage { get { - return new ConfirmingLogNormalDistributionProperties( + return new ConfirmingLogNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.AllowedLevelIncreaseStorage, - data.WrappedData, PropertyChangeHandler); } } @@ -451,14 +446,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_CriticalOvertoppingDischarge_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_CriticalOvertoppingDischarge_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties CriticalOvertoppingDischarge + public ConfirmingVariationCoefficientLogNormalDistributionProperties CriticalOvertoppingDischarge { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.CriticalOvertoppingDischarge, - data.WrappedData, PropertyChangeHandler); } } @@ -558,14 +552,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_HydraulicData))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_StormDuration_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_StormDuration_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties StormDuration + public ConfirmingVariationCoefficientLogNormalDistributionProperties StormDuration { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, data.WrappedData.StormDuration, - data.WrappedData, PropertyChangeHandler); } } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingDistributionPropertiesBaseTest.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingDistributionPropertiesBaseTest.cs (.../ConfirmingDistributionPropertiesBaseTest.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingDistributionPropertiesBaseTest.cs (.../ConfirmingDistributionPropertiesBaseTest.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -26,7 +26,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.Properties; using Ringtoets.Common.Forms.PropertyClasses; @@ -46,10 +45,10 @@ mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.All, distribution, null, null); + var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.All, distribution, null); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.AreSame(distribution, properties.Data); mocks.VerifyAll(); } @@ -62,35 +61,13 @@ DistributionPropertiesReadOnly flags) { // Call - TestDelegate call = () => new SimpleDistributionProperties(flags, null, null, null); + TestDelegate call = () => new SimpleDistributionProperties(flags, null, null); // Assert string paramName = Assert.Throws(call).ParamName; Assert.AreEqual("distribution", paramName); } - - [Test] - [TestCase(DistributionPropertiesReadOnly.Mean)] - [TestCase(DistributionPropertiesReadOnly.StandardDeviation)] - [TestCase(DistributionPropertiesReadOnly.None)] - public void Constructor_NoPropertyOwnerSetWhileChangesPossible_ThrowArgumentException( - DistributionPropertiesReadOnly flags) - { - // Setup - var mocks = new MockRepository(); - var distribution = mocks.Stub(); - mocks.ReplayAll(); - // Call - TestDelegate call = () => new SimpleDistributionProperties(flags, distribution, null, null); - - // Assert - var message = "PropertyOwner required if changes are possible."; - var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, message); - Assert.AreEqual("propertyOwner", exception.ParamName); - mocks.VerifyAll(); - } - [Test] [TestCase(DistributionPropertiesReadOnly.Mean)] [TestCase(DistributionPropertiesReadOnly.StandardDeviation)] @@ -101,11 +78,10 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); mocks.ReplayAll(); // Call - TestDelegate call = () => new SimpleDistributionProperties(flags, distribution, input, null); + TestDelegate call = () => new SimpleDistributionProperties(flags, distribution, null); // Assert var message = "Change handler required if changes are possible."; @@ -124,12 +100,11 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, input, handler); + var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -168,11 +143,10 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, input, handler); + var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); // Call bool meanIsReadOnly = properties.DynamicReadOnlyValidationMethod("Mean"); @@ -195,12 +169,11 @@ distribution.Mean = new RoundedDouble(1, 1.1); distribution.StandardDeviation = new RoundedDouble(2, 2.2); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, distribution, input, handler); + var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, distribution, handler); // Assert Assert.AreEqual(distribution.Mean, properties.Mean); @@ -219,14 +192,12 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); var properties = new SimpleDistributionProperties( DistributionPropertiesReadOnly.All, distribution, - input, handler); // Call @@ -245,7 +216,6 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var observerableMock = mocks.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); @@ -259,7 +229,6 @@ var properties = new SimpleDistributionProperties( DistributionPropertiesReadOnly.None, distribution, - input, handler); // Call @@ -278,14 +247,12 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); var properties = new SimpleDistributionProperties( propertiesReadOnly, distribution, - input, handler); // Call @@ -304,7 +271,6 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var observerableMock = mocks.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); @@ -318,7 +284,6 @@ var properties = new SimpleDistributionProperties( DistributionPropertiesReadOnly.None, distribution, - input, handler); // Call @@ -329,13 +294,12 @@ mocks.VerifyAll(); } - private class SimpleDistributionProperties : ConfirmingDistributionPropertiesBase + private class SimpleDistributionProperties : ConfirmingDistributionPropertiesBase { public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, - IDistribution distribution, - ICalculationInput input, + IDistribution distribution, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, input, handler) {} + : base(propertiesReadOnly, distribution, handler) {} public override string DistributionType { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingLogNormalDistributionPropertiesTest.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingLogNormalDistributionPropertiesTest.cs (.../ConfirmingLogNormalDistributionPropertiesTest.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingLogNormalDistributionPropertiesTest.cs (.../ConfirmingLogNormalDistributionPropertiesTest.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -23,7 +23,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.PropertyClasses; @@ -45,18 +44,17 @@ { // Setup var mocks = new MockRepository(); - var input = mocks.Stub(); var handler = mocks.Stub(); mockRepository.ReplayAll(); var distribution = new LogNormalDistribution(); // Call - var properties = new ConfirmingLogNormalDistributionProperties( - DistributionPropertiesReadOnly.None, distribution, input, handler); + var properties = new ConfirmingLogNormalDistributionProperties( + DistributionPropertiesReadOnly.None, distribution, handler); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.AreSame(distribution, properties.Data); Assert.AreEqual("Lognormaal", properties.DistributionType); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingNormalDistributionPropertiesTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingNormalDistributionPropertiesTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingNormalDistributionPropertiesTest.cs (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -0,0 +1,86 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.ComponentModel; +using Core.Common.TestUtil; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Common.Forms.PropertyClasses; + +namespace Ringtoets.Common.Forms.Test.PropertyClasses +{ + [TestFixture] + public class ConfirmingNormalDistributionPropertiesTest + { + private MockRepository mockRepository; + + [SetUp] + public void SetUp() + { + mockRepository = new MockRepository(); + } + + [Test] + public void Constructor_WithParameters_ExpectedValues() + { + // Setup + var mocks = new MockRepository(); + var handler = mocks.Stub(); + mockRepository.ReplayAll(); + + var distribution = new NormalDistribution(); + + // Call + var properties = new ConfirmingNormalDistributionProperties( + DistributionPropertiesReadOnly.None, distribution, handler); + + // Assert + Assert.IsInstanceOf>(properties); + Assert.AreSame(distribution, properties.Data); + Assert.AreEqual("Normaal", properties.DistributionType); + + PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); + Assert.AreEqual(3, dynamicProperties.Count); + + PropertyDescriptor distributionTypeProperty = dynamicProperties[0]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(distributionTypeProperty, + "Misc", + "Type verdeling", + "Het soort kansverdeling waarin deze parameter gedefinieerd wordt.", + true); + + PropertyDescriptor meanProperty = dynamicProperties[1]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(meanProperty, + "Misc", + "Verwachtingswaarde", + "De gemiddelde waarde van de normale verdeling."); + + PropertyDescriptor standardDeviationProperty = dynamicProperties[2]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(standardDeviationProperty, + "Misc", + "Standaardafwijking", + "De standaardafwijking van de normale verdeling."); + + mockRepository.VerifyAll(); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientDistributionPropertiesBaseTest.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientDistributionPropertiesBaseTest.cs (.../ConfirmingVariationCoefficientDistributionPropertiesBaseTest.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientDistributionPropertiesBaseTest.cs (.../ConfirmingVariationCoefficientDistributionPropertiesBaseTest.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -26,7 +26,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.Properties; using Ringtoets.Common.Forms.PropertyClasses; @@ -46,10 +45,10 @@ mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All, distribution, null, null); + var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All, distribution, null); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.AreSame(distribution, properties.Data); mocks.VerifyAll(); } @@ -62,7 +61,7 @@ VariationCoefficientDistributionPropertiesReadOnly flags) { // Call - TestDelegate call = () => new SimpleDistributionProperties(flags, null, null, null); + TestDelegate call = () => new SimpleDistributionProperties(flags, null, null); // Assert string paramName = Assert.Throws(call).ParamName; @@ -73,39 +72,16 @@ [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean)] [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)] [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None)] - public void Constructor_NoPropertyOwnerSetWhileChangesPossible_ThrowArgumentException( - VariationCoefficientDistributionPropertiesReadOnly flags) - { - // Setup - var mocks = new MockRepository(); - var distribution = mocks.Stub(); - mocks.ReplayAll(); - - // Call - TestDelegate call = () => new SimpleDistributionProperties(flags, distribution, null, null); - - // Assert - var message = "PropertyOwner required if changes are possible."; - var exception = TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, message); - Assert.AreEqual("propertyOwner", exception.ParamName); - mocks.VerifyAll(); - } - - [Test] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None)] public void Constructor_NoHandlerSetWhileChangesPossible_ThrowArgumentException( VariationCoefficientDistributionPropertiesReadOnly flags) { // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); mocks.ReplayAll(); // Call - TestDelegate call = () => new SimpleDistributionProperties(flags, distribution, input, null); + TestDelegate call = () => new SimpleDistributionProperties(flags, distribution, null); // Assert var message = "Change handler required if changes are possible."; @@ -124,12 +100,11 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, input, handler); + var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); @@ -168,11 +143,10 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, input, handler); + var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); // Call bool meanIsReadOnly = properties.DynamicReadOnlyValidationMethod("Mean"); @@ -195,11 +169,10 @@ distribution.Mean = new RoundedDouble(1, 1.1); distribution.CoefficientOfVariation = new RoundedDouble(2, 2.2); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, distribution, input, handler); + var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler); // Call properties.Data = distribution; @@ -221,14 +194,12 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); var properties = new SimpleDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.All, distribution, - input, handler); // Call @@ -247,7 +218,6 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var observerableMock = mocks.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); @@ -261,7 +231,6 @@ var properties = new SimpleDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, distribution, - input, handler); // Call @@ -280,11 +249,10 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, input, handler); + var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); // Call TestDelegate test = () => properties.CoefficientOfVariation = new RoundedDouble(2, 20); @@ -302,7 +270,6 @@ // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); - var input = mocks.Stub(); var observerableMock = mocks.StrictMock(); observerableMock.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); @@ -313,7 +280,7 @@ observerableMock }); - var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, distribution, input, handler) + var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler) { Data = distribution }; @@ -326,13 +293,12 @@ mocks.VerifyAll(); } - private class SimpleDistributionProperties : ConfirmingVariationCoefficientDistributionPropertiesBase + private class SimpleDistributionProperties : ConfirmingVariationCoefficientDistributionPropertiesBase { public SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, - IVariationCoefficientDistribution distribution, - ICalculationInput input, + IVariationCoefficientDistribution distribution, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, input, handler) {} + : base(propertiesReadOnly, distribution, handler) {} public override string DistributionType { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientLogNormalDistributionPropertiesTest.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientLogNormalDistributionPropertiesTest.cs (.../ConfirmingVariationCoefficientLogNormalDistributionPropertiesTest.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientLogNormalDistributionPropertiesTest.cs (.../ConfirmingVariationCoefficientLogNormalDistributionPropertiesTest.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -23,7 +23,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.PropertyClasses; @@ -45,18 +44,17 @@ { // Setup var mocks = new MockRepository(); - var input = mocks.Stub(); var handler = mocks.Stub(); mockRepository.ReplayAll(); var distribution = new VariationCoefficientLogNormalDistribution(); // Call - var properties = new ConfirmingVariationCoefficientLogNormalDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly.None, distribution, input, handler); + var properties = new ConfirmingVariationCoefficientLogNormalDistributionProperties( + VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.AreSame(distribution, properties.Data); Assert.AreEqual("Lognormaal", properties.DistributionType); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientNormalDistributionPropertiesTest.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientNormalDistributionPropertiesTest.cs (.../ConfirmingVariationCoefficientNormalDistributionPropertiesTest.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConfirmingVariationCoefficientNormalDistributionPropertiesTest.cs (.../ConfirmingVariationCoefficientNormalDistributionPropertiesTest.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -23,7 +23,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.PropertyClasses; @@ -45,18 +44,17 @@ { // Setup var mocks = new MockRepository(); - var input = mocks.Stub(); var handler = mocks.Stub(); mockRepository.ReplayAll(); var distribution = new VariationCoefficientNormalDistribution(); // Call - var properties = new ConfirmingVariationCoefficientNormalDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly.None, distribution, input, handler); + var properties = new ConfirmingVariationCoefficientNormalDistributionProperties( + VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.AreSame(distribution, properties.Data); Assert.AreEqual("Normaal", properties.DistributionType); Fisheye: Tag 27398d86e91cb6f81984537f21deddc9c78d580d refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/ConformingNormalDistributionPropertiesTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (.../Ringtoets.Common.Forms.Test.csproj) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -85,7 +85,7 @@ - + Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -226,14 +226,13 @@ [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_CriticalValues))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.CriticalFlowRate_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.CriticalFlowRate_Description))] - public ConfirmingLogNormalDistributionProperties CriticalFlowRate + public ConfirmingLogNormalDistributionProperties CriticalFlowRate { get { - return new ConfirmingLogNormalDistributionProperties( + return new ConfirmingLogNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.CriticalFlowRate, - data.WrappedData, propertyChangeHandler); } } Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -94,14 +94,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_LevelCrestStructure_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_LevelCrestStructure_Description))] - public ConfirmingNormalDistributionProperties LevelCrestStructure + public ConfirmingNormalDistributionProperties LevelCrestStructure { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.LevelCrestStructure, - data.WrappedData, PropertyChangeHandler); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/DesignVariableProperties.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/DesignVariableProperties.cs (.../DesignVariableProperties.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/DesignVariableProperties.cs (.../DesignVariableProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -36,7 +36,7 @@ /// /// The type of the distribution. public abstract class DesignVariableProperties - : ConfirmingDistributionPropertiesBase + : ConfirmingDistributionPropertiesBase where TDistribution : IDistribution { /// @@ -54,7 +54,7 @@ PipingCalculationScenario calculation, PipingInput propertyOwner, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, GetDistribution(designVariable), propertyOwner, handler) + : base(propertiesReadOnly, GetDistribution(designVariable), handler) { DesignVariable = designVariable; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs =================================================================== diff -u -rb41ef82a44c84f0211937d1b7f22794ad8a45941 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision b41ef82a44c84f0211937d1b7f22794ad8a45941) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -78,7 +78,7 @@ handler); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.AreEqual(designVariable.GetDesignValue(), properties.DesignValue); mockRepository.VerifyAll(); } Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs =================================================================== diff -u -r37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79 -r27398d86e91cb6f81984537f21deddc9c78d580d --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 37fc59cc0f3becb92e14b8263bd8e9fc71aa0e79) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 27398d86e91cb6f81984537f21deddc9c78d580d) @@ -204,14 +204,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_HydraulicData))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_InsideWaterLevelFailureConstruction_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_InsideWaterLevelFailureConstruction_Description))] - public ConfirmingNormalDistributionProperties InsideWaterLevelFailureConstruction + public ConfirmingNormalDistributionProperties InsideWaterLevelFailureConstruction { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.InsideWaterLevelFailureConstruction, - data.WrappedData, PropertyChangeHandler); } } @@ -221,14 +220,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_HydraulicData))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_InsideWaterLevel_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_InsideWaterLevel_Description))] - public ConfirmingNormalDistributionProperties InsideWaterLevel + public ConfirmingNormalDistributionProperties InsideWaterLevel { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.InsideWaterLevel, - data.WrappedData, PropertyChangeHandler); } } @@ -238,7 +236,7 @@ #region Model factors and critical values [DynamicVisible] - public override ConfirmingNormalDistributionProperties ModelFactorSuperCriticalFlow + public override ConfirmingNormalDistributionProperties ModelFactorSuperCriticalFlow { get { @@ -252,14 +250,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_ModelSettings))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_DrainCoefficient_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_DrainCoefficient_Description))] - public ConfirmingNormalDistributionProperties DrainCoefficient + public ConfirmingNormalDistributionProperties DrainCoefficient { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.StandardDeviation, data.WrappedData.DrainCoefficient, - data.WrappedData, PropertyChangeHandler); } } @@ -285,7 +282,7 @@ #region Schematization [DynamicVisible] - public override ConfirmingNormalDistributionProperties WidthFlowApertures + public override ConfirmingNormalDistributionProperties WidthFlowApertures { get { @@ -332,14 +329,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_LevelCrestStructure_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_LevelCrestStructure_Description))] - public ConfirmingNormalDistributionProperties LevelCrestStructure + public ConfirmingNormalDistributionProperties LevelCrestStructure { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.LevelCrestStructure, - data.WrappedData, PropertyChangeHandler); } } @@ -349,14 +345,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ThresholdHeightOpenWeir_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_ThresholdHeightOpenWeir_Description))] - public ConfirmingNormalDistributionProperties ThresholdHeightOpenWeir + public ConfirmingNormalDistributionProperties ThresholdHeightOpenWeir { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.ThresholdHeightOpenWeir, - data.WrappedData, PropertyChangeHandler); } } @@ -366,14 +361,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")] [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")] - public ConfirmingVariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable + public ConfirmingVariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable { get { - return new ConfirmingVariationCoefficientNormalDistributionProperties( + return new ConfirmingVariationCoefficientNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, data.WrappedData.FlowVelocityStructureClosable, - data.WrappedData, PropertyChangeHandler); } } @@ -384,14 +378,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_AreaFlowApertures_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Structure_AreaFlowApertures_Description))] - public ConfirmingLogNormalDistributionProperties AreaFlowApertures + public ConfirmingLogNormalDistributionProperties AreaFlowApertures { get { - return new ConfirmingLogNormalDistributionProperties( + return new ConfirmingLogNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.AreaFlowApertures, - data.WrappedData, PropertyChangeHandler); } } @@ -402,14 +395,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_ConstructiveStrengthLinearLoadModel_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_ConstructiveStrengthLinearLoadModel_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties ConstructiveStrengthLinearLoadModel + public ConfirmingVariationCoefficientLogNormalDistributionProperties ConstructiveStrengthLinearLoadModel { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.ConstructiveStrengthLinearLoadModel, - data.WrappedData, PropertyChangeHandler); } } @@ -420,14 +412,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_ConstructiveStrengthQuadraticLoadModel_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_ConstructiveStrengthQuadraticLoadModel_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties ConstructiveStrengthQuadraticLoadModel + public ConfirmingVariationCoefficientLogNormalDistributionProperties ConstructiveStrengthQuadraticLoadModel { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.ConstructiveStrengthQuadraticLoadModel, - data.WrappedData, PropertyChangeHandler); } } @@ -438,14 +429,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_StabilityLinearLoadModel_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_StabilityLinearLoadModel_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties StabilityLinearLoadModel + public ConfirmingVariationCoefficientLogNormalDistributionProperties StabilityLinearLoadModel { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.StabilityLinearLoadModel, - data.WrappedData, PropertyChangeHandler); } } @@ -456,14 +446,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_StabilityQuadraticLoadModel_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_StabilityQuadraticLoadModel_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties StabilityQuadraticLoadModel + public ConfirmingVariationCoefficientLogNormalDistributionProperties StabilityQuadraticLoadModel { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.StabilityQuadraticLoadModel, - data.WrappedData, PropertyChangeHandler); } } @@ -493,14 +482,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_FailureCollisionEnergy_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_FailureCollisionEnergy_Description))] - public ConfirmingVariationCoefficientLogNormalDistributionProperties FailureCollisionEnergy + public ConfirmingVariationCoefficientLogNormalDistributionProperties FailureCollisionEnergy { get { - return new ConfirmingVariationCoefficientLogNormalDistributionProperties( + return new ConfirmingVariationCoefficientLogNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.FailureCollisionEnergy, - data.WrappedData, PropertyChangeHandler); } } @@ -510,14 +498,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_ShipMass_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_ShipMass_Description))] - public ConfirmingVariationCoefficientNormalDistributionProperties ShipMass + public ConfirmingVariationCoefficientNormalDistributionProperties ShipMass { get { - return new ConfirmingVariationCoefficientNormalDistributionProperties( + return new ConfirmingVariationCoefficientNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.ShipMass, - data.WrappedData, PropertyChangeHandler); } } @@ -527,14 +514,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_ShipVelocity_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_ShipVelocity_Description))] - public ConfirmingVariationCoefficientNormalDistributionProperties ShipVelocity + public ConfirmingVariationCoefficientNormalDistributionProperties ShipVelocity { get { - return new ConfirmingVariationCoefficientNormalDistributionProperties( + return new ConfirmingVariationCoefficientNormalDistributionProperties( VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData.ShipVelocity, - data.WrappedData, PropertyChangeHandler); } } @@ -580,14 +566,13 @@ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_BankWidth_DisplayName))] [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_BankWidth_Description))] - public ConfirmingNormalDistributionProperties BankWidth + public ConfirmingNormalDistributionProperties BankWidth { get { - return new ConfirmingNormalDistributionProperties( + return new ConfirmingNormalDistributionProperties( DistributionPropertiesReadOnly.None, data.WrappedData.BankWidth, - data.WrappedData, PropertyChangeHandler); } }