Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs
===================================================================
diff -u -r78822681793277150da4eac3ac214a9aa59a47dd -r764ecd57cde6fad64bf14589669b2cf34c276da6
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 78822681793277150da4eac3ac214a9aa59a47dd)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 764ecd57cde6fad64bf14589669b2cf34c276da6)
@@ -556,7 +556,7 @@
}
set
{
- ProbabilityHelper.ValidateProbability(value, nameof(value));
+ ProbabilityHelper.ValidateProbability(value, null);
probabilityCollisionSecondaryStructure = value;
}
}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rd21dfcc1bb4e27911dde3c32ae83291132a973c2 -r764ecd57cde6fad64bf14589669b2cf34c276da6
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision d21dfcc1bb4e27911dde3c32ae83291132a973c2)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 764ecd57cde6fad64bf14589669b2cf34c276da6)
@@ -102,15 +102,15 @@
if (TrySetStructure(readCalculation.StructureName, calculation)
&& TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
&& TrySetForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
- && TryReadFailureProbabilityRepairClosure(readCalculation, calculation)
&& TryReadEvaluationLevel(readCalculation, calculation)
- && TryReadStochasts(readCalculation, calculation)
- && TryReadOrientation(readCalculation, calculation)
+ && TryReadFailureProbabilityRepairClosure(readCalculation, calculation)
&& TryReadFailureProbabilityStructureWithErosion(readCalculation, calculation)
&& TryReadInflowModelType(readCalculation, calculation)
- && TryReadLoadSchematizationType(readCalculation, calculation)
&& TryReadLevellingCount(readCalculation, calculation)
+ && TryReadLoadSchematizationType(readCalculation, calculation)
&& TryReadProbabilityCollisionSecondaryStructure(readCalculation, calculation)
+ && TryReadStochasts(readCalculation, calculation)
+ && TryReadStructureNormalOrientation(readCalculation, calculation)
&& TryReadVerticalDistance(readCalculation, calculation)
&& readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile, calculation.Name, Log))
{
@@ -318,9 +318,10 @@
///
/// The calculation read from the imported file.
/// The calculation to configure.
- /// false when the orientation is invalid or when there is an orientation but
- /// no structure defined, true otherwise.
- private bool TryReadOrientation(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ /// false when the structure normal orientation is invalid or when there
+ /// is a structure normal orientation but no structure defined, true otherwise.
+ private bool TryReadStructureNormalOrientation(StructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.StructureNormalOrientation.HasValue)
{
@@ -354,6 +355,13 @@
return true;
}
+ ///
+ /// Reads the failure probability repair closure.
+ ///
+ /// The calculation read from the imported file.
+ /// The calculation to configure.
+ /// false when the failure probability repair closure is invalid or when there
+ /// is a failure probability repair closure but no structure defined, true otherwise.
private bool TryReadFailureProbabilityRepairClosure(StabilityPointStructuresCalculationConfiguration readCalculation,
StructuresCalculation calculation)
{
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -rd21dfcc1bb4e27911dde3c32ae83291132a973c2 -r764ecd57cde6fad64bf14589669b2cf34c276da6
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision d21dfcc1bb4e27911dde3c32ae83291132a973c2)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision 764ecd57cde6fad64bf14589669b2cf34c276da6)
@@ -72,7 +72,7 @@
"validConfigurationFailureProbabilityRepairClosureWithoutStructure.xml",
"Er is geen kunstwerk opgegeven om faalkans herstel van gefaalde situatie aan toe te voegen.");
yield return new TestCaseData(
- "validConfigurationInvalidFailureProbabilityRepairClosureElement.xml",
+ "validConfigurationInvalidFailureProbabilityRepairClosure.xml",
"Een waarde van '1,1' als faalkans herstel van gefaalde situatie is ongeldig. De waarde voor de faalkans moet in het bereik [0,0, 1,0] liggen.");
yield return new TestCaseData(
@@ -92,6 +92,9 @@
yield return new TestCaseData(
"validConfigurationProbabilityCollisionSecondaryStructureWithoutStructure.xml",
"Er is geen kunstwerk opgegeven om de kans op aanvaring tweede keermiddel per nivellering aan toe te voegen.");
+ yield return new TestCaseData(
+ "validConfigurationInvalidProbabilityCollisionSecondaryStructure.xml",
+ "Een waarde van '1,1' als de kans op aanvaring tweede keermiddel per nivellering is ongeldig. Kans moet in het bereik [0,0, 1,0] liggen.");
yield return new TestCaseData(
"validConfigurationLevellingCountWithoutStructure.xml",
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityRepairClosure.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityRepairClosure.xml (revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityRepairClosure.xml (revision 764ecd57cde6fad64bf14589669b2cf34c276da6)
@@ -0,0 +1,7 @@
+
+
+
+ kunstwerk1
+ 1.1
+
+
Fisheye: Tag 764ecd57cde6fad64bf14589669b2cf34c276da6 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidFailureProbabilityRepairClosureElement.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidProbabilityCollisionSecondaryStructure.xml
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidProbabilityCollisionSecondaryStructure.xml (revision 0)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationInvalidProbabilityCollisionSecondaryStructure.xml (revision 764ecd57cde6fad64bf14589669b2cf34c276da6)
@@ -0,0 +1,7 @@
+
+
+
+ kunstwerk1
+ 1.1
+
+
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationProbabilityCollisionSecondaryStructureWithoutStructure.xml
===================================================================
diff -u -r78822681793277150da4eac3ac214a9aa59a47dd -r764ecd57cde6fad64bf14589669b2cf34c276da6
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationProbabilityCollisionSecondaryStructureWithoutStructure.xml (.../validConfigurationProbabilityCollisionSecondaryStructureWithoutStructure.xml) (revision 78822681793277150da4eac3ac214a9aa59a47dd)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationImporter/validConfigurationProbabilityCollisionSecondaryStructureWithoutStructure.xml (.../validConfigurationProbabilityCollisionSecondaryStructureWithoutStructure.xml) (revision 764ecd57cde6fad64bf14589669b2cf34c276da6)
@@ -1,6 +1,6 @@
- 0.1
+ 1.1