Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs
===================================================================
diff -u -rde737ee4b24659d188bb137d385572159bc099ff -rc23da0cb282e2e64a20e057d4110a25d4dee5826
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision de737ee4b24659d188bb137d385572159bc099ff)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Defaults/FailureMechanismDefaults.cs (.../FailureMechanismDefaults.cs) (revision c23da0cb282e2e64a20e057d4110a25d4dee5826)
@@ -24,7 +24,7 @@
namespace Ringtoets.HydraRing.Calculation.Data.Defaults
{
///
- /// Container for failure mechanims defaults.
+ /// Container for failure mechanism defaults.
///
public class FailureMechanismDefaults
{
@@ -35,9 +35,9 @@
///
/// Creates a new instance of the class.
///
- /// The mechanism id that corresponds to a specific .
- /// The id of the variable that is relevant for a specific .
- /// The sub mechanism ids that are applicable for a specific .
+ /// The mechanism id.
+ /// The id of the variable that is relevant.
+ /// The sub mechanism ids that are applicable.
public FailureMechanismDefaults(int mechanismId, int variableId, IEnumerable subMechanismIds)
{
this.mechanismId = mechanismId;
@@ -46,7 +46,7 @@
}
///
- /// Gets the mechanism id that corresponds to a specific .
+ /// Gets the mechanism id.
///
public int MechanismId
{
@@ -57,7 +57,7 @@
}
///
- /// Gets the id of the variable that is relevant for a specific .
+ /// Gets the id of the variable that is relevant.
///
public int VariableId
{
@@ -68,7 +68,7 @@
}
///
- /// Gets the sub mechanism ids that are applicable for a specific .
+ /// Gets the sub mechanism ids that are applicable.
///
public IEnumerable SubMechanismIds
{
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/FailureMechanismSettings.cs
===================================================================
diff -u -rde737ee4b24659d188bb137d385572159bc099ff -rc23da0cb282e2e64a20e057d4110a25d4dee5826
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/FailureMechanismSettings.cs (.../FailureMechanismSettings.cs) (revision de737ee4b24659d188bb137d385572159bc099ff)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/FailureMechanismSettings.cs (.../FailureMechanismSettings.cs) (revision c23da0cb282e2e64a20e057d4110a25d4dee5826)
@@ -22,7 +22,7 @@
namespace Ringtoets.HydraRing.Calculation.Data.Settings
{
///
- /// Container for failure mechanims settings.
+ /// Container for failure mechanism settings.
///
public class FailureMechanismSettings
{
@@ -46,7 +46,7 @@
///
/// Gets the minimum value to use while iterating to a target probability.
///
- /// This property is only applicable in case of type-2 computations.
+ /// This property is only applicable in case of type 2 computations.
public double ValueMin
{
get
@@ -58,7 +58,7 @@
///
/// Gets the maximum value to use while iterating to a target probability.
///
- /// This property is only applicable in case of type-2 computations.
+ /// This property is only applicable in case of type 2 computations.
public double ValueMax
{
get
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/SubMechanismSettings.cs
===================================================================
diff -u -rde737ee4b24659d188bb137d385572159bc099ff -rc23da0cb282e2e64a20e057d4110a25d4dee5826
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/SubMechanismSettings.cs (.../SubMechanismSettings.cs) (revision de737ee4b24659d188bb137d385572159bc099ff)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/SubMechanismSettings.cs (.../SubMechanismSettings.cs) (revision c23da0cb282e2e64a20e057d4110a25d4dee5826)
@@ -22,7 +22,7 @@
namespace Ringtoets.HydraRing.Calculation.Data.Settings
{
///
- /// Container for sub mechanims settings.
+ /// Container for sub mechanism settings.
///
public class SubMechanismSettings
{
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Service/HydraRingConfigurationService.cs
===================================================================
diff -u -rde737ee4b24659d188bb137d385572159bc099ff -rc23da0cb282e2e64a20e057d4110a25d4dee5826
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Service/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision de737ee4b24659d188bb137d385572159bc099ff)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Service/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision c23da0cb282e2e64a20e057d4110a25d4dee5826)
@@ -299,9 +299,9 @@
{
var failureMechanismDefaults = failureMechanismDefaultsProvider.GetFailureMechanismDefaults(hydraRingCalculationInput.FailureMechanismType);
- foreach (var subMechanimsId in failureMechanismDefaults.SubMechanismIds)
+ foreach (var subMechanismId in failureMechanismDefaults.SubMechanismIds)
{
- var subMechanismSettings = subMechanismSettingsProvider.GetSubMechanismSettings(hydraRingCalculationInput.FailureMechanismType, subMechanimsId, ringId);
+ var subMechanismSettings = subMechanismSettingsProvider.GetSubMechanismSettings(hydraRingCalculationInput.FailureMechanismType, subMechanismId, ringId);
orderDictionaries.Add(new OrderedDictionary
{
@@ -318,7 +318,7 @@
"AlternativeId", defaultAlternativeId // Fixed: no support for piping
},
{
- "SubMechanismId", subMechanimsId
+ "SubMechanismId", subMechanismId
},
{
"Method", subMechanismSettings.CalculationTechniqueId
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs
===================================================================
diff -u -rde737ee4b24659d188bb137d385572159bc099ff -rc23da0cb282e2e64a20e057d4110a25d4dee5826
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision de737ee4b24659d188bb137d385572159bc099ff)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision c23da0cb282e2e64a20e057d4110a25d4dee5826)
@@ -33,17 +33,28 @@
public void Constructor_ExpectedValues()
{
// Call
- var assessmentLevelCalculation = new AssessmentLevelCalculationInput(1, 2.2);
+ var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, 2.2);
// Assert
- Assert.AreEqual(1, assessmentLevelCalculation.HydraulicBoundaryLocationId);
- Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculation.FailureMechanismType);
- Assert.AreEqual(2, assessmentLevelCalculation.CalculationTypeId);
- CollectionAssert.IsEmpty(assessmentLevelCalculation.ProfilePoints);
- Assert.AreEqual(2.2, assessmentLevelCalculation.Beta);
- Assert.AreEqual(1, assessmentLevelCalculation.Variables.Count());
+ Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculationInput.FailureMechanismType);
+ Assert.AreEqual(2, assessmentLevelCalculationInput.CalculationTypeId);
+ Assert.AreEqual(1, assessmentLevelCalculationInput.HydraulicBoundaryLocationId);
+ Assert.IsNotNull(assessmentLevelCalculationInput.DikeSection);
+ Assert.AreEqual(1, assessmentLevelCalculationInput.Variables.Count());
+ CollectionAssert.IsEmpty(assessmentLevelCalculationInput.ProfilePoints);
+ Assert.AreEqual(2.2, assessmentLevelCalculationInput.Beta);
- var assessmentLevelVariable = assessmentLevelCalculation.Variables.First();
+ var dikeSection = assessmentLevelCalculationInput.DikeSection;
+ Assert.AreEqual(1, dikeSection.SectionId);
+ Assert.AreEqual("1", dikeSection.SectionName);
+ Assert.IsNaN(dikeSection.SectionBeginCoordinate);
+ Assert.IsNaN(dikeSection.SectionEndCoordinate);
+ Assert.IsNaN(dikeSection.SectionLength);
+ Assert.IsNaN(dikeSection.CrossSectionXCoordinate);
+ Assert.IsNaN(dikeSection.CrossSectionYCoordinate);
+ Assert.IsNaN(dikeSection.CrossSectionNormal);
+
+ var assessmentLevelVariable = assessmentLevelCalculationInput.Variables.First();
Assert.AreEqual(26, assessmentLevelVariable.VariableId);
Assert.AreEqual(HydraRingDistributionType.Deterministic, assessmentLevelVariable.DistributionType);
Assert.AreEqual(0.0, assessmentLevelVariable.Value);
@@ -52,5 +63,15 @@
Assert.IsNaN(assessmentLevelVariable.Variability);
Assert.IsNaN(assessmentLevelVariable.Shift);
}
+
+ [Test]
+ public void GetSubMechanismModelId_ReturnsExpectedValues()
+ {
+ // Call
+ var assessmentLevelCalculationInput = new AssessmentLevelCalculationInput(1, 2.2);
+
+ // Assert
+ Assert.IsNull(assessmentLevelCalculationInput.GetSubMechanismModelId(1));
+ }
}
}
\ No newline at end of file
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/TargetProbabilityCalculationInputTest.cs
===================================================================
diff -u -rde737ee4b24659d188bb137d385572159bc099ff -rc23da0cb282e2e64a20e057d4110a25d4dee5826
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/TargetProbabilityCalculationInputTest.cs (.../TargetProbabilityCalculationInputTest.cs) (revision de737ee4b24659d188bb137d385572159bc099ff)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/TargetProbabilityCalculationInputTest.cs (.../TargetProbabilityCalculationInputTest.cs) (revision c23da0cb282e2e64a20e057d4110a25d4dee5826)
@@ -38,6 +38,7 @@
Assert.AreEqual(1, targetProbabilityCalculationInputImplementation.HydraulicBoundaryLocationId);
Assert.AreEqual(HydraRingFailureMechanismType.DikesPiping, targetProbabilityCalculationInputImplementation.FailureMechanismType);
Assert.AreEqual(2, targetProbabilityCalculationInputImplementation.CalculationTypeId);
+ Assert.AreEqual(1, targetProbabilityCalculationInputImplementation.DikeSection.SectionId);
CollectionAssert.IsEmpty(targetProbabilityCalculationInputImplementation.Variables);
CollectionAssert.IsEmpty(targetProbabilityCalculationInputImplementation.ProfilePoints);
Assert.AreEqual(2.2, targetProbabilityCalculationInputImplementation.Beta);