Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs (.../StabilityPointStructureCreateExtensions.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityPointStructures/StabilityPointStructureCreateExtensions.cs (.../StabilityPointStructureCreateExtensions.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -95,7 +95,6 @@
LevellingCount = structure.LevellingCount,
ProbabilityCollisionSecondaryStructure = structure.ProbabilityCollisionSecondaryStructure.ToNaNAsNull(),
FlowVelocityStructureClosableMean = structure.FlowVelocityStructureClosable.Mean.ToNaNAsNull(),
- FlowVelocityStructureClosableStandardDeviation = structure.FlowVelocityStructureClosable.CoefficientOfVariation.ToNaNAsNull(),
StabilityLinearLoadModelMean = structure.StabilityLinearLoadModel.Mean.ToNaNAsNull(),
StabilityLinearLoadModelCoefficientOfVariation = structure.StabilityLinearLoadModel.CoefficientOfVariation.ToNaNAsNull(),
StabilityQuadraticLoadModelMean = structure.StabilityQuadraticLoadModel.Mean.ToNaNAsNull(),
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r8e8f8c83c45656f65adaa8e47600379dc5ae8f61 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 8e8f8c83c45656f65adaa8e47600379dc5ae8f61)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -752,7 +752,6 @@
-
@@ -814,7 +813,6 @@
-
@@ -3840,7 +3838,6 @@
-
@@ -3904,7 +3901,6 @@
-
@@ -5984,7 +5980,6 @@
-
@@ -6049,7 +6044,6 @@
-
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensions.cs (.../StabilityPointStructureEntityReadExtensions.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -140,8 +140,7 @@
ProbabilityCollisionSecondaryStructure = entity.ProbabilityCollisionSecondaryStructure.ToNullAsNaN(),
FlowVelocityStructureClosable =
{
- Mean = (RoundedDouble) entity.FlowVelocityStructureClosableMean.ToNullAsNaN(),
- CoefficientOfVariation = (RoundedDouble) entity.FlowVelocityStructureClosableStandardDeviation.ToNullAsNaN()
+ Mean = (RoundedDouble) entity.FlowVelocityStructureClosableMean.ToNullAsNaN()
},
StabilityLinearLoadModel =
{
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs (.../StabilityPointStructureCreateExtensionsTest.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructureCreateExtensionsTest.cs (.../StabilityPointStructureCreateExtensionsTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -105,7 +105,6 @@
Assert.AreEqual(structure.LevellingCount, entity.LevellingCount);
Assert.AreEqual(structure.ProbabilityCollisionSecondaryStructure, entity.ProbabilityCollisionSecondaryStructure);
Assert.AreEqual(structure.FlowVelocityStructureClosable.Mean.Value, entity.FlowVelocityStructureClosableMean);
- Assert.AreEqual(structure.FlowVelocityStructureClosable.CoefficientOfVariation.Value, entity.FlowVelocityStructureClosableStandardDeviation);
Assert.AreEqual(structure.StabilityLinearLoadModel.Mean.Value, entity.StabilityLinearLoadModelMean);
Assert.AreEqual(structure.StabilityLinearLoadModel.CoefficientOfVariation.Value, entity.StabilityLinearLoadModelCoefficientOfVariation);
Assert.AreEqual(structure.StabilityQuadraticLoadModel.Mean.Value, entity.StabilityQuadraticLoadModelMean);
@@ -273,7 +272,6 @@
Assert.IsNull(entity.ShipVelocityCoefficientOfVariation);
Assert.IsNull(entity.ProbabilityCollisionSecondaryStructure);
Assert.IsNull(entity.FlowVelocityStructureClosableMean);
- Assert.IsNull(entity.FlowVelocityStructureClosableStandardDeviation);
Assert.IsNull(entity.StabilityLinearLoadModelMean);
Assert.IsNull(entity.StabilityLinearLoadModelCoefficientOfVariation);
Assert.IsNull(entity.StabilityQuadraticLoadModelMean);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs
===================================================================
diff -u -r37f13bb1e3dd02fb150f737fab3199027c29754e -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 37f13bb1e3dd02fb150f737fab3199027c29754e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresCalculationCreateExtensionsTest.cs (.../StructuresCalculationCreateExtensionsTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -1151,7 +1151,6 @@
Assert.IsNull(entity.ShipVelocityMean);
Assert.IsNull(entity.ShipVelocityCoefficientOfVariation);
Assert.IsNull(entity.FlowVelocityStructureClosableMean);
- Assert.IsNull(entity.FlowVelocityStructureClosableStandardDeviation);
Assert.IsNull(entity.StabilityLinearLoadModelMean);
Assert.IsNull(entity.StabilityLinearLoadModelCoefficientOfVariation);
Assert.IsNull(entity.StabilityQuadraticLoadModelMean);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs (.../StabilityPointStructureEntityReadExtensionsTest.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureEntityReadExtensionsTest.cs (.../StabilityPointStructureEntityReadExtensionsTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -116,7 +116,6 @@
LevellingCount = 37,
ProbabilityCollisionSecondaryStructure = 38.38,
FlowVelocityStructureClosableMean = 39.39,
- FlowVelocityStructureClosableStandardDeviation = 40.40,
StabilityLinearLoadModelMean = 41.41,
StabilityLinearLoadModelCoefficientOfVariation = 42.42,
StabilityQuadraticLoadModelMean = 43.43,
@@ -174,7 +173,6 @@
Assert.AreEqual(entity.LevellingCount, structure.LevellingCount);
Assert.AreEqual(entity.ProbabilityCollisionSecondaryStructure, structure.ProbabilityCollisionSecondaryStructure);
Assert.AreEqual(entity.FlowVelocityStructureClosableMean, structure.FlowVelocityStructureClosable.Mean.Value);
- Assert.AreEqual(entity.FlowVelocityStructureClosableStandardDeviation, structure.FlowVelocityStructureClosable.CoefficientOfVariation.Value);
Assert.AreEqual(entity.StabilityLinearLoadModelMean, structure.StabilityLinearLoadModel.Mean.Value);
Assert.AreEqual(entity.StabilityLinearLoadModelCoefficientOfVariation, structure.StabilityLinearLoadModel.CoefficientOfVariation.Value);
Assert.AreEqual(entity.StabilityQuadraticLoadModelMean, structure.StabilityQuadraticLoadModel.Mean.Value);
@@ -230,7 +228,6 @@
ShipVelocityCoefficientOfVariation = null,
ProbabilityCollisionSecondaryStructure = null,
FlowVelocityStructureClosableMean = null,
- FlowVelocityStructureClosableStandardDeviation = null,
StabilityLinearLoadModelMean = null,
StabilityLinearLoadModelCoefficientOfVariation = null,
AreaFlowAperturesMean = null,
@@ -282,7 +279,6 @@
Assert.IsNaN(structure.ShipVelocity.CoefficientOfVariation);
Assert.IsNaN(structure.ProbabilityCollisionSecondaryStructure);
Assert.IsNaN(structure.FlowVelocityStructureClosable.Mean);
- Assert.IsNaN(structure.FlowVelocityStructureClosable.CoefficientOfVariation);
Assert.IsNaN(structure.StabilityLinearLoadModel.Mean);
Assert.IsNaN(structure.StabilityLinearLoadModel.CoefficientOfVariation);
Assert.IsNaN(structure.StabilityQuadraticLoadModel.Mean);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r37f13bb1e3dd02fb150f737fab3199027c29754e -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision 37f13bb1e3dd02fb150f737fab3199027c29754e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructuresCalculationEntityReadExtensionsTest.cs (.../StabilityPointStructuresCalculationEntityReadExtensionsTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -121,7 +121,6 @@
LevellingCount = 39,
ProbabilityCollisionSecondaryStructure = 0.40,
FlowVelocityStructureClosableMean = 41.41,
- FlowVelocityStructureClosableStandardDeviation = 42.42,
StabilityLinearLoadModelMean = 43.43,
StabilityLinearLoadModelCoefficientOfVariation = 44.44,
StabilityQuadraticLoadModelMean = 45.45,
@@ -249,7 +248,6 @@
ShipVelocityMean = null,
ShipVelocityCoefficientOfVariation = null,
FlowVelocityStructureClosableMean = null,
- FlowVelocityStructureClosableStandardDeviation = null,
StabilityLinearLoadModelMean = null,
StabilityLinearLoadModelCoefficientOfVariation = null,
StabilityQuadraticLoadModelMean = null,
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -540,8 +540,6 @@
Assert.AreEqual(0, structure.LevellingCount);
Assert.AreEqual(0, structure.ProbabilityCollisionSecondaryStructure);
Assert.AreEqual(1, structure.FlowVelocityStructureClosable.Mean, structure.FlowVelocityStructureClosable.Mean.GetAccuracy());
- Assert.AreEqual(1, structure.FlowVelocityStructureClosable.CoefficientOfVariation,
- structure.FlowVelocityStructureClosable.CoefficientOfVariation.GetAccuracy());
Assert.AreEqual(15, structure.StabilityLinearLoadModel.Mean, structure.StabilityLinearLoadModel.Mean.GetAccuracy());
Assert.AreEqual(0.1, structure.StabilityLinearLoadModel.CoefficientOfVariation,
structure.StabilityLinearLoadModel.CoefficientOfVariation.GetAccuracy());
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r020be8875c3ee16809e8af396307869029f12ba3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 020be8875c3ee16809e8af396307869029f12ba3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -518,15 +518,6 @@
}
///
- /// Looks up a localized string similar to Kritieke waarden.
- ///
- public static string Categories_CriticalValues {
- get {
- return ResourceManager.GetString("Categories_CriticalValues", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Algemeen.
///
public static string Categories_General {
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -r020be8875c3ee16809e8af396307869029f12ba3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 020be8875c3ee16809e8af396307869029f12ba3)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -721,9 +721,6 @@
Drempelhoogte [m+NAP]
-
- Kritieke waarden
-
Modelfactor instromend volume.
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -161,7 +161,7 @@
yield return new NormalHydraRingVariable(64, HydraRingDeviationType.Variation, modelFactorSubCriticalFlowMean, modelFactorSubCriticalFlowVariation);
yield return new NormalHydraRingVariable(65, HydraRingDeviationType.Standard, thresholdHeightOpenWeirMean, thresholdHeightOpenWeirStandardDeviation);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -162,7 +162,7 @@
yield return new DeterministicHydraRingVariable(61, structureNormalOrientation);
yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation);
yield return new NormalHydraRingVariable(72, HydraRingDeviationType.Standard, levelCrestStructureNotClosingMean, levelCrestStructureNotClosingStandardDeviation);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
yield return new DeterministicHydraRingVariable(107, deviationWaveDirection);
}
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -169,7 +169,7 @@
yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, flowWidthAtBottomProtectionMean, flowWidthAtBottomProtectionStandardDeviation);
yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation);
yield return new DeterministicHydraRingVariable(105, failureProbabilityStructureWithErosion);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
yield return new DeterministicHydraRingVariable(107, deviationWaveDirection);
yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation);
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs
===================================================================
diff -u -r64632be3edf736d75596e706cab6d7985c9d6804 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 64632be3edf736d75596e706cab6d7985c9d6804)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -267,7 +267,7 @@
yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, shipVelocityMean, shipVelocityVariation);
yield return new DeterministicHydraRingVariable(90, levellingCount);
yield return new DeterministicHydraRingVariable(91, probabilityCollisionSecondaryStructure);
- yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, flowVelocityStructureClosableMean, flowVelocityStructureClosableVariation);
+ yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Variation, flowVelocityStructureClosableMean, flowVelocityStructureClosableVariation);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, insideWaterLevelMean, insideWaterLevelStandardDeviation);
yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, allowedLevelIncreaseStorageMean, allowedLevelIncreaseStorageStandardDeviation);
yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, modelFactorStorageVolumeMean, modelFactorStorageVolumeStandardDeviation);
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -224,7 +224,7 @@
yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation);
yield return new LogNormalHydraRingVariable(80, HydraRingDeviationType.Variation, constructiveStrengthLinearLoadModelMean, constructiveStrengthLinearLoadModelVariation);
yield return new LogNormalHydraRingVariable(83, HydraRingDeviationType.Variation, stabilityLinearLoadModelMean, stabilityLinearLoadModelVariation);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -104,7 +104,7 @@
/// The mean of the stability quadratic load model.
/// The variation of the stability quadratic load model.
/// The mean of the width flow apertures.
- /// The standard deviation of the width flow apertures.
+ /// The standard deviation of the width flow apertures.
public StructuresStabilityPointLowSillQuadraticCalculationInput(long hydraulicBoundaryLocationId,
double sectionNormal,
IEnumerable forelandPoints,
@@ -144,7 +144,7 @@
double modelFactorSuperCriticalFlowMean, double modelFactorSuperCriticalFlowStandardDeviation,
double constructiveStrengthQuadraticLoadModelMean, double constructiveStrengthQuadraticLoadModelVariation,
double stabilityQuadraticLoadModelMean, double stabilityQuadraticLoadModelVariation,
- double widthFlowAperturesMean, double WidthFlowAperturesStandardDeviation)
+ double widthFlowAperturesMean, double widthFlowAperturesStandardDeviation)
: base(hydraulicBoundaryLocationId,
sectionNormal,
forelandPoints, breakWater,
@@ -188,7 +188,7 @@
this.stabilityQuadraticLoadModelMean = stabilityQuadraticLoadModelMean;
this.stabilityQuadraticLoadModelVariation = stabilityQuadraticLoadModelVariation;
this.widthFlowAperturesMean = widthFlowAperturesMean;
- this.widthFlowAperturesStandardDeviation = WidthFlowAperturesStandardDeviation;
+ this.widthFlowAperturesStandardDeviation = widthFlowAperturesStandardDeviation;
}
public override IEnumerable Variables
@@ -224,7 +224,7 @@
yield return new NormalHydraRingVariable(62, HydraRingDeviationType.Standard, modelFactorSuperCriticalFlowMean, modelFactorSuperCriticalFlowStandardDeviation);
yield return new LogNormalHydraRingVariable(81, HydraRingDeviationType.Variation, constructiveStrengthQuadraticLoadModelMean, constructiveStrengthQuadraticLoadModelVariation);
yield return new LogNormalHydraRingVariable(84, HydraRingDeviationType.Variation, stabilityQuadraticLoadModelMean, stabilityQuadraticLoadModelVariation);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, widthFlowAperturesMean, widthFlowAperturesStandardDeviation);
}
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -152,7 +152,7 @@
yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 13.3, 14.4);
yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 15.5, 16.6);
yield return new DeterministicHydraRingVariable(105, 17.7);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 29.9, 30.0);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, 29.9, 30.0);
yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 18.8, 19.9);
yield return new DeterministicHydraRingVariable(129, 20.0);
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -153,7 +153,7 @@
yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 13.3, 14.4);
yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 15.5, 16.6);
yield return new DeterministicHydraRingVariable(105, 17.7);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 28.8, 29.9);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, 28.8, 29.9);
yield return new DeterministicHydraRingVariable(107, 30.0);
yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 18.8, 19.9);
yield return new DeterministicHydraRingVariable(129, 20.0);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -121,7 +121,7 @@
yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 16.6, 17.7);
yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 18.8, 19.9);
yield return new DeterministicHydraRingVariable(105, 20.0);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 21.1, 22.2);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, 21.1, 22.2);
yield return new DeterministicHydraRingVariable(107, 23.3);
yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 24.4, 25.5);
}
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -164,7 +164,7 @@
yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1);
yield return new DeterministicHydraRingVariable(90, 22);
yield return new DeterministicHydraRingVariable(91, 23.3);
- yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5);
+ yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Variation, 24.4, 25.5);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7);
yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9);
yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -207,7 +207,7 @@
yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1);
yield return new DeterministicHydraRingVariable(90, 22);
yield return new DeterministicHydraRingVariable(91, 23.3);
- yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5);
+ yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Variation, 24.4, 25.5);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7);
yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9);
yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -207,7 +207,7 @@
yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1);
yield return new DeterministicHydraRingVariable(90, 22);
yield return new DeterministicHydraRingVariable(91, 23.3);
- yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5);
+ yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Variation, 24.4, 25.5);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7);
yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9);
yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -206,7 +206,7 @@
yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1);
yield return new DeterministicHydraRingVariable(90, 22);
yield return new DeterministicHydraRingVariable(91, 23.3);
- yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5);
+ yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Variation, 24.4, 25.5);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7);
yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9);
yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1);
@@ -215,7 +215,7 @@
yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 35.5, 36.6);
yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 37.7, 38.8);
yield return new DeterministicHydraRingVariable(105, 39.9);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 58.8, 59.9);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, 58.8, 59.9);
yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 40.0, 41.1);
yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.2, 43.3);
yield return new DeterministicHydraRingVariable(131, 44.4);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs
===================================================================
diff -u -r76f856cf99bc5f5b48b437848f496431bf78f452 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 76f856cf99bc5f5b48b437848f496431bf78f452)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -206,7 +206,7 @@
yield return new NormalHydraRingVariable(89, HydraRingDeviationType.Variation, 20.0, 21.1);
yield return new DeterministicHydraRingVariable(90, 22);
yield return new DeterministicHydraRingVariable(91, 23.3);
- yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Standard, 24.4, 25.5);
+ yield return new NormalHydraRingVariable(92, HydraRingDeviationType.Variation, 24.4, 25.5);
yield return new NormalHydraRingVariable(93, HydraRingDeviationType.Standard, 26.6, 27.7);
yield return new LogNormalHydraRingVariable(94, HydraRingDeviationType.Standard, 28.8, 29.9);
yield return new LogNormalHydraRingVariable(95, HydraRingDeviationType.Standard, 30.0, 31.1);
@@ -215,7 +215,7 @@
yield return new LogNormalHydraRingVariable(103, HydraRingDeviationType.Standard, 35.5, 36.6);
yield return new LogNormalHydraRingVariable(104, HydraRingDeviationType.Variation, 37.7, 38.8);
yield return new DeterministicHydraRingVariable(105, 39.9);
- yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Variation, 58.8, 59.9);
+ yield return new NormalHydraRingVariable(106, HydraRingDeviationType.Standard, 58.8, 59.9);
yield return new LogNormalHydraRingVariable(108, HydraRingDeviationType.Variation, 40.0, 41.1);
yield return new NormalHydraRingVariable(130, HydraRingDeviationType.Standard, 42.2, 43.3);
yield return new DeterministicHydraRingVariable(131, 44.4);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs
===================================================================
diff -u -rf67fc935cc7113eed98fa3bb12ae61188bf59697 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision f67fc935cc7113eed98fa3bb12ae61188bf59697)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -769,7 +769,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 103, 0, 4, 19.19, 20.2, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 104, 0, 4, 21.21, NULL, NULL, NULL, 0, 22.22, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 105, 23.23, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 106, 0, 2, 24.24, NULL, NULL, NULL, 0, 25.25, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 106, 0, 2, 24.24, 25.25, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 107, 26.26, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 108, 0, 4, 27.27, NULL, NULL, NULL, 0, 28.28, 999999);" + Environment.NewLine +
Environment.NewLine +
@@ -1236,7 +1236,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 103, 0, 4, 13.3, 14.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 104, 0, 4, 15.5, NULL, NULL, NULL, 0, 16.6, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 106, 0, 2, 29.9, NULL, NULL, NULL, 0, 30, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 106, 0, 2, 29.9, 30, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 108, 0, 4, 18.8, NULL, NULL, NULL, 0, 19.9, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 129, 20, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
Environment.NewLine +
@@ -1361,7 +1361,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 103, 0, 4, 13.3, 14.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 104, 0, 4, 15.5, NULL, NULL, NULL, 0, 16.6, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 106, 0, 2, 28.8, NULL, NULL, NULL, 0, 29.9, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 106, 0, 2, 28.8, 29.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 107, 30, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 108, 0, 4, 18.8, NULL, NULL, NULL, 0, 19.9, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 129, 20, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1502,7 +1502,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, NULL, NULL, NULL, 0, 25.5, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 95, 0, 4, 30, 31.1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1658,7 +1658,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, NULL, NULL, NULL, 0, 25.5, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 95, 0, 4, 30, 31.1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1813,7 +1813,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, NULL, NULL, NULL, 0, 25.5, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 95, 0, 4, 30, 31.1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1822,7 +1822,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 103, 0, 4, 35.5, 36.6, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 104, 0, 4, 37.7, NULL, NULL, NULL, 0, 38.8, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 106, 0, 2, 58.8, NULL, NULL, NULL, 0, 59.9, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 106, 0, 2, 58.8, 59.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 108, 0, 4, 40, NULL, NULL, NULL, 0, 41.1, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 42.2, 43.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 131, 44.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1969,7 +1969,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, NULL, NULL, NULL, 0, 25.5, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 95, 0, 4, 30, 31.1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
@@ -1978,7 +1978,7 @@
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 103, 0, 4, 35.5, 36.6, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 104, 0, 4, 37.7, NULL, NULL, NULL, 0, 38.8, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
- "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 106, 0, 2, 58.8, NULL, NULL, NULL, 0, 59.9, 999999);" + Environment.NewLine +
+ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 106, 0, 2, 58.8, 59.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 108, 0, 4, 40, NULL, NULL, NULL, 0, 41.1, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 42.2, 43.3, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
"INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 131, 44.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine +
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -124,7 +124,7 @@
FlowVelocityStructureClosable = new VariationCoefficientNormalDistribution(2)
{
Mean = constructionProperties.FlowVelocityStructureClosable.Mean,
- CoefficientOfVariation = constructionProperties.FlowVelocityStructureClosable.CoefficientOfVariation
+ CoefficientOfVariation = (RoundedDouble) 0.2
};
StabilityLinearLoadModel = new VariationCoefficientLogNormalDistribution(2)
{
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructureProperties.cs (.../StabilityPointStructureProperties.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -43,17 +43,17 @@
private const int locationPropertyIndex = 2;
private const int insideWaterLevelPropertyIndex = 3;
private const int insideWaterLevelFailureConstructionPropertyIndex = 4;
- private const int flowVelocityStructureClosablePropertyIndex = 5;
- private const int structureNormalOrientationPropertyIndex = 6;
- private const int stabilityPointStructureInflowModelTypePropertyIndex = 7;
- private const int widthFlowAperturesPropertyIndex = 8;
- private const int areaFlowAperturesPropertyIndex = 9;
- private const int flowWidthAtBottomProtectionPropertyIndex = 10;
- private const int storageStructureAreaPropertyIndex = 11;
- private const int allowedLevelIncreaseStoragePropertyIndex = 12;
- private const int levelCrestStructurePropertyIndex = 13;
- private const int thresholdHeightOpenWeirPropertyIndex = 14;
- private const int criticalOvertoppingDischargePropertyIndex = 15;
+ private const int structureNormalOrientationPropertyIndex = 5;
+ private const int stabilityPointStructureInflowModelTypePropertyIndex = 6;
+ private const int widthFlowAperturesPropertyIndex = 7;
+ private const int areaFlowAperturesPropertyIndex = 8;
+ private const int flowWidthAtBottomProtectionPropertyIndex = 9;
+ private const int storageStructureAreaPropertyIndex = 10;
+ private const int allowedLevelIncreaseStoragePropertyIndex = 11;
+ private const int levelCrestStructurePropertyIndex = 12;
+ private const int thresholdHeightOpenWeirPropertyIndex = 13;
+ private const int criticalOvertoppingDischargePropertyIndex = 14;
+ private const int flowVelocityStructureClosablePropertyIndex = 15;
private const int constructiveStrengthLinearLoadModelPropertyIndex = 16;
private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 17;
private const int bankWidthPropertyIndex = 18;
@@ -68,26 +68,6 @@
private const int stabilityLinearLoadModelPropertyIndex = 27;
private const int stabilityQuadraticLoadModelPropertyIndex = 28;
- #region Critical values
-
- [PropertyOrder(flowVelocityStructureClosablePropertyIndex)]
- [TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_CriticalValues))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_FlowVelocityStructureClosable_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_FlowVelocityStructureClosable_Description))]
- public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable
- {
- get
- {
- return new VariationCoefficientNormalDistributionProperties
- {
- Data = data.FlowVelocityStructureClosable
- };
- }
- }
-
- #endregion
-
#region General
[PropertyOrder(namePropertyIndex)]
@@ -308,6 +288,22 @@
}
}
+ [PropertyOrder(flowVelocityStructureClosablePropertyIndex)]
+ [TypeConverter(typeof(ExpandableObjectConverter))]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")]
+ public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable
+ {
+ get
+ {
+ return new VariationCoefficientNormalDistributionProperties
+ {
+ Data = data.FlowVelocityStructureClosable
+ };
+ }
+ }
+
[PropertyOrder(constructiveStrengthLinearLoadModelPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_Schematization))]
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresInputContextProperties.cs (.../StabilityPointStructuresInputContextProperties.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -53,23 +53,23 @@
private const int stormDurationPropertyIndex = 3;
private const int insideWaterLevelPropertyIndex = 4;
private const int insideWaterLevelFailureConstructionPropertyIndex = 5;
- private const int flowVelocityStructureClosablePropertyIndex = 6;
- private const int modelFactorSuperCriticalFlowPropertyIndex = 7;
- private const int drainCoefficientPropertyIndex = 8;
- private const int factorStormDurationOpenStructurePropertyIndex = 9;
- private const int structurePropertyIndex = 10;
- private const int structureLocationPropertyIndex = 11;
- private const int structureNormalOrientationPropertyIndex = 12;
- private const int inflowModelTypePropertyIndex = 13;
- private const int loadSchematizationTypePropertyIndex = 14;
- private const int widthFlowAperturesPropertyIndex = 15;
- private const int areaFlowAperturesPropertyIndex = 16;
- private const int flowWidthAtBottomProtectionPropertyIndex = 17;
- private const int storageStructureAreaPropertyIndex = 18;
- private const int allowedLevelIncreaseStoragePropertyIndex = 19;
- private const int levelCrestStructurePropertyIndex = 20;
- private const int thresholdHeightOpenWeirPropertyIndex = 21;
- private const int criticalOvertoppingDischargePropertyIndex = 22;
+ private const int modelFactorSuperCriticalFlowPropertyIndex = 6;
+ private const int drainCoefficientPropertyIndex = 7;
+ private const int factorStormDurationOpenStructurePropertyIndex = 8;
+ private const int structurePropertyIndex = 9;
+ private const int structureLocationPropertyIndex = 10;
+ private const int structureNormalOrientationPropertyIndex = 11;
+ private const int inflowModelTypePropertyIndex = 12;
+ private const int loadSchematizationTypePropertyIndex = 13;
+ private const int widthFlowAperturesPropertyIndex = 14;
+ private const int areaFlowAperturesPropertyIndex = 15;
+ private const int flowWidthAtBottomProtectionPropertyIndex = 16;
+ private const int storageStructureAreaPropertyIndex = 17;
+ private const int allowedLevelIncreaseStoragePropertyIndex = 18;
+ private const int levelCrestStructurePropertyIndex = 19;
+ private const int thresholdHeightOpenWeirPropertyIndex = 20;
+ private const int criticalOvertoppingDischargePropertyIndex = 21;
+ private const int flowVelocityStructureClosablePropertyIndex = 22;
private const int constructiveStrengthLinearLoadModelPropertyIndex = 23;
private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 24;
private const int bankWidthPropertyIndex = 25;
@@ -278,22 +278,6 @@
}
}
- [PropertyOrder(flowVelocityStructureClosablePropertyIndex)]
- [TypeConverter(typeof(ExpandableObjectConverter))]
- [ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_CriticalValues))]
- [ResourcesDisplayName(typeof(Resources), nameof(Resources.Structure_FlowVelocityStructureClosable_DisplayName))]
- [ResourcesDescription(typeof(Resources), nameof(Resources.Structure_FlowVelocityStructureClosable_Description))]
- public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable
- {
- get
- {
- return new VariationCoefficientNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.None, data.WrappedData, this)
- {
- Data = data.WrappedData.FlowVelocityStructureClosable
- };
- }
- }
-
#endregion
#region Schematization
@@ -375,6 +359,23 @@
}
}
+ [PropertyOrder(flowVelocityStructureClosablePropertyIndex)]
+ [TypeConverter(typeof(ExpandableObjectConverter))]
+ [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
+ [ResourcesDisplayName(typeof(Resources), "Structure_FlowVelocityStructureClosable_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "Structure_FlowVelocityStructureClosable_Description")]
+ public VariationCoefficientNormalDistributionProperties FlowVelocityStructureClosable
+ {
+ get
+ {
+ return new VariationCoefficientNormalDistributionProperties(VariationCoefficientDistributionPropertiesReadOnly.CoefficientOfVariation,
+ data.WrappedData, this)
+ {
+ Data = data.WrappedData.FlowVelocityStructureClosable
+ };
+ }
+ }
+
[DynamicVisible]
[PropertyOrder(areaFlowAperturesPropertyIndex)]
[TypeConverter(typeof(ExpandableObjectConverter))]
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -126,7 +126,7 @@
FlowVelocityStructureClosable =
{
Mean = (RoundedDouble) 678.901,
- CoefficientOfVariation = (RoundedDouble) 0.678
+ CoefficientOfVariation = (RoundedDouble) 0.2
},
StabilityLinearLoadModel =
{
@@ -257,7 +257,7 @@
Assert.AreEqual(2, flowVelocityStructureClosable.Mean.NumberOfDecimalPlaces);
Assert.AreEqual(678.90, flowVelocityStructureClosable.Mean, flowVelocityStructureClosable.Mean.GetAccuracy());
Assert.AreEqual(2, flowVelocityStructureClosable.CoefficientOfVariation.NumberOfDecimalPlaces);
- Assert.AreEqual(0.68, flowVelocityStructureClosable.CoefficientOfVariation, flowVelocityStructureClosable.CoefficientOfVariation.GetAccuracy());
+ Assert.AreEqual(0.2, flowVelocityStructureClosable.CoefficientOfVariation, flowVelocityStructureClosable.CoefficientOfVariation.GetAccuracy());
VariationCoefficientLogNormalDistribution stabilityLinearLoadModel = structure.StabilityLinearLoadModel;
Assert.AreEqual(2, stabilityLinearLoadModel.Mean.NumberOfDecimalPlaces);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs
===================================================================
diff -u -r7faf338152aa99f81c7169781c4971fe7b7bbfd3 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision 7faf338152aa99f81c7169781c4971fe7b7bbfd3)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -40,19 +40,18 @@
private const int insideWaterLevelPropertyIndex = 2;
private const int insideWaterLevelFailureConstructionPropertyIndex = 3;
-
- private const int flowVelocityStructureClosablePropertyIndex = 4;
-
- private const int structureNormalOrientationPropertyIndex = 5;
- private const int stabilityPointStructureInflowModelTypePropertyIndex = 6;
- private const int widthFlowAperturesPropertyIndex = 7;
- private const int areaFlowAperturesPropertyIndex = 8;
- private const int flowWidthAtBottomProtectionPropertyIndex = 9;
- private const int storageStructureAreaPropertyIndex = 10;
- private const int allowedLevelIncreaseStoragePropertyIndex = 11;
- private const int levelCrestStructurePropertyIndex = 12;
- private const int thresholdHeightOpenWeirPropertyIndex = 13;
- private const int criticalOvertoppingDischargePropertyIndex = 14;
+
+ private const int structureNormalOrientationPropertyIndex = 4;
+ private const int stabilityPointStructureInflowModelTypePropertyIndex = 5;
+ private const int widthFlowAperturesPropertyIndex = 6;
+ private const int areaFlowAperturesPropertyIndex = 7;
+ private const int flowWidthAtBottomProtectionPropertyIndex = 8;
+ private const int storageStructureAreaPropertyIndex = 9;
+ private const int allowedLevelIncreaseStoragePropertyIndex = 10;
+ private const int levelCrestStructurePropertyIndex = 11;
+ private const int thresholdHeightOpenWeirPropertyIndex = 12;
+ private const int criticalOvertoppingDischargePropertyIndex = 13;
+ private const int flowVelocityStructureClosablePropertyIndex = 14;
private const int constructiveStrengthLinearLoadModelPropertyIndex = 15;
private const int constructiveStrengthQuadraticLoadModelPropertyIndex = 16;
private const int bankWidthPropertyIndex = 17;
@@ -221,7 +220,6 @@
const string schematizationCategory = "Schematisatie";
const string hydraulicDataCategory = "Hydraulische gegevens";
const string generalCategory = "Algemeen";
- const string criticalValuesCategory = "Kritieke waarden";
PropertyDescriptor nameProperty = dynamicProperties[namePropertyIndex];
Assert.IsTrue(nameProperty.IsReadOnly);
@@ -247,12 +245,6 @@
Assert.AreEqual("Binnenwaterstand bij constructief falen [m+NAP]", insideWaterLevelFailureConstructionProperty.DisplayName);
Assert.AreEqual("Binnenwaterstand bij constructief falen.", insideWaterLevelFailureConstructionProperty.Description);
- PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[flowVelocityStructureClosablePropertyIndex];
- Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter);
- Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category);
- Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
- Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
-
PropertyDescriptor structureNormalOrientationProperty = dynamicProperties[structureNormalOrientationPropertyIndex];
Assert.IsTrue(structureNormalOrientationProperty.IsReadOnly);
Assert.AreEqual(schematizationCategory, structureNormalOrientationProperty.Category);
@@ -313,6 +305,12 @@
Assert.AreEqual("Kritiek instromend debiet [m³/s/m]", criticalOvertoppingDischargeProperty.DisplayName);
Assert.AreEqual("Kritiek instromend debiet directe invoer per strekkende meter.", criticalOvertoppingDischargeProperty.Description);
+ PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[flowVelocityStructureClosablePropertyIndex];
+ Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter);
+ Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category);
+ Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
+ Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
+
PropertyDescriptor constructiveStrengthLinearLoadModelProperty = dynamicProperties[constructiveStrengthLinearLoadModelPropertyIndex];
Assert.IsInstanceOf(constructiveStrengthLinearLoadModelProperty.Converter);
Assert.AreEqual(schematizationCategory, constructiveStrengthLinearLoadModelProperty.Category);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs
===================================================================
diff -u -r8e8f8c83c45656f65adaa8e47600379dc5ae8f61 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 8e8f8c83c45656f65adaa8e47600379dc5ae8f61)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresInputContextPropertiesTest.cs (.../StabilityPointStructuresInputContextPropertiesTest.cs) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -152,7 +152,6 @@
const string schematizationCategory = "Schematisatie";
const string hydraulicDataCategory = "Hydraulische gegevens";
const string modelSettingsCategory = "Modelinstellingen";
- const string criticalValuesCategory = "Kritieke waarden";
var dynamicPropertyBag = new DynamicPropertyBag(properties);
PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
@@ -181,7 +180,7 @@
PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[linearLowSillFlowVelocityStructureClosablePropertyIndex];
Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter);
- Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category);
+ Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category);
Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
@@ -329,7 +328,6 @@
const string schematizationCategory = "Schematisatie";
const string hydraulicDataCategory = "Hydraulische gegevens";
const string modelSettingsCategory = "Modelinstellingen";
- const string criticalValuesCategory = "Kritieke waarden";
var dynamicPropertyBag = new DynamicPropertyBag(properties);
PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
@@ -358,7 +356,7 @@
PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[quadraticLowSillFlowVelocityStructureClosablePropertyIndex];
Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter);
- Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category);
+ Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category);
Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
@@ -506,7 +504,6 @@
const string schematizationCategory = "Schematisatie";
const string hydraulicDataCategory = "Hydraulische gegevens";
const string modelSettingsCategory = "Modelinstellingen";
- const string criticalValuesCategory = "Kritieke waarden";
var dynamicPropertyBag = new DynamicPropertyBag(properties);
PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
@@ -535,7 +532,7 @@
PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[linearFloodedCulvertFlowVelocityStructureClosablePropertyIndex];
Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter);
- Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category);
+ Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category);
Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
@@ -693,7 +690,6 @@
const string schematizationCategory = "Schematisatie";
const string hydraulicDataCategory = "Hydraulische gegevens";
const string modelSettingsCategory = "Modelinstellingen";
- const string criticalValuesCategory = "Kritieke waarden";
var dynamicPropertyBag = new DynamicPropertyBag(properties);
PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[]
@@ -722,7 +718,7 @@
PropertyDescriptor flowVelocityStructureClosableProperty = dynamicProperties[quadraticFloodedCulvertFlowVelocityStructureClosablePropertyIndex];
Assert.IsInstanceOf(flowVelocityStructureClosableProperty.Converter);
- Assert.AreEqual(criticalValuesCategory, flowVelocityStructureClosableProperty.Category);
+ Assert.AreEqual(schematizationCategory, flowVelocityStructureClosableProperty.Category);
Assert.AreEqual("Kritieke stroomsnelheid sluiting eerste keermiddel [m/s]", flowVelocityStructureClosableProperty.DisplayName);
Assert.AreEqual("Stroomsnelheid waarbij na aanvaring het eerste keermiddel nog net kan worden gesloten.", flowVelocityStructureClosableProperty.Description);
@@ -1468,21 +1464,21 @@
private const int linearLowSillStormDurationPropertyIndex = 2;
private const int linearLowSillInsideWaterLevelPropertyIndex = 3;
private const int linearLowSillInsideWaterLevelFailureConstructionPropertyIndex = 4;
- private const int linearLowSillFlowVelocityStructureClosablePropertyIndex = 5;
- private const int linearLowSillModelFactorSuperCriticalFlowPropertyIndex = 6;
- private const int linearLowSillFactorStormDurationOpenStructurePropertyIndex = 7;
- private const int linearLowSillStructurePropertyIndex = 8;
- private const int linearLowSillStructureLocationPropertyIndex = 9;
- private const int linearLowSillStructureNormalOrientationPropertyIndex = 10;
- private const int linearLowSillInflowModelTypePropertyIndex = 11;
- private const int linearLowSillLoadSchematizationTypePropertyIndex = 12;
- private const int linearLowSillWidthFlowAperturesPropertyIndex = 13;
- private const int linearLowSillFlowWidthAtBottomProtectionPropertyIndex = 14;
- private const int linearLowSillStorageStructureAreaPropertyIndex = 15;
- private const int linearLowSillAllowedLevelIncreaseStoragePropertyIndex = 16;
- private const int linearLowSillLevelCrestStructurePropertyIndex = 17;
- private const int linearLowSillThresholdHeightOpenWeirPropertyIndex = 18;
- private const int linearLowSillCriticalOvertoppingDischargePropertyIndex = 19;
+ private const int linearLowSillModelFactorSuperCriticalFlowPropertyIndex = 5;
+ private const int linearLowSillFactorStormDurationOpenStructurePropertyIndex = 6;
+ private const int linearLowSillStructurePropertyIndex = 7;
+ private const int linearLowSillStructureLocationPropertyIndex = 8;
+ private const int linearLowSillStructureNormalOrientationPropertyIndex = 9;
+ private const int linearLowSillInflowModelTypePropertyIndex = 10;
+ private const int linearLowSillLoadSchematizationTypePropertyIndex = 11;
+ private const int linearLowSillWidthFlowAperturesPropertyIndex = 12;
+ private const int linearLowSillFlowWidthAtBottomProtectionPropertyIndex = 13;
+ private const int linearLowSillStorageStructureAreaPropertyIndex = 14;
+ private const int linearLowSillAllowedLevelIncreaseStoragePropertyIndex = 15;
+ private const int linearLowSillLevelCrestStructurePropertyIndex = 16;
+ private const int linearLowSillThresholdHeightOpenWeirPropertyIndex = 17;
+ private const int linearLowSillCriticalOvertoppingDischargePropertyIndex = 18;
+ private const int linearLowSillFlowVelocityStructureClosablePropertyIndex = 19;
private const int linearLowSillConstructiveStrengthLinearLoadModelPropertyIndex = 20;
private const int linearLowSillBankWidthPropertyIndex = 21;
private const int linearLowSillEvaluationLevelPropertyIndex = 22;
@@ -1508,21 +1504,21 @@
private const int linearFloodedCulvertStormDurationPropertyIndex = 2;
private const int linearFloodedCulvertInsideWaterLevelPropertyIndex = 3;
private const int linearFloodedCulvertInsideWaterLevelFailureConstructionPropertyIndex = 4;
- private const int linearFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 5;
- private const int linearFloodedCulvertDrainCoefficientPropertyIndex = 6;
- private const int linearFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 7;
- private const int linearFloodedCulvertStructurePropertyIndex = 8;
- private const int linearFloodedCulvertStructureLocationPropertyIndex = 9;
- private const int linearFloodedCulvertStructureNormalOrientationPropertyIndex = 10;
- private const int linearFloodedCulvertInflowModelTypePropertyIndex = 11;
- private const int linearFloodedCulvertLoadSchematizationTypePropertyIndex = 12;
- private const int linearFloodedCulvertAreaFlowAperturesPropertyIndex = 13;
- private const int linearFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 14;
- private const int linearFloodedCulvertStorageStructureAreaPropertyIndex = 15;
- private const int linearFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 16;
- private const int linearFloodedCulvertLevelCrestStructurePropertyIndex = 17;
- private const int linearFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 18;
- private const int linearFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 19;
+ private const int linearFloodedCulvertDrainCoefficientPropertyIndex = 5;
+ private const int linearFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 6;
+ private const int linearFloodedCulvertStructurePropertyIndex = 7;
+ private const int linearFloodedCulvertStructureLocationPropertyIndex = 8;
+ private const int linearFloodedCulvertStructureNormalOrientationPropertyIndex = 9;
+ private const int linearFloodedCulvertInflowModelTypePropertyIndex = 10;
+ private const int linearFloodedCulvertLoadSchematizationTypePropertyIndex = 11;
+ private const int linearFloodedCulvertAreaFlowAperturesPropertyIndex = 12;
+ private const int linearFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 13;
+ private const int linearFloodedCulvertStorageStructureAreaPropertyIndex = 14;
+ private const int linearFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 15;
+ private const int linearFloodedCulvertLevelCrestStructurePropertyIndex = 16;
+ private const int linearFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 17;
+ private const int linearFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 18;
+ private const int linearFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 19;
private const int linearFloodedCulvertConstructiveStrengthLinearLoadModelPropertyIndex = 20;
private const int linearFloodedCulvertBankWidthPropertyIndex = 21;
private const int linearFloodedCulvertEvaluationLevelPropertyIndex = 22;
@@ -1548,21 +1544,21 @@
private const int quadraticLowSillStormDurationPropertyIndex = 2;
private const int quadraticLowSillInsideWaterLevelPropertyIndex = 3;
private const int quadraticLowSillInsideWaterLevelFailureConstructionPropertyIndex = 4;
- private const int quadraticLowSillFlowVelocityStructureClosablePropertyIndex = 5;
- private const int quadraticLowSillModelFactorSuperCriticalFlowPropertyIndex = 6;
- private const int quadraticLowSillFactorStormDurationOpenStructurePropertyIndex = 7;
- private const int quadraticLowSillStructurePropertyIndex = 8;
- private const int quadraticLowSillStructureLocationPropertyIndex = 9;
- private const int quadraticLowSillStructureNormalOrientationPropertyIndex = 10;
- private const int quadraticLowSillInflowModelTypePropertyIndex = 11;
- private const int quadraticLowSillLoadSchematizationTypePropertyIndex = 12;
- private const int quadraticLowSillWidthFlowAperturesPropertyIndex = 13;
- private const int quadraticLowSillFlowWidthAtBottomProtectionPropertyIndex = 14;
- private const int quadraticLowSillStorageStructureAreaPropertyIndex = 15;
- private const int quadraticLowSillAllowedLevelIncreaseStoragePropertyIndex = 16;
- private const int quadraticLowSillLevelCrestStructurePropertyIndex = 17;
- private const int quadraticLowSillThresholdHeightOpenWeirPropertyIndex = 18;
- private const int quadraticLowSillCriticalOvertoppingDischargePropertyIndex = 19;
+ private const int quadraticLowSillModelFactorSuperCriticalFlowPropertyIndex = 5;
+ private const int quadraticLowSillFactorStormDurationOpenStructurePropertyIndex = 6;
+ private const int quadraticLowSillStructurePropertyIndex = 7;
+ private const int quadraticLowSillStructureLocationPropertyIndex = 8;
+ private const int quadraticLowSillStructureNormalOrientationPropertyIndex = 9;
+ private const int quadraticLowSillInflowModelTypePropertyIndex = 10;
+ private const int quadraticLowSillLoadSchematizationTypePropertyIndex = 11;
+ private const int quadraticLowSillWidthFlowAperturesPropertyIndex = 12;
+ private const int quadraticLowSillFlowWidthAtBottomProtectionPropertyIndex = 13;
+ private const int quadraticLowSillStorageStructureAreaPropertyIndex = 14;
+ private const int quadraticLowSillAllowedLevelIncreaseStoragePropertyIndex = 15;
+ private const int quadraticLowSillLevelCrestStructurePropertyIndex = 16;
+ private const int quadraticLowSillThresholdHeightOpenWeirPropertyIndex = 17;
+ private const int quadraticLowSillCriticalOvertoppingDischargePropertyIndex = 18;
+ private const int quadraticLowSillFlowVelocityStructureClosablePropertyIndex = 19;
private const int quadraticLowSillConstructiveStrengthQuadraticLoadModelPropertyIndex = 20;
private const int quadraticLowSillBankWidthPropertyIndex = 21;
private const int quadraticLowSillEvaluationLevelPropertyIndex = 22;
@@ -1588,21 +1584,21 @@
private const int quadraticFloodedCulvertStormDurationPropertyIndex = 2;
private const int quadraticFloodedCulvertInsideWaterLevelPropertyIndex = 3;
private const int quadraticFloodedCulvertInsideWaterLevelFailureConstructionPropertyIndex = 4;
- private const int quadraticFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 5;
- private const int quadraticFloodedCulvertDrainCoefficientPropertyIndex = 6;
- private const int quadraticFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 7;
- private const int quadraticFloodedCulvertStructurePropertyIndex = 8;
- private const int quadraticFloodedCulvertStructureLocationPropertyIndex = 9;
- private const int quadraticFloodedCulvertStructureNormalOrientationPropertyIndex = 10;
- private const int quadraticFloodedCulvertInflowModelTypePropertyIndex = 11;
- private const int quadraticFloodedCulvertLoadSchematizationTypePropertyIndex = 12;
- private const int quadraticFloodedCulvertAreaFlowAperturesPropertyIndex = 13;
- private const int quadraticFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 14;
- private const int quadraticFloodedCulvertStorageStructureAreaPropertyIndex = 15;
- private const int quadraticFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 16;
- private const int quadraticFloodedCulvertLevelCrestStructurePropertyIndex = 17;
- private const int quadraticFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 18;
- private const int quadraticFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 19;
+ private const int quadraticFloodedCulvertDrainCoefficientPropertyIndex = 5;
+ private const int quadraticFloodedCulvertFactorStormDurationOpenStructurePropertyIndex = 6;
+ private const int quadraticFloodedCulvertStructurePropertyIndex = 7;
+ private const int quadraticFloodedCulvertStructureLocationPropertyIndex = 8;
+ private const int quadraticFloodedCulvertStructureNormalOrientationPropertyIndex = 9;
+ private const int quadraticFloodedCulvertInflowModelTypePropertyIndex = 10;
+ private const int quadraticFloodedCulvertLoadSchematizationTypePropertyIndex = 11;
+ private const int quadraticFloodedCulvertAreaFlowAperturesPropertyIndex = 12;
+ private const int quadraticFloodedCulvertFlowWidthAtBottomProtectionPropertyIndex = 13;
+ private const int quadraticFloodedCulvertStorageStructureAreaPropertyIndex = 14;
+ private const int quadraticFloodedCulvertAllowedLevelIncreaseStoragePropertyIndex = 15;
+ private const int quadraticFloodedCulvertLevelCrestStructurePropertyIndex = 16;
+ private const int quadraticFloodedCulvertThresholdHeightOpenWeirPropertyIndex = 17;
+ private const int quadraticFloodedCulvertCriticalOvertoppingDischargePropertyIndex = 18;
+ private const int quadraticFloodedCulvertFlowVelocityStructureClosablePropertyIndex = 19;
private const int quadraticFloodedCulvertConstructiveStrengthQuadraticLoadModelPropertyIndex = 20;
private const int quadraticFloodedCulvertBankWidthPropertyIndex = 21;
private const int quadraticFloodedCulvertEvaluationLevelPropertyIndex = 22;
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r8e8f8c83c45656f65adaa8e47600379dc5ae8f61 -r6ced2c3bd4adaef7cf2363ba75a84911b09c3924
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 8e8f8c83c45656f65adaa8e47600379dc5ae8f61)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 6ced2c3bd4adaef7cf2363ba75a84911b09c3924)
@@ -288,7 +288,6 @@
'LevellingCount' INT (4) NOT NULL,
'ProbabilityCollisionSecondaryStructure' REAL NOT NULL,
'FlowVelocityStructureClosableMean' REAL,
- 'FlowVelocityStructureClosableStandardDeviation' REAL,
'StabilityLinearLoadModelMean' REAL,
'StabilityLinearLoadModelCoefficientOfVariation' REAL,
'StabilityQuadraticLoadModelMean' REAL,
@@ -1239,7 +1238,6 @@
'LevellingCount' INT (4) NOT NULL,
'ProbabilityCollisionSecondaryStructure' REAL,
'FlowVelocityStructureClosableMean' REAL,
- 'FlowVelocityStructureClosableStandardDeviation' REAL,
'StabilityLinearLoadModelMean' REAL,
'StabilityLinearLoadModelCoefficientOfVariation' REAL,
'StabilityQuadraticLoadModelMean' REAL,