Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs =================================================================== diff -u -re1c814a659648b96eb2d49745ffb290cbb6fc10f -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision e1c814a659648b96eb2d49745ffb290cbb6fc10f) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -150,7 +150,7 @@ get { return new NormalDistributionProperties( - DistributionPropertiesReadOnly.StandardDeviation, + DistributionReadOnlyProperties.StandardDeviation, data.WrappedData.ModelFactorSuperCriticalFlow, PropertyChangeHandler); } @@ -408,8 +408,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.LevelCrestStructureNotClosing, PropertyChangeHandler); } @@ -428,8 +428,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.InsideWaterLevel, PropertyChangeHandler); } @@ -448,8 +448,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.ThresholdHeightOpenWeir, PropertyChangeHandler); } @@ -468,8 +468,8 @@ { return new LogNormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.AreaFlowApertures, PropertyChangeHandler); } @@ -487,7 +487,7 @@ get { return new NormalDistributionProperties( - DistributionPropertiesReadOnly.StandardDeviation, + DistributionReadOnlyProperties.StandardDeviation, data.WrappedData.DrainCoefficient, PropertyChangeHandler); } Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignVariableProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignVariableProperties.cs (.../DesignVariableProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DesignVariableProperties.cs (.../DesignVariableProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -39,15 +39,15 @@ /// /// Creates a new . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The data of the to create the properties for. /// 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 DesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly, + protected DesignVariableProperties(DistributionReadOnlyProperties readOnlyProperties, DesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, GetDistribution(designVariable), handler) + : base(readOnlyProperties, GetDistribution(designVariable), handler) { DesignVariable = designVariable; } Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs =================================================================== diff -u -rf42e68ad241081a9bb8bf158d05c932e0cf18e35 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs (.../DistributionPropertiesBase.cs) (revision f42e68ad241081a9bb8bf158d05c932e0cf18e35) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionPropertiesBase.cs (.../DistributionPropertiesBase.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -48,18 +48,18 @@ /// /// The to create the properties for. protected DistributionPropertiesBase(TDistribution distribution) - : this(DistributionPropertiesReadOnly.All, distribution, null) {} + : this(DistributionReadOnlyProperties.All, distribution, null) {} /// /// Creates a new instance of . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The to create the properties for. /// The handler responsible for handling effects of a property change. /// Thrown when is null. /// Any number of properties in this class is editable and the /// is null. - protected DistributionPropertiesBase(DistributionPropertiesReadOnly propertiesReadOnly, + protected DistributionPropertiesBase(DistributionReadOnlyProperties readOnlyProperties, TDistribution distribution, IObservablePropertyChangeHandler handler) { @@ -68,16 +68,16 @@ throw new ArgumentNullException(nameof(distribution)); } - if (!propertiesReadOnly.HasFlag(DistributionPropertiesReadOnly.All) + if (!readOnlyProperties.HasFlag(DistributionReadOnlyProperties.All) && handler == null) { throw new ArgumentException(@"Change handler required if changes are possible.", nameof(handler)); } Data = distribution; - isMeanReadOnly = propertiesReadOnly.HasFlag(DistributionPropertiesReadOnly.Mean); - isStandardDeviationReadOnly = propertiesReadOnly.HasFlag(DistributionPropertiesReadOnly.StandardDeviation); + isMeanReadOnly = readOnlyProperties.HasFlag(DistributionReadOnlyProperties.Mean); + isStandardDeviationReadOnly = readOnlyProperties.HasFlag(DistributionReadOnlyProperties.StandardDeviation); changeHandler = handler; } Fisheye: Tag bd423aa35851fe36c0f52a696626abdd0a044f03 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionPropertiesReadOnly.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionReadOnlyProperties.cs =================================================================== diff -u --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionReadOnlyProperties.cs (revision 0) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/DistributionReadOnlyProperties.cs (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -0,0 +1,54 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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; + +namespace Riskeer.Common.Forms.PropertyClasses +{ + /// + /// All options to mark properties of as read-only. + /// + [Flags] + public enum DistributionReadOnlyProperties + { + /// + /// Mark none of the properties of + /// as read-only. + /// + None = 0, + + /// + /// Mark read-only. + /// + Mean = 1, + + /// + /// Mark read-only. + /// + StandardDeviation = 2, + + /// + /// Mark both and + /// as read-only. + /// + All = Mean | StandardDeviation + } +} \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs (.../LogNormalDistributionProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/LogNormalDistributionProperties.cs (.../LogNormalDistributionProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -42,18 +42,18 @@ /// /// Creates a new instance of . /// - /// Indicates which properties, if any, should be + /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. /// Optional handler that is used to handle property changes. /// Thrown when is null. /// Any number of properties in this class is editable and the /// is null. public LogNormalDistributionProperties( - DistributionPropertiesReadOnly propertiesReadOnly, + DistributionReadOnlyProperties readOnlyProperties, LogNormalDistribution distribution, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, handler) {} + : base(readOnlyProperties, distribution, handler) {} public override string DistributionType { Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/NormalDistributionProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/NormalDistributionProperties.cs (.../NormalDistributionProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/NormalDistributionProperties.cs (.../NormalDistributionProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -42,18 +42,18 @@ /// /// Creates a new instance of . /// - /// Indicates which properties, if any, should be + /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. /// Optional handler that is used to handle property changes. /// Thrown when is null. /// Any number of properties in this class is editable and the /// is null. public NormalDistributionProperties( - DistributionPropertiesReadOnly propertiesReadOnly, + DistributionReadOnlyProperties readOnlyProperties, NormalDistribution distribution, IObservablePropertyChangeHandler handler) : - base(propertiesReadOnly, distribution, handler) {} + base(readOnlyProperties, distribution, handler) {} public override string DistributionType { Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs =================================================================== diff -u -rdf50652c669ae9c392e5d82bb11df4b32ab5746e -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision df50652c669ae9c392e5d82bb11df4b32ab5746e) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/StructuresInputBaseProperties.cs (.../StructuresInputBaseProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -387,8 +387,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.WidthFlowApertures, PropertyChangeHandler); } @@ -404,7 +404,7 @@ get { return new VariationCoefficientLogNormalDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, + VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation, data.WrappedData.StormDuration, PropertyChangeHandler); } @@ -425,8 +425,8 @@ { return new VariationCoefficientLogNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.CriticalOvertoppingDischarge, PropertyChangeHandler); } @@ -443,8 +443,8 @@ { return new LogNormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.FlowWidthAtBottomProtection, PropertyChangeHandler); } @@ -483,8 +483,8 @@ { return new VariationCoefficientLogNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.StorageStructureArea, PropertyChangeHandler); } @@ -501,8 +501,8 @@ { return new LogNormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.AllowedLevelIncreaseStorage, PropertyChangeHandler); } Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs (.../TruncatedNormalDistributionProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/TruncatedNormalDistributionProperties.cs (.../TruncatedNormalDistributionProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -39,23 +39,23 @@ /// /// The to create the properties for. public TruncatedNormalDistributionProperties(TruncatedNormalDistribution distribution) - : this(DistributionPropertiesReadOnly.All, distribution, null) {} + : this(DistributionReadOnlyProperties.All, distribution, null) {} /// /// Creates a new instance of . /// - /// Indicates which properties, if any, should be + /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. /// Optional handler that is used to handle property changes. /// Thrown when is null. /// Any number of properties in this class is editable and the /// is null. public TruncatedNormalDistributionProperties( - DistributionPropertiesReadOnly propertiesReadOnly, + DistributionReadOnlyProperties readOnlyProperties, TruncatedNormalDistribution distribution, IObservablePropertyChangeHandler handler) : - base(propertiesReadOnly, distribution, handler) {} + base(readOnlyProperties, distribution, handler) {} public override string DistributionType { Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs (.../VariationCoefficientDesignVariableProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDesignVariableProperties.cs (.../VariationCoefficientDesignVariableProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -41,15 +41,15 @@ /// /// Creates a new . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The data of the to create the properties for. /// 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 VariationCoefficientDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, + protected VariationCoefficientDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, VariationCoefficientDesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, GetDistribution(designVariable), handler) + : base(readOnlyProperties, GetDistribution(designVariable), handler) { this.designVariable = designVariable; } Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs (.../VariationCoefficientDistributionPropertiesBase.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesBase.cs (.../VariationCoefficientDistributionPropertiesBase.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -48,19 +48,19 @@ /// /// The to create the properties for. protected VariationCoefficientDistributionPropertiesBase(TDistribution distribution) - : this(VariationCoefficientDistributionPropertiesReadOnly.All, distribution, null) {} + : this(VariationCoefficientDistributionReadOnlyProperties.All, distribution, null) {} /// /// Creates a new instance of . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The data of the to create the properties for. /// The handler responsible for handling effects of a property change. /// Thrown when is null. /// Any number of properties in this class is editable and the /// is null. protected VariationCoefficientDistributionPropertiesBase( - VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, + VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, TDistribution distribution, IObservablePropertyChangeHandler handler) { @@ -69,15 +69,15 @@ throw new ArgumentNullException(nameof(distribution)); } - if (!propertiesReadOnly.HasFlag(VariationCoefficientDistributionPropertiesReadOnly.All) && handler == null) + if (!readOnlyProperties.HasFlag(VariationCoefficientDistributionReadOnlyProperties.All) && handler == null) { throw new ArgumentException(@"Change handler required if changes are possible.", nameof(handler)); } Data = distribution; - isMeanReadOnly = propertiesReadOnly.HasFlag(VariationCoefficientDistributionPropertiesReadOnly.Mean); - isVariationCoefficientReadOnly = propertiesReadOnly.HasFlag(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation); + isMeanReadOnly = readOnlyProperties.HasFlag(VariationCoefficientDistributionReadOnlyProperties.Mean); + isVariationCoefficientReadOnly = readOnlyProperties.HasFlag(VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation); changeHandler = handler; } Fisheye: Tag bd423aa35851fe36c0f52a696626abdd0a044f03 refers to a dead (removed) revision in file `Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionPropertiesReadOnly.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionReadOnlyProperties.cs =================================================================== diff -u --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionReadOnlyProperties.cs (revision 0) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientDistributionReadOnlyProperties.cs (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -0,0 +1,57 @@ +// Copyright (C) Stichting Deltares 2019. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer 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; + +namespace Riskeer.Common.Forms.PropertyClasses +{ + /// + /// Indicator of what properties to mark as read-only for + /// . + /// + [Flags] + public enum VariationCoefficientDistributionReadOnlyProperties + { + /// + /// Mark none of the properties of + /// as read-only. + /// + None = 0, + + /// + /// Mark as read-only. + /// + Mean = 1, + + /// + /// Mark + /// as read-only. + /// + CoefficientOfVariation = 2, + + /// + /// Marks both and + /// + /// as read-only. + /// + All = Mean | CoefficientOfVariation + } +} \ No newline at end of file Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionDesignVariableProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionDesignVariableProperties.cs (.../VariationCoefficientLogNormalDistributionDesignVariableProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionDesignVariableProperties.cs (.../VariationCoefficientLogNormalDistributionDesignVariableProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -39,20 +39,20 @@ /// The to create the properties for. /// Thrown when is null. public VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDesignVariable designVariable) - : this(VariationCoefficientDistributionPropertiesReadOnly.All, designVariable, null) {} + : this(VariationCoefficientDistributionReadOnlyProperties.All, designVariable, null) {} /// /// Creates a new . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The to create the properties for. /// 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. - public VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, + public VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, VariationCoefficientDesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, + : base(readOnlyProperties, designVariable, handler) {} Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionProperties.cs (.../VariationCoefficientLogNormalDistributionProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientLogNormalDistributionProperties.cs (.../VariationCoefficientLogNormalDistributionProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -42,18 +42,18 @@ /// /// Creates a new instance of . /// - /// Indicates which properties, if any, should be + /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. /// Optional handler that is used to handle property changes. /// Thrown when is null. /// Any number of properties in this class is editable and the /// is null. public VariationCoefficientLogNormalDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, + VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, VariationCoefficientLogNormalDistribution distribution, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, handler) {} + : base(readOnlyProperties, distribution, handler) {} public override string DistributionType { Index: Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientNormalDistributionProperties.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientNormalDistributionProperties.cs (.../VariationCoefficientNormalDistributionProperties.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/PropertyClasses/VariationCoefficientNormalDistributionProperties.cs (.../VariationCoefficientNormalDistributionProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -42,18 +42,18 @@ /// /// Creates a new instance of . /// - /// Indicates which properties, if any, should be + /// Indicates which properties, if any, should be /// marked as read-only. /// The to create the properties for. /// Optional handler that is used to handle property changes. /// Thrown when is null. /// Any number of properties in this class is editable and the /// is null. public VariationCoefficientNormalDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, + VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, VariationCoefficientNormalDistribution distribution, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, handler) {} + : base(readOnlyProperties, distribution, handler) {} public override string DistributionType { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -40,7 +40,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.None, + TestDelegate test = () => new SimpleDesignVariableProperties(DistributionReadOnlyProperties.None, null, handler); @@ -62,7 +62,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.All, + var properties = new SimpleDesignVariableProperties(DistributionReadOnlyProperties.All, designVariable, handler); @@ -89,7 +89,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new SimpleDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); @@ -102,10 +102,10 @@ private class SimpleDesignVariableProperties : DesignVariableProperties { - public SimpleDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly, + public SimpleDesignVariableProperties(DistributionReadOnlyProperties readOnlyProperties, DesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, designVariable, handler) {} + : base(readOnlyProperties, designVariable, handler) {} public override string DistributionType { get; } } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs (.../DistributionPropertiesBaseTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/DistributionPropertiesBaseTest.cs (.../DistributionPropertiesBaseTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -64,7 +64,7 @@ mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.All, distribution, null); + var properties = new SimpleDistributionProperties(DistributionReadOnlyProperties.All, distribution, null); // Assert Assert.IsInstanceOf>(properties); @@ -73,11 +73,11 @@ } [Test] - [TestCase(DistributionPropertiesReadOnly.Mean)] - [TestCase(DistributionPropertiesReadOnly.StandardDeviation)] - [TestCase(DistributionPropertiesReadOnly.None)] + [TestCase(DistributionReadOnlyProperties.Mean)] + [TestCase(DistributionReadOnlyProperties.StandardDeviation)] + [TestCase(DistributionReadOnlyProperties.None)] public void Constructor_NoDistributionSetWhileChangesPossible_ThrowArgumentException( - DistributionPropertiesReadOnly flags) + DistributionReadOnlyProperties flags) { // Call TestDelegate call = () => new SimpleDistributionProperties(flags, null, null); @@ -88,11 +88,11 @@ } [Test] - [TestCase(DistributionPropertiesReadOnly.Mean)] - [TestCase(DistributionPropertiesReadOnly.StandardDeviation)] - [TestCase(DistributionPropertiesReadOnly.None)] + [TestCase(DistributionReadOnlyProperties.Mean)] + [TestCase(DistributionReadOnlyProperties.StandardDeviation)] + [TestCase(DistributionReadOnlyProperties.None)] public void Constructor_NoHandlerSetWhileChangesPossible_ThrowArgumentException( - DistributionPropertiesReadOnly flags) + DistributionReadOnlyProperties flags) { // Setup var mocks = new MockRepository(); @@ -110,11 +110,11 @@ } [Test] - [TestCase(DistributionPropertiesReadOnly.All, true, true)] - [TestCase(DistributionPropertiesReadOnly.Mean, true, false)] - [TestCase(DistributionPropertiesReadOnly.None, false, false)] - [TestCase(DistributionPropertiesReadOnly.StandardDeviation, false, true)] - public void Constructor_Always_PropertiesHaveExpectedAttributesValues(DistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectStandardDeviationReadOnly) + [TestCase(DistributionReadOnlyProperties.All, true, true)] + [TestCase(DistributionReadOnlyProperties.Mean, true, false)] + [TestCase(DistributionReadOnlyProperties.None, false, false)] + [TestCase(DistributionReadOnlyProperties.StandardDeviation, false, true)] + public void Constructor_Always_PropertiesHaveExpectedAttributesValues(DistributionReadOnlyProperties readOnlyProperties, bool expectMeanReadOnly, bool expectStandardDeviationReadOnly) { // Setup var mocks = new MockRepository(); @@ -123,27 +123,27 @@ mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); + var properties = new SimpleDistributionProperties(readOnlyProperties, distribution, handler); // Assert AssertPropertiesInState(properties, expectMeanReadOnly, expectStandardDeviationReadOnly); mocks.VerifyAll(); } [Test] - [TestCase(DistributionPropertiesReadOnly.All, true, true)] - [TestCase(DistributionPropertiesReadOnly.Mean, true, false)] - [TestCase(DistributionPropertiesReadOnly.None, false, false)] - [TestCase(DistributionPropertiesReadOnly.StandardDeviation, false, true)] - public void DynamicReadOnlyValidationMethod_VariousReadOnlySet_ExpectedValues(DistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectStandardDeviationReadOnly) + [TestCase(DistributionReadOnlyProperties.All, true, true)] + [TestCase(DistributionReadOnlyProperties.Mean, true, false)] + [TestCase(DistributionReadOnlyProperties.None, false, false)] + [TestCase(DistributionReadOnlyProperties.StandardDeviation, false, true)] + public void DynamicReadOnlyValidationMethod_VariousReadOnlySet_ExpectedValues(DistributionReadOnlyProperties readOnlyProperties, bool expectMeanReadOnly, bool expectStandardDeviationReadOnly) { // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); + var properties = new SimpleDistributionProperties(readOnlyProperties, distribution, handler); // Call bool meanIsReadOnly = properties.DynamicReadOnlyValidationMethod("Mean"); @@ -170,7 +170,7 @@ mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(DistributionPropertiesReadOnly.None, distribution, handler); + var properties = new SimpleDistributionProperties(DistributionReadOnlyProperties.None, distribution, handler); // Assert Assert.AreEqual(distribution.Mean, properties.Mean); @@ -190,7 +190,7 @@ mocks.ReplayAll(); var properties = new SimpleDistributionProperties( - DistributionPropertiesReadOnly.All, + DistributionReadOnlyProperties.All, distribution, handler); @@ -221,7 +221,7 @@ }); var properties = new SimpleDistributionProperties( - DistributionPropertiesReadOnly.None, + DistributionReadOnlyProperties.None, distribution, handler); @@ -234,9 +234,9 @@ } [Test] - [TestCase(DistributionPropertiesReadOnly.All)] - [TestCase(DistributionPropertiesReadOnly.StandardDeviation)] - public void StandardDeviation_ReadOnlyWithoutObserverable_ThrowsArgumentException(DistributionPropertiesReadOnly propertiesReadOnly) + [TestCase(DistributionReadOnlyProperties.All)] + [TestCase(DistributionReadOnlyProperties.StandardDeviation)] + public void StandardDeviation_ReadOnlyWithoutObserverable_ThrowsArgumentException(DistributionReadOnlyProperties readOnlyProperties) { // Setup var mocks = new MockRepository(); @@ -245,7 +245,7 @@ mocks.ReplayAll(); var properties = new SimpleDistributionProperties( - propertiesReadOnly, + readOnlyProperties, distribution, handler); @@ -276,7 +276,7 @@ }); var properties = new SimpleDistributionProperties( - DistributionPropertiesReadOnly.None, + DistributionReadOnlyProperties.None, distribution, handler); @@ -319,10 +319,10 @@ { public SimpleDistributionProperties(IDistribution distribution) : base(distribution) {} - public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly, + public SimpleDistributionProperties(DistributionReadOnlyProperties readOnlyProperties, IDistribution distribution, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, handler) {} + : base(readOnlyProperties, distribution, handler) {} public override string DistributionType { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/LogNormalDistributionPropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/LogNormalDistributionPropertiesTest.cs (.../LogNormalDistributionPropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/LogNormalDistributionPropertiesTest.cs (.../LogNormalDistributionPropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -60,7 +60,7 @@ // Call var properties = new LogNormalDistributionProperties( - DistributionPropertiesReadOnly.None, distribution, handler); + DistributionReadOnlyProperties.None, distribution, handler); // Assert Assert.IsInstanceOf>(properties); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/NormalDistributionPropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/NormalDistributionPropertiesTest.cs (.../NormalDistributionPropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/NormalDistributionPropertiesTest.cs (.../NormalDistributionPropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -60,7 +60,7 @@ // Call var properties = new NormalDistributionProperties( - DistributionPropertiesReadOnly.None, distribution, handler); + DistributionReadOnlyProperties.None, distribution, handler); // Assert Assert.IsInstanceOf>(properties); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs (.../TruncatedNormalDistributionPropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/TruncatedNormalDistributionPropertiesTest.cs (.../TruncatedNormalDistributionPropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -61,7 +61,7 @@ var distribution = new TruncatedNormalDistribution(new Random(21).Next(3, RoundedDouble.MaximumNumberOfDecimalPlaces)); // Call - var properties = new TruncatedNormalDistributionProperties(DistributionPropertiesReadOnly.None, distribution, handler); + var properties = new TruncatedNormalDistributionProperties(DistributionReadOnlyProperties.None, distribution, handler); // Assert Assert.IsInstanceOf>(properties); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientDesignVariablePropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientDesignVariablePropertiesTest.cs (.../VariationCoefficientDesignVariablePropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientDesignVariablePropertiesTest.cs (.../VariationCoefficientDesignVariablePropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -40,7 +40,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new SimpleDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly.None, + TestDelegate test = () => new SimpleDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties.None, null, handler); @@ -62,7 +62,7 @@ var designVariable = new SimpleVariationCoefficientDesignVariableProperties(distribution, RoundedDouble.NaN); // Call - var properties = new SimpleDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly.All, + var properties = new SimpleDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties.All, designVariable, handler); @@ -89,7 +89,7 @@ var designVariable = new SimpleVariationCoefficientDesignVariableProperties(distribution, new RoundedDouble(numberOfDecimalPlaces, 0.45)); // Call - var properties = new SimpleDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly.None, + var properties = new SimpleDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties.None, designVariable, handler); @@ -102,10 +102,10 @@ private class SimpleDesignVariableProperties : VariationCoefficientDesignVariableProperties { - public SimpleDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, + public SimpleDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, VariationCoefficientDesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, designVariable, handler) {} + : base(readOnlyProperties, designVariable, handler) {} public override string DistributionType { get; } } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientDistributionPropertiesBaseTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientDistributionPropertiesBaseTest.cs (.../VariationCoefficientDistributionPropertiesBaseTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientDistributionPropertiesBaseTest.cs (.../VariationCoefficientDistributionPropertiesBaseTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -64,7 +64,7 @@ mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All, distribution, null); + var properties = new SimpleDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.All, distribution, null); // Assert Assert.IsInstanceOf>(properties); @@ -73,11 +73,11 @@ } [Test] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.Mean)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.None)] public void Constructor_NoDistributionSetWhileChangesPossible_ThrowArgumentException( - VariationCoefficientDistributionPropertiesReadOnly flags) + VariationCoefficientDistributionReadOnlyProperties flags) { // Call TestDelegate call = () => new SimpleDistributionProperties(flags, null, null); @@ -88,11 +88,11 @@ } [Test] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.Mean)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.None)] public void Constructor_NoHandlerSetWhileChangesPossible_ThrowArgumentException( - VariationCoefficientDistributionPropertiesReadOnly flags) + VariationCoefficientDistributionReadOnlyProperties flags) { // Setup var mocks = new MockRepository(); @@ -110,11 +110,11 @@ } [Test] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All, true, true)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean, true, false)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None, false, false)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, false, true)] - public void Constructor_Always_PropertiesHaveExpectedAttributesValues(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectCoefficientOfVariationReadOnly) + [TestCase(VariationCoefficientDistributionReadOnlyProperties.All, true, true)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.Mean, true, false)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.None, false, false)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation, false, true)] + public void Constructor_Always_PropertiesHaveExpectedAttributesValues(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, bool expectMeanReadOnly, bool expectCoefficientOfVariationReadOnly) { // Setup var mocks = new MockRepository(); @@ -123,27 +123,27 @@ mocks.ReplayAll(); // Call - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); + var properties = new SimpleDistributionProperties(readOnlyProperties, distribution, handler); // Assert AssertPropertiesInState(properties, expectMeanReadOnly, expectCoefficientOfVariationReadOnly); mocks.VerifyAll(); } [Test] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All, true, true)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.Mean, true, false)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.None, false, false)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation, false, true)] - public void DynamicReadOnlyValidationMethod_VariousReadOnlySet_ExpectedValues(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, bool expectMeanReadOnly, bool expectCoefficientOfVariationReadOnly) + [TestCase(VariationCoefficientDistributionReadOnlyProperties.All, true, true)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.Mean, true, false)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.None, false, false)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation, false, true)] + public void DynamicReadOnlyValidationMethod_VariousReadOnlySet_ExpectedValues(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, bool expectMeanReadOnly, bool expectCoefficientOfVariationReadOnly) { // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); + var properties = new SimpleDistributionProperties(readOnlyProperties, distribution, handler); // Call bool meanIsReadOnly = properties.DynamicReadOnlyValidationMethod("Mean"); @@ -169,7 +169,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler); + var properties = new SimpleDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.None, distribution, handler); // Call properties.Data = distribution; @@ -192,7 +192,7 @@ mocks.ReplayAll(); var properties = new SimpleDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly.All, + VariationCoefficientDistributionReadOnlyProperties.All, distribution, handler); @@ -223,7 +223,7 @@ }); var properties = new SimpleDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly.None, + VariationCoefficientDistributionReadOnlyProperties.None, distribution, handler); @@ -236,17 +236,17 @@ } [Test] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.All)] - [TestCase(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation)] - public void CoefficientOfVariation_ReadOnlyWithoutObserverable_ThrowsArgumentException(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly) + [TestCase(VariationCoefficientDistributionReadOnlyProperties.All)] + [TestCase(VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation)] + public void CoefficientOfVariation_ReadOnlyWithoutObserverable_ThrowsArgumentException(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties) { // Setup var mocks = new MockRepository(); var distribution = mocks.Stub(); var handler = mocks.Stub(); mocks.ReplayAll(); - var properties = new SimpleDistributionProperties(propertiesReadOnly, distribution, handler); + var properties = new SimpleDistributionProperties(readOnlyProperties, distribution, handler); // Call TestDelegate test = () => properties.CoefficientOfVariation = new RoundedDouble(2, 20); @@ -274,7 +274,7 @@ observerable }); - var properties = new SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler) + var properties = new SimpleDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.None, distribution, handler) { Data = distribution }; @@ -320,10 +320,10 @@ { public SimpleDistributionProperties(IVariationCoefficientDistribution distribution) : base(distribution) {} - public SimpleDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly, + public SimpleDistributionProperties(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties, IVariationCoefficientDistribution distribution, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, distribution, handler) {} + : base(readOnlyProperties, distribution, handler) {} public override string DistributionType { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionDesignVariablePropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionDesignVariablePropertiesTest.cs (.../VariationCoefficientLogNormalDistributionDesignVariablePropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionDesignVariablePropertiesTest.cs (.../VariationCoefficientLogNormalDistributionDesignVariablePropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -71,7 +71,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly.None, + TestDelegate test = () => new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties.None, null, handler); @@ -93,7 +93,7 @@ var designVariable = new VariationCoefficientLogNormalDistributionDesignVariable(distribution); // Call - var properties = new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly.All, + var properties = new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties.All, designVariable, handler); @@ -118,7 +118,7 @@ var designVariable = new VariationCoefficientLogNormalDistributionDesignVariable(distribution); // Call - var properties = new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly.None, + var properties = new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties.None, designVariable, handler); @@ -170,7 +170,7 @@ var designVariable = new VariationCoefficientLogNormalDistributionDesignVariable(distribution); // Call - var properties = new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionPropertiesReadOnly.None, + var properties = new VariationCoefficientLogNormalDistributionDesignVariableProperties(VariationCoefficientDistributionReadOnlyProperties.None, designVariable, handler); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionPropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionPropertiesTest.cs (.../VariationCoefficientLogNormalDistributionPropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientLogNormalDistributionPropertiesTest.cs (.../VariationCoefficientLogNormalDistributionPropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -59,7 +59,7 @@ // Call var properties = new VariationCoefficientLogNormalDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler); + VariationCoefficientDistributionReadOnlyProperties.None, distribution, handler); // Assert Assert.IsInstanceOf>(properties); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientNormalDistributionPropertiesTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientNormalDistributionPropertiesTest.cs (.../VariationCoefficientNormalDistributionPropertiesTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/PropertyClasses/VariationCoefficientNormalDistributionPropertiesTest.cs (.../VariationCoefficientNormalDistributionPropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -59,7 +59,7 @@ // Call var properties = new VariationCoefficientNormalDistributionProperties( - VariationCoefficientDistributionPropertiesReadOnly.None, distribution, handler); + VariationCoefficientDistributionReadOnlyProperties.None, distribution, handler); // Assert Assert.IsInstanceOf>(properties); Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/DistributionPropertiesTestHelperTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/DistributionPropertiesTestHelperTest.cs (.../DistributionPropertiesTestHelperTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil.Test/DistributionPropertiesTestHelperTest.cs (.../DistributionPropertiesTestHelperTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -78,8 +78,8 @@ private class SimpleDistributionProperties : DistributionPropertiesBase { - public SimpleDistributionProperties(DistributionPropertiesReadOnly propertiesReadOnly) - : base(propertiesReadOnly, + public SimpleDistributionProperties(DistributionReadOnlyProperties readOnlyProperties) + : base(readOnlyProperties, new SimpleDistribution(), new SimplePropertyChangeHandler()) {} @@ -88,8 +88,8 @@ private class SimpleVariationCoefficientDistributionProperties : VariationCoefficientDistributionPropertiesBase { - public SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly propertiesReadOnly) - : base(propertiesReadOnly, + public SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionReadOnlyProperties readOnlyProperties) + : base(readOnlyProperties, new SimpleDistribution(), new SimplePropertyChangeHandler()) {} @@ -123,37 +123,37 @@ get { yield return new TestCaseData( - new SimpleDistributionProperties(DistributionPropertiesReadOnly.All), + new SimpleDistributionProperties(DistributionReadOnlyProperties.All), true, true, true) .SetName("Distribution, All read-only, correct assertions."); yield return new TestCaseData( - new SimpleDistributionProperties(DistributionPropertiesReadOnly.All), + new SimpleDistributionProperties(DistributionReadOnlyProperties.All), false, true, false) .SetName("Distribution, All read-only, incorrect assertion mean."); yield return new TestCaseData( - new SimpleDistributionProperties(DistributionPropertiesReadOnly.All), + new SimpleDistributionProperties(DistributionReadOnlyProperties.All), true, false, false) .SetName("Distribution, All read-only, incorrect assertion deviation."); yield return new TestCaseData( - new SimpleDistributionProperties(DistributionPropertiesReadOnly.Mean), + new SimpleDistributionProperties(DistributionReadOnlyProperties.Mean), true, false, true) .SetName("Distribution, Mean read-only, correct assertions."); yield return new TestCaseData( - new SimpleDistributionProperties(DistributionPropertiesReadOnly.StandardDeviation), + new SimpleDistributionProperties(DistributionReadOnlyProperties.StandardDeviation), false, true, true) .SetName("Distribution, StandardDeviation read-only, correct assertions."); yield return new TestCaseData( - new SimpleDistributionProperties(DistributionPropertiesReadOnly.None), + new SimpleDistributionProperties(DistributionReadOnlyProperties.None), false, false, true) @@ -166,37 +166,37 @@ get { yield return new TestCaseData( - new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All), + new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.All), true, true, true) .SetName("VariationDistribution, All read-only, correct assertions."); yield return new TestCaseData( - new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All), + new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.All), false, true, false) .SetName("VariationDistribution, All read-only, incorrect assertion mean."); yield return new TestCaseData( - new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.All), + new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.All), true, false, false) .SetName("VariationDistribution, All read-only, incorrect assertion variation."); yield return new TestCaseData( - new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.Mean), + new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.Mean), true, false, true) .SetName("VariationDistribution, Mean read-only, correct assertions."); yield return new TestCaseData( - new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation), + new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation), false, true, true) .SetName("VariationDistribution, CoefficientOfVariation read-only, correct assertions."); yield return new TestCaseData( - new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None), + new SimpleVariationCoefficientDistributionProperties(VariationCoefficientDistributionReadOnlyProperties.None), false, false, true) Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs =================================================================== diff -u -r1f76045f08612f7b8259c460771c7cdbdb5447a7 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision 1f76045f08612f7b8259c460771c7cdbdb5447a7) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -218,7 +218,7 @@ get { return new LogNormalDistributionProperties( - DistributionPropertiesReadOnly.None, + DistributionReadOnlyProperties.None, data.WrappedData.CriticalFlowRate, propertyChangeHandler); } Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs =================================================================== diff -u -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresInputContextProperties.cs (.../HeightStructuresInputContextProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -133,7 +133,7 @@ get { return new NormalDistributionProperties( - DistributionPropertiesReadOnly.StandardDeviation, + DistributionReadOnlyProperties.StandardDeviation, data.WrappedData.ModelFactorSuperCriticalFlow, PropertyChangeHandler); } @@ -232,8 +232,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.LevelCrestStructure, PropertyChangeHandler); } Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs (.../LogNormalDistributionDesignVariableProperties.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs (.../LogNormalDistributionDesignVariableProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -39,20 +39,20 @@ /// The to create the properties for. /// Thrown when is null. public LogNormalDistributionDesignVariableProperties(DesignVariable designVariable) - : this(DistributionPropertiesReadOnly.All, designVariable, null) {} + : this(DistributionReadOnlyProperties.All, designVariable, null) {} /// /// Creates a new . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The to create the properties for. /// 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. - public LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly, + public LogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties readOnlyProperties, DesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, + : base(readOnlyProperties, designVariable, handler) {} Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs (.../NormalDistributionDesignVariableProperties.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs (.../NormalDistributionDesignVariableProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -36,15 +36,15 @@ /// /// Creates a new . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The to create the properties for. /// 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. - public NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly, + public NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties readOnlyProperties, DesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, + : base(readOnlyProperties, designVariable, handler) {} Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -247,7 +247,7 @@ { get { - return new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + return new LogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, PipingSemiProbabilisticDesignVariableFactory.GetDampingFactorExit(data.WrappedData), propertyChangeHandler); } @@ -262,7 +262,7 @@ { get { - return new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + return new NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, PipingSemiProbabilisticDesignVariableFactory.GetPhreaticLevelExit(data.WrappedData), propertyChangeHandler); } Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs (.../ShiftedLogNormalDistributionDesignVariableProperties.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs (.../ShiftedLogNormalDistributionDesignVariableProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -47,15 +47,15 @@ /// /// Creates a new . /// - /// Indicates which properties, if any, should be marked as read-only. + /// Indicates which properties, if any, should be marked as read-only. /// The to create the properties for. /// 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. - public ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly propertiesReadOnly, + public ShiftedLogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties readOnlyProperties, DesignVariable designVariable, IObservablePropertyChangeHandler handler) - : base(propertiesReadOnly, designVariable, handler) {} + : base(readOnlyProperties, designVariable, handler) {} [PropertyOrder(4)] [ResourcesDisplayName(typeof(Resources), nameof(Resources.Probabilistics_Shift_Symbol))] Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs (.../LogNormalDistributionDesignVariablePropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/LogNormalDistributionDesignVariablePropertiesTest.cs (.../LogNormalDistributionDesignVariablePropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -72,7 +72,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + TestDelegate test = () => new LogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, null, handler); @@ -94,7 +94,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All, + var properties = new LogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.All, designVariable, handler); @@ -119,7 +119,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new LogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); @@ -171,7 +171,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new LogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new LogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs (.../NormalDistributionDesignVariablePropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/NormalDistributionDesignVariablePropertiesTest.cs (.../NormalDistributionDesignVariablePropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -43,7 +43,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + TestDelegate test = () => new NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, null, handler); @@ -65,7 +65,7 @@ var designVariable = new NormalDistributionDesignVariable(distribution); // Call - var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All, + var properties = new NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.All, designVariable, handler); @@ -90,7 +90,7 @@ var designVariable = new NormalDistributionDesignVariable(distribution); // Call - var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); @@ -142,7 +142,7 @@ var designVariable = new NormalDistributionDesignVariable(distribution); // Call - var properties = new NormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs (.../ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs (.../ShiftedLogNormalDistributionDesignVariablePropertiesTest.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -72,7 +72,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + TestDelegate test = () => new ShiftedLogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, null, handler); @@ -94,7 +94,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.All, + var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.All, designVariable, handler); @@ -119,7 +119,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); @@ -178,7 +178,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); @@ -207,7 +207,7 @@ var designVariable = new LogNormalDistributionDesignVariable(distribution); // Call - var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionPropertiesReadOnly.None, + var properties = new ShiftedLogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, designVariable, handler); Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs =================================================================== diff -u -r4659eb9bb2df1376c0c07a33ba21a43ad9996db8 -rbd423aa35851fe36c0f52a696626abdd0a044f03 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 4659eb9bb2df1376c0c07a33ba21a43ad9996db8) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision bd423aa35851fe36c0f52a696626abdd0a044f03) @@ -305,8 +305,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.InsideWaterLevelFailureConstruction, PropertyChangeHandler); } @@ -324,8 +324,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.BankWidth, PropertyChangeHandler); } @@ -385,8 +385,8 @@ { return new VariationCoefficientLogNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.ConstructiveStrengthLinearLoadModel, PropertyChangeHandler); } @@ -405,8 +405,8 @@ { return new VariationCoefficientLogNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.ConstructiveStrengthQuadraticLoadModel, PropertyChangeHandler); } @@ -495,8 +495,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.LevelCrestStructure, PropertyChangeHandler); } @@ -514,8 +514,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.InsideWaterLevel, PropertyChangeHandler); } @@ -533,8 +533,8 @@ { return new NormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.ThresholdHeightOpenWeir, PropertyChangeHandler); } @@ -553,8 +553,8 @@ { return new LogNormalDistributionProperties( HasStructure() - ? DistributionPropertiesReadOnly.None - : DistributionPropertiesReadOnly.All, + ? DistributionReadOnlyProperties.None + : DistributionReadOnlyProperties.All, data.WrappedData.AreaFlowApertures, PropertyChangeHandler); } @@ -572,7 +572,7 @@ get { return new NormalDistributionProperties( - DistributionPropertiesReadOnly.StandardDeviation, + DistributionReadOnlyProperties.StandardDeviation, data.WrappedData.DrainCoefficient, PropertyChangeHandler); } @@ -636,8 +636,8 @@ { return new VariationCoefficientLogNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.StabilityLinearLoadModel, PropertyChangeHandler); } @@ -656,8 +656,8 @@ { return new VariationCoefficientLogNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.StabilityQuadraticLoadModel, PropertyChangeHandler); } @@ -679,8 +679,8 @@ { return new VariationCoefficientLogNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.FailureCollisionEnergy, PropertyChangeHandler); } @@ -698,8 +698,8 @@ { return new VariationCoefficientNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.ShipMass, PropertyChangeHandler); } @@ -717,8 +717,8 @@ { return new VariationCoefficientNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.None - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.None + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.ShipVelocity, PropertyChangeHandler); } @@ -773,8 +773,8 @@ { return new VariationCoefficientNormalDistributionProperties( HasStructure() - ? VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation - : VariationCoefficientDistributionPropertiesReadOnly.All, + ? VariationCoefficientDistributionReadOnlyProperties.CoefficientOfVariation + : VariationCoefficientDistributionReadOnlyProperties.All, data.WrappedData.FlowVelocityStructureClosable, PropertyChangeHandler); }