Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresInput.cs
===================================================================
diff -u -r67a51cfa8f4937094d9f10b14b0aa8e64a4f7576 -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 67a51cfa8f4937094d9f10b14b0aa8e64a4f7576)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -43,7 +43,7 @@
private NormalDistribution thresholdHeightOpenWeir;
private NormalDistribution modelFactorSuperCriticalFlow;
- private NormalDistribution drainCoefficient;
+ private LogNormalDistribution drainCoefficient;
private LogNormalDistribution areaFlowApertures;
private NormalDistribution levelCrestStructureNotClosing;
private NormalDistribution insideWaterLevel;
@@ -62,7 +62,7 @@
factorStormDurationOpenStructure = new RoundedDouble(2, 1.0);
deviationWaveDirection = new RoundedDouble(deviationWaveDirectionNumberOfDecimals);
- drainCoefficient = new NormalDistribution(2)
+ drainCoefficient = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) 1,
StandardDeviation = (RoundedDouble) 0.2
@@ -146,7 +146,7 @@
clone.thresholdHeightOpenWeir = (NormalDistribution) ThresholdHeightOpenWeir.Clone();
clone.modelFactorSuperCriticalFlow = (NormalDistribution) ModelFactorSuperCriticalFlow.Clone();
- clone.drainCoefficient = (NormalDistribution) DrainCoefficient.Clone();
+ clone.drainCoefficient = (LogNormalDistribution) DrainCoefficient.Clone();
clone.areaFlowApertures = (LogNormalDistribution) AreaFlowApertures.Clone();
clone.levelCrestStructureNotClosing = (NormalDistribution) LevelCrestStructureNotClosing.Clone();
clone.insideWaterLevel = (NormalDistribution) InsideWaterLevel.Clone();
@@ -254,7 +254,7 @@
/// Gets or sets the drain coefficient.
///
/// Only sets the mean.
- public NormalDistribution DrainCoefficient
+ public LogNormalDistribution DrainCoefficient
{
get
{
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs
===================================================================
diff -u -rd3b94aacb873473ebe92d56b4e48341bf4b26412 -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision d3b94aacb873473ebe92d56b4e48341bf4b26412)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresInputContextProperties.cs (.../ClosingStructuresInputContextProperties.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -475,11 +475,11 @@
schematizationIncomingFlowCategoryIndex, totalNrOfCategories)]
[ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_DisplayName))]
[ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_Description))]
- public NormalDistributionProperties DrainCoefficient
+ public LogNormalDistributionProperties DrainCoefficient
{
get
{
- return new NormalDistributionProperties(
+ return new LogNormalDistributionProperties(
DistributionReadOnlyProperties.StandardDeviation,
data.WrappedData.DrainCoefficient,
PropertyChangeHandler);
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs
===================================================================
diff -u -rf5cd3b2ee9b7436f606ee6bc027b795accf0549d -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs (.../ClosingStructuresCalculationStochastAssigner.cs) (revision f5cd3b2ee9b7436f606ee6bc027b795accf0549d)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.IO/Configurations/ClosingStructuresCalculationStochastAssigner.cs (.../ClosingStructuresCalculationStochastAssigner.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -95,7 +95,7 @@
ClosingStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
Configuration.DrainCoefficient,
i => i.DrainCoefficient,
- (i, d) => i.DrainCoefficient = (NormalDistribution) d);
+ (i, d) => i.DrainCoefficient = (LogNormalDistribution) d);
yield return new StandardDeviationDefinition(
ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresValidationRulesRegistry.cs
===================================================================
diff -u -rf5cd3b2ee9b7436f606ee6bc027b795accf0549d -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresValidationRulesRegistry.cs (.../ClosingStructuresValidationRulesRegistry.cs) (revision f5cd3b2ee9b7436f606ee6bc027b795accf0549d)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Service/ClosingStructuresValidationRulesRegistry.cs (.../ClosingStructuresValidationRulesRegistry.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -156,7 +156,7 @@
new NormalDistributionRule(
input.InsideWaterLevel,
ParameterNameExtractor.GetFromDisplayName(RiskeerCommonFormsResources.Structure_InsideWaterLevel_DisplayName)),
- new NormalDistributionRule(
+ new LogNormalDistributionRule(
input.DrainCoefficient,
ParameterNameExtractor.GetFromDisplayName(RiskeerCommonFormsResources.Structure_DrainCoefficient_DisplayName)),
new NumericInputRule(
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -64,7 +64,7 @@
StandardDeviation = (RoundedDouble) 0.05
};
- var expectedDrainCoefficient = new NormalDistribution(2)
+ var expectedDrainCoefficient = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) 1,
StandardDeviation = (RoundedDouble) 0.2
@@ -126,7 +126,7 @@
RoundedDouble expectedFactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure;
NormalDistribution expectedModelFactorSuperCriticalFlow = input.ModelFactorSuperCriticalFlow;
- NormalDistribution expectedDrainCoefficient = input.DrainCoefficient;
+ LogNormalDistribution expectedDrainCoefficient = input.DrainCoefficient;
RoundedDouble expectedDeviationWaveDirection = input.DeviationWaveDirection;
double expectedFailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion;
@@ -418,12 +418,12 @@
var random = new Random(22);
var input = new ClosingStructuresInput();
RoundedDouble mean = random.NextRoundedDouble(0.01, 1.0);
- var expectedDistribution = new NormalDistribution(2)
+ var expectedDistribution = new LogNormalDistribution(2)
{
Mean = mean,
StandardDeviation = input.DrainCoefficient.StandardDeviation
};
- var distributionToSet = new NormalDistribution(5)
+ var distributionToSet = new LogNormalDistribution(5)
{
Mean = mean,
StandardDeviation = random.NextRoundedDouble()
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/ClosingStructuresTestDataGenerator.cs
===================================================================
diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/ClosingStructuresTestDataGenerator.cs (.../ClosingStructuresTestDataGenerator.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Data.TestUtil/ClosingStructuresTestDataGenerator.cs (.../ClosingStructuresTestDataGenerator.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -52,7 +52,7 @@
Mean = random.NextRoundedDouble()
};
- input.DrainCoefficient = new NormalDistribution
+ input.DrainCoefficient = new LogNormalDistribution
{
Mean = random.NextRoundedDouble()
};
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs
===================================================================
diff -u -rd06df6e6080508212f7ef201ab0ba0f6cb2e63f5 -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision d06df6e6080508212f7ef201ab0ba0f6cb2e63f5)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -185,7 +185,7 @@
Mean = (RoundedDouble) 2,
CoefficientOfVariation = (RoundedDouble) 0.1
},
- DrainCoefficient = new NormalDistribution
+ DrainCoefficient = new LogNormalDistribution
{
Mean = (RoundedDouble) 1.1,
StandardDeviation = (RoundedDouble) 0.02
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs
===================================================================
diff -u -re3e3433c92e142f37d6a5ed931a70ad582c240bc -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision e3e3433c92e142f37d6a5ed931a70ad582c240bc)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -213,7 +213,7 @@
Assert.AreEqual($"De variatiecoëfficiënt voor '{stormDuration}' moet groter zijn dan of gelijk zijn aan 0.", msgs[2]);
Assert.AreEqual($"De verwachtingswaarde voor '{insideWaterLevel}' moet een concreet getal zijn.", msgs[3]);
Assert.AreEqual($"De standaardafwijking voor '{insideWaterLevel}' moet groter zijn dan of gelijk zijn aan 0.", msgs[4]);
- Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficient}' moet een concreet getal zijn.", msgs[5]);
+ Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficient}' moet een positief getal zijn.", msgs[5]);
Assert.AreEqual($"De standaardafwijking voor '{drainCoefficient}' moet groter zijn dan of gelijk zijn aan 0.", msgs[6]);
Assert.AreEqual($"De waarde voor '{factorStormDurationOpenStructure}' moet een concreet getal zijn.", msgs[7]);
Assert.AreEqual($"De verwachtingswaarde voor '{areaFlowApertures}' moet een positief getal zijn.", msgs[8]);
@@ -1157,7 +1157,6 @@
private static void SetInvalidInputParameters(ClosingStructuresInput input, RoundedDouble value)
{
input.DeviationWaveDirection = RoundedDouble.NaN;
- input.DrainCoefficient.Mean = value;
input.FactorStormDurationOpenStructure = value;
input.InsideWaterLevel.Mean = value;
input.LevelCrestStructureNotClosing.Mean = value;
@@ -1170,11 +1169,12 @@
{
input.AllowedLevelIncreaseStorage.Mean = RoundedDouble.NaN;
input.AllowedLevelIncreaseStorage.StandardDeviation = RoundedDouble.NaN;
+ input.DrainCoefficient.Mean = RoundedDouble.NaN;
+ input.DrainCoefficient.StandardDeviation = RoundedDouble.NaN;
input.AreaFlowApertures.Mean = RoundedDouble.NaN;
input.AreaFlowApertures.StandardDeviation = RoundedDouble.NaN;
input.CriticalOvertoppingDischarge.Mean = RoundedDouble.NaN;
input.CriticalOvertoppingDischarge.CoefficientOfVariation = RoundedDouble.NaN;
- input.DrainCoefficient.StandardDeviation = RoundedDouble.NaN;
input.FlowWidthAtBottomProtection.Mean = RoundedDouble.NaN;
input.FlowWidthAtBottomProtection.StandardDeviation = RoundedDouble.NaN;
input.InsideWaterLevel.StandardDeviation = RoundedDouble.NaN;
@@ -1191,11 +1191,12 @@
{
input.AllowedLevelIncreaseStorage.Mean = value;
input.AllowedLevelIncreaseStorage.StandardDeviation = value;
+ input.DrainCoefficient.Mean = value;
+ input.DrainCoefficient.StandardDeviation = value;
input.AreaFlowApertures.Mean = value;
input.AreaFlowApertures.StandardDeviation = value;
input.CriticalOvertoppingDischarge.Mean = value;
input.CriticalOvertoppingDischarge.CoefficientOfVariation = value;
- input.DrainCoefficient.StandardDeviation = value;
input.FlowWidthAtBottomProtection.Mean = value;
input.FlowWidthAtBottomProtection.StandardDeviation = value;
input.InsideWaterLevel.StandardDeviation = value;
Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresValidationRulesRegistryTest.cs
===================================================================
diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresValidationRulesRegistryTest.cs (.../ClosingStructuresValidationRulesRegistryTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e)
+++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Service.Test/ClosingStructuresValidationRulesRegistryTest.cs (.../ClosingStructuresValidationRulesRegistryTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -154,7 +154,7 @@
Assert.IsInstanceOf(validationRules[0]);
Assert.IsInstanceOf(validationRules[1]);
Assert.IsInstanceOf(validationRules[2]);
- Assert.IsInstanceOf(validationRules[3]);
+ Assert.IsInstanceOf(validationRules[3]);
Assert.IsInstanceOf(validationRules[4]);
Assert.IsInstanceOf(validationRules[5]);
Assert.IsInstanceOf(validationRules[6]);
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -143,7 +143,7 @@
private IEnumerable GetVariables()
{
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation);
}
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -221,7 +221,7 @@
private IEnumerable GetVariables()
{
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation);
yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation);
yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation);
Index: Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/src/Riskeer.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -221,7 +221,7 @@
private IEnumerable GetVariables()
{
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, drainCoefficientMean, drainCoefficientStandardDeviation);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, areaFlowAperturesMean, areaFlowAperturesStandardDeviation);
yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation);
yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -131,7 +131,7 @@
{
yield return new DeterministicHydraRingVariable(58, 1.1);
yield return new DeterministicHydraRingVariable(63, 2.2);
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 21.1, 22.2);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, 21.1, 22.2);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 23.3, 24.4);
yield return new DeterministicHydraRingVariable(68, 3.3);
yield return new DeterministicHydraRingVariable(69, 4.4);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -194,7 +194,7 @@
yield return new DeterministicHydraRingVariable(61, 5.5);
yield return new DeterministicHydraRingVariable(63, 6.6);
yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 7.7, 8.8);
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 54.54, 55.55);
yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, 56.56, 57.57);
yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 9.9, 10.10);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -194,7 +194,7 @@
yield return new DeterministicHydraRingVariable(61, 5.5);
yield return new DeterministicHydraRingVariable(63, 6.6);
yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, 7.7, 8.8);
- yield return new NormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
+ yield return new LogNormalHydraRingVariable(66, HydraRingDeviationType.Standard, 52.52, 53.53);
yield return new LogNormalHydraRingVariable(67, HydraRingDeviationType.Standard, 54.54, 55.55);
yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, 56.56, 57.57);
yield return new NormalHydraRingVariable(82, HydraRingDeviationType.Standard, 9.9, 10.10);
Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -rb2a468f9ee8aae737da8f7f233ad8405dc3bd707 -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision b2a468f9ee8aae737da8f7f233ad8405dc3bd707)
+++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -1206,7 +1206,7 @@
"DELETE FROM [VariableDatas];" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 58, 1.1, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 63, 2.2, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 66, 0, 2, 21.1, 22.2, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 66, 0, 4, 21.1, 22.2, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 67, 0, 4, 23.3, 24.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 68, 3.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1631,7 +1631,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 61, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 63, 6.6, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 65, 0, 2, 7.7, 8.8, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 2, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 4, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 67, 0, 4, 54.4, 55.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 80, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 9.9, 10, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1799,7 +1799,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 61, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 63, 6.6, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 65, 0, 2, 7.7, 8.8, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 2, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 66, 0, 4, 52.2, 53.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 67, 0, 4, 54.4, 55.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 81, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 9.9, 10, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresInput.cs
===================================================================
diff -u -r8293671e0387359eae22d20c0d37c34fed11ce55 -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 8293671e0387359eae22d20c0d37c34fed11ce55)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -43,7 +43,7 @@
private NormalDistribution insideWaterLevelFailureConstruction;
private NormalDistribution insideWaterLevel;
- private NormalDistribution drainCoefficient;
+ private LogNormalDistribution drainCoefficient;
private NormalDistribution levelCrestStructure;
private NormalDistribution thresholdHeightOpenWeir;
private LogNormalDistribution areaFlowApertures;
@@ -76,7 +76,7 @@
evaluationLevel = new RoundedDouble(2);
verticalDistance = new RoundedDouble(verticalDistanceNumberOfDecimals);
- drainCoefficient = new NormalDistribution(2)
+ drainCoefficient = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) 1.0,
StandardDeviation = (RoundedDouble) 0.20
@@ -178,7 +178,7 @@
clone.insideWaterLevelFailureConstruction = (NormalDistribution) InsideWaterLevelFailureConstruction.Clone();
clone.insideWaterLevel = (NormalDistribution) InsideWaterLevel.Clone();
- clone.drainCoefficient = (NormalDistribution) DrainCoefficient.Clone();
+ clone.drainCoefficient = (LogNormalDistribution) DrainCoefficient.Clone();
clone.levelCrestStructure = (NormalDistribution) LevelCrestStructure.Clone();
clone.thresholdHeightOpenWeir = (NormalDistribution) ThresholdHeightOpenWeir.Clone();
clone.areaFlowApertures = (LogNormalDistribution) AreaFlowApertures.Clone();
@@ -380,7 +380,7 @@
/// Gets or sets the drain coefficient.
///
/// Only sets the mean.
- public NormalDistribution DrainCoefficient
+ public LogNormalDistribution DrainCoefficient
{
get
{
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs
===================================================================
diff -u -r9947ac1b187e45d4432c7f121d14345f0fcb29ac -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 9947ac1b187e45d4432c7f121d14345f0fcb29ac)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -561,11 +561,11 @@
schematizationIncomingFlowCategoryIndex, totalNrOfCategories)]
[ResourcesDisplayName(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_DisplayName))]
[ResourcesDescription(typeof(RiskeerCommonFormsResources), nameof(RiskeerCommonFormsResources.Structure_DrainCoefficient_Description))]
- public NormalDistributionProperties DrainCoefficient
+ public LogNormalDistributionProperties DrainCoefficient
{
get
{
- return new NormalDistributionProperties(
+ return new LogNormalDistributionProperties(
DistributionReadOnlyProperties.StandardDeviation,
data.WrappedData.DrainCoefficient,
PropertyChangeHandler);
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationStochastAssigner.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationStochastAssigner.cs (.../StabilityPointStructuresCalculationStochastAssigner.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationStochastAssigner.cs (.../StabilityPointStructuresCalculationStochastAssigner.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -110,7 +110,7 @@
StabilityPointStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
Configuration.DrainCoefficient,
i => i.DrainCoefficient,
- (i, d) => i.DrainCoefficient = (NormalDistribution) d);
+ (i, d) => i.DrainCoefficient = (LogNormalDistribution) d);
}
}
Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresValidationRulesRegistry.cs
===================================================================
diff -u -rbab6e2f55474e23481bf4f119b1cd356c13c4be1 -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresValidationRulesRegistry.cs (.../StabilityPointStructuresValidationRulesRegistry.cs) (revision bab6e2f55474e23481bf4f119b1cd356c13c4be1)
+++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Service/StabilityPointStructuresValidationRulesRegistry.cs (.../StabilityPointStructuresValidationRulesRegistry.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -294,7 +294,7 @@
new VariationCoefficientNormalDistributionRule(
input.FlowVelocityStructureClosable,
ParameterNameExtractor.GetFromDisplayName(RiskeerStabilityPointStructuresFormsResources.Structure_FlowVelocityStructureClosable_DisplayName)),
- new NormalDistributionRule(
+ new LogNormalDistributionRule(
input.DrainCoefficient,
ParameterNameExtractor.GetFromDisplayName(RiskeerCommonFormsResources.Structure_DrainCoefficient_DisplayName)),
new NumericInputRule(
@@ -371,7 +371,7 @@
new VariationCoefficientNormalDistributionRule(
input.FlowVelocityStructureClosable,
ParameterNameExtractor.GetFromDisplayName(RiskeerStabilityPointStructuresFormsResources.Structure_FlowVelocityStructureClosable_DisplayName)),
- new NormalDistributionRule(
+ new LogNormalDistributionRule(
input.DrainCoefficient,
ParameterNameExtractor.GetFromDisplayName(RiskeerCommonFormsResources.Structure_DrainCoefficient_DisplayName)),
new NumericInputRule(
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -59,7 +59,7 @@
StandardDeviation = RoundedDouble.NaN
};
- var expectedDrainCoefficient = new NormalDistribution(2)
+ var expectedDrainCoefficient = new LogNormalDistribution(2)
{
Mean = (RoundedDouble) 1,
StandardDeviation = (RoundedDouble) 0.2
@@ -192,7 +192,7 @@
};
RoundedDouble expectedVolumicWeightWater = input.VolumicWeightWater;
- NormalDistribution expectedDrainCoefficient = input.DrainCoefficient;
+ LogNormalDistribution expectedDrainCoefficient = input.DrainCoefficient;
RoundedDouble expectedFactorStormDurationOpenStructure = input.FactorStormDurationOpenStructure;
double expectedFailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion;
@@ -544,12 +544,12 @@
var input = new StabilityPointStructuresInput();
var mean = (RoundedDouble) (0.01 + random.NextDouble());
var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble());
- var expectedDistribution = new NormalDistribution(2)
+ var expectedDistribution = new LogNormalDistribution(2)
{
Mean = mean,
StandardDeviation = input.DrainCoefficient.StandardDeviation
};
- var distributionToSet = new NormalDistribution(5)
+ var distributionToSet = new LogNormalDistribution(5)
{
Mean = mean,
StandardDeviation = standardDeviation
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil/StabilityPointStructuresTestDataGenerator.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil/StabilityPointStructuresTestDataGenerator.cs (.../StabilityPointStructuresTestDataGenerator.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Data.TestUtil/StabilityPointStructuresTestDataGenerator.cs (.../StabilityPointStructuresTestDataGenerator.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -53,7 +53,7 @@
StandardDeviation = random.NextRoundedDouble()
};
- input.DrainCoefficient = new NormalDistribution
+ input.DrainCoefficient = new LogNormalDistribution
{
Mean = random.NextRoundedDouble()
};
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs
===================================================================
diff -u -rd06df6e6080508212f7ef201ab0ba0f6cb2e63f5 -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision d06df6e6080508212f7ef201ab0ba0f6cb2e63f5)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -252,7 +252,7 @@
Mean = (RoundedDouble) 2,
CoefficientOfVariation = (RoundedDouble) 0.1
},
- DrainCoefficient = new NormalDistribution
+ DrainCoefficient = new LogNormalDistribution
{
Mean = (RoundedDouble) 0.1
},
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs
===================================================================
diff -u -rb0021e52ef17e3101d6e7089e3052ceb4621f3fe -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision b0021e52ef17e3101d6e7089e3052ceb4621f3fe)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -318,7 +318,7 @@
Assert.AreEqual($"De standaardafwijking voor '{insideWaterLevelFailureConstructionParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[7]);
Assert.AreEqual($"De verwachtingswaarde voor '{flowVelocityStructureClosableParameterName}' moet een concreet getal zijn.", msgs[8]);
Assert.AreEqual($"De variatiecoëfficiënt voor '{flowVelocityStructureClosableParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[9]);
- Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een concreet getal zijn.", msgs[10]);
+ Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een positief getal zijn.", msgs[10]);
Assert.AreEqual($"De standaardafwijking voor '{drainCoefficientParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[11]);
Assert.AreEqual($"De waarde voor '{factorStormDurationOpenStructureParameterName}' moet een concreet getal zijn.", msgs[12]);
Assert.AreEqual($"De waarde voor '{structureNormalOrientationParameterName}' moet een concreet getal zijn.", msgs[13]);
@@ -399,7 +399,7 @@
Assert.AreEqual($"De standaardafwijking voor '{insideWaterLevelFailureConstructionParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[7]);
Assert.AreEqual($"De verwachtingswaarde voor '{flowVelocityStructureClosableParameterName}' moet een concreet getal zijn.", msgs[8]);
Assert.AreEqual($"De variatiecoëfficiënt voor '{flowVelocityStructureClosableParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[9]);
- Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een concreet getal zijn.", msgs[10]);
+ Assert.AreEqual($"De verwachtingswaarde voor '{drainCoefficientParameterName}' moet een positief getal zijn.", msgs[10]);
Assert.AreEqual($"De standaardafwijking voor '{drainCoefficientParameterName}' moet groter zijn dan of gelijk zijn aan 0.", msgs[11]);
Assert.AreEqual($"De waarde voor '{factorStormDurationOpenStructureParameterName}' moet een concreet getal zijn.", msgs[12]);
Assert.AreEqual($"De waarde voor '{structureNormalOrientationParameterName}' moet een concreet getal zijn.", msgs[13]);
@@ -1876,7 +1876,6 @@
input.InsideWaterLevelFailureConstruction.Mean = value;
input.InsideWaterLevel.Mean = value;
input.FlowVelocityStructureClosable.Mean = value;
- input.DrainCoefficient.Mean = value;
input.LevelCrestStructure.Mean = value;
input.ThresholdHeightOpenWeir.Mean = value;
input.ShipMass.Mean = value;
@@ -1933,6 +1932,7 @@
input.InsideWaterLevel.StandardDeviation = value;
input.StormDuration.CoefficientOfVariation = value;
input.FlowVelocityStructureClosable.CoefficientOfVariation = value;
+ input.DrainCoefficient.Mean = value;
input.DrainCoefficient.StandardDeviation = value;
input.LevelCrestStructure.StandardDeviation = value;
input.ThresholdHeightOpenWeir.StandardDeviation = value;
Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresValidationRulesRegistryTest.cs
===================================================================
diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r7ab3bcc7c73d63e46759c65e47b72ea25ae020e0
--- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresValidationRulesRegistryTest.cs (.../StabilityPointStructuresValidationRulesRegistryTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea)
+++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Service.Test/StabilityPointStructuresValidationRulesRegistryTest.cs (.../StabilityPointStructuresValidationRulesRegistryTest.cs) (revision 7ab3bcc7c73d63e46759c65e47b72ea25ae020e0)
@@ -165,7 +165,7 @@
Assert.IsInstanceOf(validationRules[3]);
Assert.IsInstanceOf(validationRules[4]);
Assert.IsInstanceOf(validationRules[5]);
- Assert.IsInstanceOf(validationRules[6]);
+ Assert.IsInstanceOf(validationRules[6]);
Assert.IsInstanceOf(validationRules[7]);
Assert.IsInstanceOf(validationRules[8]);
Assert.IsInstanceOf(validationRules[9]);