Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r55da5223c7cf131d4f51ef82307eaec2916af82c -r2698972311ca90c3af1171c554c4dec237e34111
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 55da5223c7cf131d4f51ef82307eaec2916af82c)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -354,10 +354,10 @@
Assert.AreEqual(0.15, closingStructure.CriticalOvertoppingDischarge.CoefficientOfVariation.Value);
Assert.AreEqual(25.0, closingStructure.FlowWidthAtBottomProtection.Mean.Value);
Assert.AreEqual(0.05, closingStructure.FlowWidthAtBottomProtection.StandardDeviation.Value);
- Assert.AreEqual(1.0, closingStructure.ProbabilityOpenStructureBeforeFlooding.Value);
- Assert.AreEqual(0.1, closingStructure.FailureProbabilityOpenStructure.Value);
+ Assert.AreEqual(1.0, closingStructure.ProbabilityOpenStructureBeforeFlooding);
+ Assert.AreEqual(0.1, closingStructure.FailureProbabilityOpenStructure);
Assert.AreEqual(4, closingStructure.IdenticalApertures);
- Assert.AreEqual(1.0, closingStructure.FailureProbabilityReparation.Value);
+ Assert.AreEqual(1.0, closingStructure.FailureProbabilityReparation);
Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, closingStructure.InflowModelType);
}
@@ -515,7 +515,7 @@
Assert.AreEqual(4.95, structure.LevelCrestStructure.Mean, structure.LevelCrestStructure.Mean.GetAccuracy());
Assert.AreEqual(0.05, structure.LevelCrestStructure.StandardDeviation, structure.LevelCrestStructure.StandardDeviation.GetAccuracy());
Assert.AreEqual(0, structure.VerticalDistance, structure.VerticalDistance.GetAccuracy());
- Assert.AreEqual(0.5, structure.FailureProbabilityRepairClosure, structure.FailureProbabilityRepairClosure.GetAccuracy());
+ Assert.AreEqual(0.5, structure.FailureProbabilityRepairClosure);
Assert.AreEqual(10, structure.FailureCollisionEnergy.Mean, structure.FailureCollisionEnergy.Mean.GetAccuracy());
Assert.AreEqual(0.3, structure.FailureCollisionEnergy.CoefficientOfVariation,
structure.FailureCollisionEnergy.CoefficientOfVariation.GetAccuracy());
@@ -524,7 +524,7 @@
Assert.AreEqual(2, structure.ShipVelocity.Mean, structure.ShipVelocity.Mean.GetAccuracy());
Assert.AreEqual(0.2, structure.ShipVelocity.CoefficientOfVariation, structure.ShipVelocity.CoefficientOfVariation.GetAccuracy());
Assert.AreEqual(0, structure.LevellingCount);
- Assert.AreEqual(0, structure.ProbabilityCollisionSecondaryStructure, structure.ProbabilityCollisionSecondaryStructure.GetAccuracy());
+ Assert.AreEqual(0, structure.ProbabilityCollisionSecondaryStructure);
Assert.AreEqual(1, structure.FlowVelocityStructureClosable.Mean, structure.FlowVelocityStructureClosable.Mean.GetAccuracy());
Assert.AreEqual(1, structure.FlowVelocityStructureClosable.StandardDeviation,
structure.FlowVelocityStructureClosable.StandardDeviation.GetAccuracy());
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs
===================================================================
diff -u -rf9e4f420b403e6417f5dc2ba6d7beab9424baf89 -r2698972311ca90c3af1171c554c4dec237e34111
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision f9e4f420b403e6417f5dc2ba6d7beab9424baf89)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -86,10 +86,10 @@
Mean = constructionProperties.FlowWidthAtBottomProtection.Mean,
StandardDeviation = constructionProperties.FlowWidthAtBottomProtection.StandardDeviation
};
- ProbabilityOpenStructureBeforeFlooding = new RoundedDouble(2, constructionProperties.ProbabilityOpenStructureBeforeFlooding);
- FailureProbabilityOpenStructure = new RoundedDouble(2, constructionProperties.FailureProbabilityOpenStructure);
+ ProbabilityOpenStructureBeforeFlooding = constructionProperties.ProbabilityOpenStructureBeforeFlooding;
+ FailureProbabilityOpenStructure = constructionProperties.FailureProbabilityOpenStructure;
IdenticalApertures = constructionProperties.IdenticalApertures;
- FailureProbabilityReparation = new RoundedDouble(2, constructionProperties.FailureProbabilityReparation);
+ FailureProbabilityReparation = constructionProperties.FailureProbabilityReparation;
InflowModelType = constructionProperties.InflowModelType;
}
@@ -141,12 +141,12 @@
///
/// Gets the probability of the closing structure being open before flooding.
///
- public RoundedDouble ProbabilityOpenStructureBeforeFlooding { get; private set; }
+ public double ProbabilityOpenStructureBeforeFlooding { get; private set; }
///
/// Gets the probability of failing to close the closing structure.
///
- public RoundedDouble FailureProbabilityOpenStructure { get; private set; }
+ public double FailureProbabilityOpenStructure { get; private set; }
///
/// Gets the number of identical apertures of the closing structure.
@@ -156,7 +156,7 @@
///
/// Gets the probability of failing to repair a failed closure of the closing structure.
///
- public RoundedDouble FailureProbabilityReparation { get; private set; }
+ public double FailureProbabilityReparation { get; private set; }
///
/// Gets the type of closing structure inflow model.
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs
===================================================================
diff -u -rf9e4f420b403e6417f5dc2ba6d7beab9424baf89 -r2698972311ca90c3af1171c554c4dec237e34111
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision f9e4f420b403e6417f5dc2ba6d7beab9424baf89)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -161,17 +161,11 @@
Assert.AreEqual(2, flowWidthAtBottomProtection.StandardDeviation.NumberOfDecimalPlaces);
Assert.AreEqual(0.11, flowWidthAtBottomProtection.StandardDeviation, flowWidthAtBottomProtection.StandardDeviation.GetAccuracy());
- Assert.AreEqual(2, structure.ProbabilityOpenStructureBeforeFlooding.NumberOfDecimalPlaces);
- Assert.AreEqual(321.99, structure.ProbabilityOpenStructureBeforeFlooding, structure.ProbabilityOpenStructureBeforeFlooding.GetAccuracy());
-
- Assert.AreEqual(2, structure.FailureProbabilityOpenStructure.NumberOfDecimalPlaces);
- Assert.AreEqual(654.32, structure.FailureProbabilityOpenStructure, structure.FailureProbabilityOpenStructure.GetAccuracy());
-
+ Assert.AreEqual(321.987, structure.ProbabilityOpenStructureBeforeFlooding);
+ Assert.AreEqual(654.321, structure.FailureProbabilityOpenStructure);
Assert.AreEqual(42, structure.IdenticalApertures);
+ Assert.AreEqual(987.654, structure.FailureProbabilityReparation);
- Assert.AreEqual(2, structure.FailureProbabilityReparation.NumberOfDecimalPlaces);
- Assert.AreEqual(987.65, structure.FailureProbabilityReparation, structure.FailureProbabilityReparation.GetAccuracy());
-
Assert.AreEqual(ClosingStructureInflowModelType.LowSill, structure.InflowModelType);
}
}
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs
===================================================================
diff -u -rae381aa4c51be4fc3da292994aa14fd429b58a33 -r2698972311ca90c3af1171c554c4dec237e34111
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs (.../TestClosingStructureTest.cs) (revision ae381aa4c51be4fc3da292994aa14fd429b58a33)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.TestUtil.Test/TestClosingStructureTest.cs (.../TestClosingStructureTest.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -66,10 +66,10 @@
Assert.AreEqual(25.0, structure.FlowWidthAtBottomProtection.Mean.Value);
Assert.AreEqual(0.05, structure.FlowWidthAtBottomProtection.StandardDeviation.Value);
- Assert.AreEqual(1.0, structure.ProbabilityOpenStructureBeforeFlooding.Value);
- Assert.AreEqual(0.1, structure.FailureProbabilityOpenStructure.Value);
+ Assert.AreEqual(1.0, structure.ProbabilityOpenStructureBeforeFlooding);
+ Assert.AreEqual(0.1, structure.FailureProbabilityOpenStructure);
Assert.AreEqual(4, structure.IdenticalApertures);
- Assert.AreEqual(1.0, structure.FailureProbabilityReparation.Value);
+ Assert.AreEqual(1.0, structure.FailureProbabilityReparation);
Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType);
}
@@ -115,10 +115,10 @@
Assert.AreEqual(25.0, structure.FlowWidthAtBottomProtection.Mean.Value);
Assert.AreEqual(0.05, structure.FlowWidthAtBottomProtection.StandardDeviation.Value);
- Assert.AreEqual(1.0, structure.ProbabilityOpenStructureBeforeFlooding.Value);
- Assert.AreEqual(0.1, structure.FailureProbabilityOpenStructure.Value);
+ Assert.AreEqual(1.0, structure.ProbabilityOpenStructureBeforeFlooding);
+ Assert.AreEqual(0.1, structure.FailureProbabilityOpenStructure);
Assert.AreEqual(4, structure.IdenticalApertures);
- Assert.AreEqual(1.0, structure.FailureProbabilityReparation.Value);
+ Assert.AreEqual(1.0, structure.FailureProbabilityReparation);
Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, structure.InflowModelType);
}
}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs
===================================================================
diff -u -rf2053e36f2f245041599654de6aff095721e81bf -r2698972311ca90c3af1171c554c4dec237e34111
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision f2053e36f2f245041599654de6aff095721e81bf)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using Core.Common.Base.Data;
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.Probabilistics;
using BaseConstructionProperties = Ringtoets.Common.Data.StructureBase.ConstructionProperties;
@@ -43,34 +42,34 @@
{
LevelCrestStructure = new NormalDistribution(2)
{
- Mean = new RoundedDouble(2, constructionProperties.LevelCrestStructure.Mean),
- StandardDeviation = new RoundedDouble(2, constructionProperties.LevelCrestStructure.StandardDeviation)
+ Mean = constructionProperties.LevelCrestStructure.Mean,
+ StandardDeviation = constructionProperties.LevelCrestStructure.StandardDeviation
};
FlowWidthAtBottomProtection = new LogNormalDistribution(2)
{
- Mean = new RoundedDouble(2, constructionProperties.FlowWidthAtBottomProtection.Mean),
- StandardDeviation = new RoundedDouble(2, constructionProperties.FlowWidthAtBottomProtection.StandardDeviation)
+ Mean = constructionProperties.FlowWidthAtBottomProtection.Mean,
+ StandardDeviation = constructionProperties.FlowWidthAtBottomProtection.StandardDeviation
};
CriticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2)
{
- Mean = new RoundedDouble(2, constructionProperties.CriticalOvertoppingDischarge.Mean),
- CoefficientOfVariation = new RoundedDouble(2, constructionProperties.CriticalOvertoppingDischarge.CoefficientOfVariation)
+ Mean = constructionProperties.CriticalOvertoppingDischarge.Mean,
+ CoefficientOfVariation = constructionProperties.CriticalOvertoppingDischarge.CoefficientOfVariation
};
WidthFlowApertures = new VariationCoefficientNormalDistribution(2)
{
- Mean = new RoundedDouble(2, constructionProperties.WidthFlowApertures.Mean),
- CoefficientOfVariation = new RoundedDouble(2, constructionProperties.WidthFlowApertures.CoefficientOfVariation)
+ Mean = constructionProperties.WidthFlowApertures.Mean,
+ CoefficientOfVariation = constructionProperties.WidthFlowApertures.CoefficientOfVariation
};
FailureProbabilityStructureWithErosion = constructionProperties.FailureProbabilityStructureWithErosion;
StorageStructureArea = new VariationCoefficientLogNormalDistribution(2)
{
- Mean = new RoundedDouble(2, constructionProperties.StorageStructureArea.Mean),
- CoefficientOfVariation = new RoundedDouble(2, constructionProperties.StorageStructureArea.CoefficientOfVariation)
+ Mean = constructionProperties.StorageStructureArea.Mean,
+ CoefficientOfVariation = constructionProperties.StorageStructureArea.CoefficientOfVariation
};
AllowedLevelIncreaseStorage = new LogNormalDistribution(2)
{
- Mean = new RoundedDouble(2, constructionProperties.AllowedLevelIncreaseStorage.Mean),
- StandardDeviation = new RoundedDouble(2, constructionProperties.AllowedLevelIncreaseStorage.StandardDeviation)
+ Mean = constructionProperties.AllowedLevelIncreaseStorage.Mean,
+ StandardDeviation = constructionProperties.AllowedLevelIncreaseStorage.StandardDeviation
};
}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs
===================================================================
diff -u -r3b7c66a337a7aec08939f964d8b9257442cb7bbe -r2698972311ca90c3af1171c554c4dec237e34111
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision 3b7c66a337a7aec08939f964d8b9257442cb7bbe)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -103,7 +103,7 @@
StandardDeviation = constructionProperties.LevelCrestStructure.StandardDeviation
};
VerticalDistance = new RoundedDouble(2, constructionProperties.VerticalDistance);
- FailureProbabilityRepairClosure = new RoundedDouble(2, constructionProperties.FailureProbabilityRepairClosure);
+ FailureProbabilityRepairClosure = constructionProperties.FailureProbabilityRepairClosure;
FailureCollisionEnergy = new VariationCoefficientLogNormalDistribution(2)
{
Mean = constructionProperties.FailureCollisionEnergy.Mean,
@@ -120,7 +120,7 @@
CoefficientOfVariation = constructionProperties.ShipVelocity.CoefficientOfVariation
};
LevellingCount = constructionProperties.LevellingCount;
- ProbabilityCollisionSecondaryStructure = new RoundedDouble(2, constructionProperties.ProbabilityCollisionSecondaryStructure);
+ ProbabilityCollisionSecondaryStructure = constructionProperties.ProbabilityCollisionSecondaryStructure;
FlowVelocityStructureClosable = new NormalDistribution(2)
{
Mean = constructionProperties.FlowVelocityStructureClosable.Mean,
@@ -232,7 +232,7 @@
/// Gets the probability of failing to repair a failed closure of the stability point structure.
/// [1/year]
///
- public RoundedDouble FailureProbabilityRepairClosure { get; private set; }
+ public double FailureProbabilityRepairClosure { get; private set; }
///
/// Gets the failure collision energy of the stability point structure.
@@ -262,7 +262,7 @@
/// Gets the probability of a secondary collision on the structure.
/// [1/year/levelling]
///
- public RoundedDouble ProbabilityCollisionSecondaryStructure { get; private set; }
+ public double ProbabilityCollisionSecondaryStructure { get; private set; }
///
/// Gets the maximum flow velocity at which the structure is closable.
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs
===================================================================
diff -u -radd325fb1e135f779adf7c89446886ff15a9b17c -r2698972311ca90c3af1171c554c4dec237e34111
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision add325fb1e135f779adf7c89446886ff15a9b17c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -229,9 +229,7 @@
Assert.AreEqual(2, structure.VerticalDistance.NumberOfDecimalPlaces);
Assert.AreEqual(555.55, structure.VerticalDistance, structure.VerticalDistance.GetAccuracy());
- Assert.IsInstanceOf(structure.FailureProbabilityRepairClosure);
- Assert.AreEqual(2, structure.FailureProbabilityRepairClosure.NumberOfDecimalPlaces);
- Assert.AreEqual(0.55, structure.FailureProbabilityRepairClosure, structure.FailureProbabilityRepairClosure.GetAccuracy());
+ Assert.AreEqual(0.55, structure.FailureProbabilityRepairClosure);
VariationCoefficientLogNormalDistribution failureCollisionEnergy = structure.FailureCollisionEnergy;
Assert.AreEqual(2, failureCollisionEnergy.Mean.NumberOfDecimalPlaces);
@@ -253,9 +251,7 @@
Assert.AreEqual(42, structure.LevellingCount);
- Assert.IsInstanceOf(structure.ProbabilityCollisionSecondaryStructure);
- Assert.AreEqual(2, structure.ProbabilityCollisionSecondaryStructure.NumberOfDecimalPlaces);
- Assert.AreEqual(0.55, structure.ProbabilityCollisionSecondaryStructure, structure.ProbabilityCollisionSecondaryStructure.GetAccuracy());
+ Assert.AreEqual(0.55, structure.ProbabilityCollisionSecondaryStructure);
NormalDistribution flowVelocityStructureClosable = structure.FlowVelocityStructureClosable;
Assert.AreEqual(2, flowVelocityStructureClosable.Mean.NumberOfDecimalPlaces);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructureTest.cs
===================================================================
diff -u -radd325fb1e135f779adf7c89446886ff15a9b17c -r2698972311ca90c3af1171c554c4dec237e34111
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructureTest.cs (.../TestStabilityPointStructureTest.cs) (revision add325fb1e135f779adf7c89446886ff15a9b17c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.TestUtil.Test/TestStabilityPointStructureTest.cs (.../TestStabilityPointStructureTest.cs) (revision 2698972311ca90c3af1171c554c4dec237e34111)
@@ -80,7 +80,7 @@
AssertAreEqual(0.456, structure.LevelCrestStructure.StandardDeviation);
AssertAreEqual(555.55, structure.VerticalDistance);
- AssertAreEqual(0.55, structure.FailureProbabilityRepairClosure);
+ Assert.AreEqual(0.55, structure.FailureProbabilityRepairClosure);
AssertAreEqual(567.890, structure.FailureCollisionEnergy.Mean);
AssertAreEqual(0.567, structure.FailureCollisionEnergy.CoefficientOfVariation);
@@ -92,7 +92,7 @@
AssertAreEqual(0.567, structure.ShipVelocity.CoefficientOfVariation);
Assert.AreEqual(42, structure.LevellingCount);
- AssertAreEqual(0.55, structure.ProbabilityCollisionSecondaryStructure);
+ Assert.AreEqual(0.55, structure.ProbabilityCollisionSecondaryStructure);
AssertAreEqual(678.901, structure.FlowVelocityStructureClosable.Mean);
AssertAreEqual(0.678, structure.FlowVelocityStructureClosable.StandardDeviation);
@@ -168,7 +168,7 @@
AssertAreEqual(0.456, structure.LevelCrestStructure.StandardDeviation);
AssertAreEqual(555.55, structure.VerticalDistance);
- AssertAreEqual(0.55, structure.FailureProbabilityRepairClosure);
+ Assert.AreEqual(0.55, structure.FailureProbabilityRepairClosure);
AssertAreEqual(567.890, structure.FailureCollisionEnergy.Mean);
AssertAreEqual(0.567, structure.FailureCollisionEnergy.CoefficientOfVariation);
@@ -180,7 +180,7 @@
AssertAreEqual(0.567, structure.ShipVelocity.CoefficientOfVariation);
Assert.AreEqual(42, structure.LevellingCount);
- AssertAreEqual(0.55, structure.ProbabilityCollisionSecondaryStructure);
+ Assert.AreEqual(0.55, structure.ProbabilityCollisionSecondaryStructure);
AssertAreEqual(678.901, structure.FlowVelocityStructureClosable.Mean);
AssertAreEqual(0.678, structure.FlowVelocityStructureClosable.StandardDeviation);