Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs
===================================================================
diff -u -rfabcc9cb4752cec071fb7290280043982974dffd -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision fabcc9cb4752cec071fb7290280043982974dffd)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -95,7 +95,7 @@
#endregion
- protected override void UpdateStructureProperties()
+ protected override void UpdateStructureParameters()
{
if (Structure != null)
{
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -rfabcc9cb4752cec071fb7290280043982974dffd -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision fabcc9cb4752cec071fb7290280043982974dffd)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -90,7 +90,7 @@
}
[Test]
- public void Properties_StructureNull_DoesNotChangeValues()
+ public void Input_StructureNull_DoesNotChangeValues()
{
var input = new ClosingStructuresInput();
@@ -102,7 +102,7 @@
}
[Test]
- public void Properties_Structure_UpdateValuesAccordingly()
+ public void Input_Structure_UpdateValuesAccordingly()
{
// Setup
var input = new ClosingStructuresInput();
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs
===================================================================
diff -u -r79037d58200b1305bb0768cfda981ff742111d05 -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision 79037d58200b1305bb0768cfda981ff742111d05)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -128,11 +128,27 @@
#endregion
///
- /// Synchronizes the input properties with the properties of the structure.
+ /// Gets or sets the structure.
///
- protected abstract void UpdateStructureProperties();
+ public T Structure
+ {
+ get
+ {
+ return structure;
+ }
+ set
+ {
+ structure = value;
+ UpdateStructureParameters();
+ }
+ }
///
+ /// Synchronizes the input parameters with the parameters of the structure.
+ ///
+ protected abstract void UpdateStructureParameters();
+
+ ///
/// Validates the provided probability value.
///
/// The probability value to validate.
@@ -144,6 +160,9 @@
#region Hydraulic data
+ ///
+ /// Gets or sets the hydraulic boundary location.
+ ///
public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; }
///
@@ -168,22 +187,6 @@
#region Schematization
///
- /// Gets or sets the structure.
- ///
- public T Structure
- {
- get
- {
- return structure;
- }
- set
- {
- structure = value;
- UpdateStructureProperties();
- }
- }
-
- ///
/// Gets or sets the orientation of the normal of the structure.
/// [degrees]
///
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs
===================================================================
diff -u -r7e18d72b65e2041b1493dca3bd0b722d1fa5a664 -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision 7e18d72b65e2041b1493dca3bd0b722d1fa5a664)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -44,44 +44,44 @@
// Setup
var modelFactorSuperCriticalFlow = new NormalDistribution(2)
{
- Mean = (RoundedDouble)1.1,
- StandardDeviation = (RoundedDouble)0.03
+ Mean = (RoundedDouble) 1.1,
+ StandardDeviation = (RoundedDouble) 0.03
};
var allowedLevelIncreaseStorage = new LogNormalDistribution(2)
{
- Mean = (RoundedDouble)double.NaN,
- StandardDeviation = (RoundedDouble)0.1
+ Mean = (RoundedDouble) double.NaN,
+ StandardDeviation = (RoundedDouble) 0.1
};
var storageStructureArea = new VariationCoefficientLogNormalDistribution(2)
{
- Mean = (RoundedDouble)double.NaN,
- CoefficientOfVariation = (RoundedDouble)0.1
+ Mean = (RoundedDouble) double.NaN,
+ CoefficientOfVariation = (RoundedDouble) 0.1
};
var flowWidthAtBottomProtection = new LogNormalDistribution(2)
{
- Mean = (RoundedDouble)double.NaN,
- StandardDeviation = (RoundedDouble)0.05
+ Mean = (RoundedDouble) double.NaN,
+ StandardDeviation = (RoundedDouble) 0.05
};
var criticalOvertoppingDischarge = new VariationCoefficientLogNormalDistribution(2)
{
- Mean = (RoundedDouble)double.NaN,
- CoefficientOfVariation = (RoundedDouble)0.15
+ Mean = (RoundedDouble) double.NaN,
+ CoefficientOfVariation = (RoundedDouble) 0.15
};
var widthFlowApertures = new VariationCoefficientNormalDistribution(2)
{
- Mean = (RoundedDouble)double.NaN,
- CoefficientOfVariation = (RoundedDouble)0.05
+ Mean = (RoundedDouble) double.NaN,
+ CoefficientOfVariation = (RoundedDouble) 0.05
};
var stormDuration = new VariationCoefficientLogNormalDistribution(2)
{
- Mean = (RoundedDouble)6.0,
- CoefficientOfVariation = (RoundedDouble)0.25
+ Mean = (RoundedDouble) 6.0,
+ CoefficientOfVariation = (RoundedDouble) 0.25
};
// Call
@@ -119,139 +119,119 @@
}
[Test]
- public void Properties_HydraulicBoundaryLocation_ExpectedValues()
+ public void Properties_Structure_UpdateValuesAccordingly()
{
// Setup
+ var structure = new SimpleStructure(new StructureBase.ConstructionProperties
+ {
+ Name = "",
+ Location = new Point2D(0, 0),
+ Id = "id"
+ });
+
var input = new SimpleStructuresInput();
- var location = new HydraulicBoundaryLocation(0, "test", 0, 0);
+ // Precondition
+ Assert.IsNull(input.Structure);
+ Assert.IsFalse(input.Updated);
+
// Call
- input.HydraulicBoundaryLocation = location;
+ input.Structure = structure;
// Assert
- Assert.AreSame(location, input.HydraulicBoundaryLocation);
+ Assert.AreSame(structure, input.Structure);
+ Assert.IsTrue(input.Updated);
}
+ #region Model factors
+
[Test]
- [Combinatorial]
- public void ForeshoreProfile_SetNewValue_InputSyncedAccordingly(
- [Values(true, false)] bool withBreakWater,
- [Values(true, false)] bool withValidForeshore)
+ public void Properties_ModelFactorSuperCriticalFlow_ExpectedValues()
{
// Setup
+ var random = new Random(22);
var input = new SimpleStructuresInput();
- BreakWaterType originalBreakWaterType = input.BreakWater.Type;
- RoundedDouble originalBreakWaterHeight = input.BreakWater.Height;
- HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation;
-
- var foreshoreGeometry = new List
+ var mean = (RoundedDouble) (0.01 + random.NextDouble());
+ var expectedDistribution = new NormalDistribution(2)
{
- new Point2D(2.2, 3.3)
+ Mean = mean,
+ StandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation
};
-
- if (withValidForeshore)
+ var distributionToSet = new NormalDistribution(5)
{
- foreshoreGeometry.Add(new Point2D(4.4, 5.5));
- }
+ Mean = mean,
+ StandardDeviation = (RoundedDouble) random.NextDouble()
+ };
- BreakWater breakWater = null;
- if (withBreakWater)
- {
- var nonDefaultBreakWaterType = BreakWaterType.Wall;
- var nonDefaultBreakWaterHeight = 5.5;
+ // Call
+ input.ModelFactorSuperCriticalFlow = distributionToSet;
- // Precondition
- Assert.AreNotEqual(nonDefaultBreakWaterType, input.BreakWater.Type);
- Assert.AreNotEqual(nonDefaultBreakWaterHeight, input.BreakWater.Height);
+ // Assert
+ AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution);
+ }
- breakWater = new BreakWater(nonDefaultBreakWaterType, nonDefaultBreakWaterHeight);
- }
+ #endregion
- double orientation = 96;
- var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
- foreshoreGeometry.ToArray(),
- breakWater,
- new ForeshoreProfile.ConstructionProperties
- {
- Orientation = orientation
- });
+ private class SimpleStructuresInput : StructuresInputBase
+ {
+ public bool Updated { get; private set; }
- // Call
- input.ForeshoreProfile = foreshoreProfile;
+ protected override void UpdateStructureParameters()
+ {
+ Updated = true;
+ }
+ }
- // Assert
- Assert.AreSame(foreshoreProfile, input.ForeshoreProfile);
- Assert.AreEqual(withBreakWater, input.UseBreakWater);
- Assert.AreEqual(withBreakWater ? foreshoreProfile.BreakWater.Type : originalBreakWaterType, input.BreakWater.Type);
- Assert.AreEqual(withBreakWater ? foreshoreProfile.BreakWater.Height : originalBreakWaterHeight, input.BreakWater.Height);
- Assert.AreEqual(withValidForeshore, input.UseForeshore);
- CollectionAssert.AreEqual(foreshoreProfile.Geometry, input.ForeshoreGeometry);
- Assert.AreEqual(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
+ private class SimpleStructure : StructureBase
+ {
+ public SimpleStructure(ConstructionProperties constructionProperties) : base(constructionProperties) {}
}
+ #region Hydraulic data
+
[Test]
- public void Foreshore_SetNullValue_InputSyncedToDefaults()
+ public void Properties_HydraulicBoundaryLocation_ExpectedValues()
{
// Setup
var input = new SimpleStructuresInput();
- BreakWaterType originalBreakWaterType = input.BreakWater.Type;
- RoundedDouble originalBreakWaterHeight = input.BreakWater.Height;
- HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation;
+ var location = new HydraulicBoundaryLocation(0, "test", 0, 0);
- var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
- new[]
- {
- new Point2D(3.3, 4.4),
- new Point2D(5.5, 6.6)
- },
- new BreakWater(BreakWaterType.Caisson, 2.2),
- new ForeshoreProfile.ConstructionProperties
- {
- Orientation = 96
- });
-
- input.ForeshoreProfile = foreshoreProfile;
-
- // Precondition
- Assert.AreSame(foreshoreProfile, input.ForeshoreProfile);
- Assert.IsTrue(input.UseBreakWater);
- Assert.AreNotEqual(originalBreakWaterType, input.BreakWater.Type);
- Assert.AreNotEqual(originalBreakWaterHeight, input.BreakWater.Height);
- Assert.IsTrue(input.UseForeshore);
- CollectionAssert.IsNotEmpty(input.ForeshoreGeometry);
- Assert.AreEqual(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
-
// Call
- input.ForeshoreProfile = null;
+ input.HydraulicBoundaryLocation = location;
// Assert
- Assert.IsFalse(input.UseBreakWater);
- Assert.AreEqual(originalBreakWaterType, input.BreakWater.Type);
- Assert.AreEqual(originalBreakWaterHeight, input.BreakWater.Height);
- Assert.IsFalse(input.UseForeshore);
- CollectionAssert.IsEmpty(input.ForeshoreGeometry);
- Assert.AreEqual(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
+ Assert.AreSame(location, input.HydraulicBoundaryLocation);
}
[Test]
- [TestCase(360.004)]
- [TestCase(300)]
- [TestCase(0)]
- [TestCase(-0.004)]
- [TestCase(double.NaN)]
- public void Properties_StructureNormalOrientationValidValues_NewValueSet(double orientation)
+ public void Properties_StormDuration_ExpectedValues()
{
// Setup
+ var random = new Random(22);
var input = new SimpleStructuresInput();
+ var mean = (RoundedDouble) (0.01 + random.NextDouble());
+ var expectedDistribution = new VariationCoefficientLogNormalDistribution(2)
+ {
+ Mean = mean,
+ CoefficientOfVariation = input.StormDuration.CoefficientOfVariation
+ };
+ var distributionToSet = new VariationCoefficientLogNormalDistribution(5)
+ {
+ Mean = mean,
+ CoefficientOfVariation = (RoundedDouble) random.NextDouble()
+ };
// Call
- input.StructureNormalOrientation = (RoundedDouble) orientation;
+ input.StormDuration = distributionToSet;
// Assert
- Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces);
- AssertAreEqual(orientation, input.StructureNormalOrientation);
+ AssertDistributionCorrectlySet(input.StormDuration, distributionToSet, expectedDistribution);
}
+ #endregion
+
+ #region Schematization
+
[Test]
[TestCase(400)]
[TestCase(360.05)]
@@ -272,28 +252,22 @@
}
[Test]
- public void Properties_ModelFactorSuperCriticalFlow_ExpectedValues()
+ [TestCase(360.004)]
+ [TestCase(300)]
+ [TestCase(0)]
+ [TestCase(-0.004)]
+ [TestCase(double.NaN)]
+ public void Properties_StructureNormalOrientationValidValues_NewValueSet(double orientation)
{
// Setup
- var random = new Random(22);
var input = new SimpleStructuresInput();
- var mean = (RoundedDouble)(0.01 + random.NextDouble());
- var expectedDistribution = new NormalDistribution(2)
- {
- Mean = mean,
- StandardDeviation = input.ModelFactorSuperCriticalFlow.StandardDeviation
- };
- var distributionToSet = new NormalDistribution(5)
- {
- Mean = mean,
- StandardDeviation = (RoundedDouble)random.NextDouble()
- };
// Call
- input.ModelFactorSuperCriticalFlow = distributionToSet;
+ input.StructureNormalOrientation = (RoundedDouble) orientation;
// Assert
- AssertDistributionCorrectlySet(input.ModelFactorSuperCriticalFlow, distributionToSet, expectedDistribution);
+ Assert.AreEqual(2, input.StructureNormalOrientation.NumberOfDecimalPlaces);
+ AssertAreEqual(orientation, input.StructureNormalOrientation);
}
[Test]
@@ -302,8 +276,8 @@
// Setup
var random = new Random(22);
var input = new SimpleStructuresInput();
- var mean = (RoundedDouble)(0.01 + random.NextDouble());
- var standardDeviation = (RoundedDouble)(0.01 + random.NextDouble());
+ var mean = (RoundedDouble) (0.01 + random.NextDouble());
+ var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble());
var expectedDistribution = new LogNormalDistribution(2)
{
Mean = mean,
@@ -328,8 +302,8 @@
// Setup
var random = new Random(22);
var input = new SimpleStructuresInput();
- var mean = (RoundedDouble)(0.01 + random.NextDouble());
- var variation = (RoundedDouble)(0.01 + random.NextDouble());
+ var mean = (RoundedDouble) (0.01 + random.NextDouble());
+ var variation = (RoundedDouble) (0.01 + random.NextDouble());
var expectedDistribution = new VariationCoefficientLogNormalDistribution(2)
{
Mean = mean,
@@ -354,8 +328,8 @@
// Setup
var random = new Random(22);
var input = new SimpleStructuresInput();
- var mean = (RoundedDouble)(0.01 + random.NextDouble());
- var standardDeviation = (RoundedDouble)(0.01 + random.NextDouble());
+ var mean = (RoundedDouble) (0.01 + random.NextDouble());
+ var standardDeviation = (RoundedDouble) (0.01 + random.NextDouble());
var expectedDistribution = new LogNormalDistribution(2)
{
Mean = mean,
@@ -380,8 +354,8 @@
// Setup
var random = new Random(22);
var input = new SimpleStructuresInput();
- var mean = (RoundedDouble)(0.01 + random.NextDouble());
- var variation = (RoundedDouble)(0.01 + random.NextDouble());
+ var mean = (RoundedDouble) (0.01 + random.NextDouble());
+ var variation = (RoundedDouble) (0.01 + random.NextDouble());
var expectedDistribution = new VariationCoefficientLogNormalDistribution(2)
{
Mean = mean,
@@ -426,7 +400,7 @@
var input = new SimpleStructuresInput();
// Call
- TestDelegate call = () => input.FailureProbabilityStructureWithErosion = (RoundedDouble)failureProbabilityStructureWithErosion;
+ TestDelegate call = () => input.FailureProbabilityStructureWithErosion = (RoundedDouble) failureProbabilityStructureWithErosion;
// Assert
TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "De waarde voor de faalkans moet in het bereik [0, 1] liggen.");
@@ -438,8 +412,8 @@
// Setup
var random = new Random(22);
var input = new SimpleStructuresInput();
- var mean = (RoundedDouble)(0.01 + random.NextDouble());
- var variation = (RoundedDouble)(0.01 + random.NextDouble());
+ var mean = (RoundedDouble) (0.01 + random.NextDouble());
+ var variation = (RoundedDouble) (0.01 + random.NextDouble());
var expectedDistribution = new VariationCoefficientNormalDistribution(2)
{
Mean = mean,
@@ -458,56 +432,115 @@
AssertDistributionCorrectlySet(input.WidthFlowApertures, distributionToSet, expectedDistribution);
}
+ #endregion
+
+ #region Foreshore profile
+
[Test]
- public void Properties_StormDuration_ExpectedValues()
+ [Combinatorial]
+ public void ForeshoreProfile_SetNewValue_InputSyncedAccordingly(
+ [Values(true, false)] bool withBreakWater,
+ [Values(true, false)] bool withValidForeshore)
{
// Setup
- var random = new Random(22);
var input = new SimpleStructuresInput();
- var mean = (RoundedDouble)(0.01 + random.NextDouble());
- var expectedDistribution = new VariationCoefficientLogNormalDistribution(2)
+ BreakWaterType originalBreakWaterType = input.BreakWater.Type;
+ RoundedDouble originalBreakWaterHeight = input.BreakWater.Height;
+ HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation;
+
+ var foreshoreGeometry = new List
{
- Mean = mean,
- CoefficientOfVariation = input.StormDuration.CoefficientOfVariation
+ new Point2D(2.2, 3.3)
};
- var distributionToSet = new VariationCoefficientLogNormalDistribution(5)
+
+ if (withValidForeshore)
{
- Mean = mean,
- CoefficientOfVariation = (RoundedDouble)random.NextDouble()
- };
+ foreshoreGeometry.Add(new Point2D(4.4, 5.5));
+ }
+ BreakWater breakWater = null;
+ if (withBreakWater)
+ {
+ var nonDefaultBreakWaterType = BreakWaterType.Wall;
+ var nonDefaultBreakWaterHeight = 5.5;
+
+ // Precondition
+ Assert.AreNotEqual(nonDefaultBreakWaterType, input.BreakWater.Type);
+ Assert.AreNotEqual(nonDefaultBreakWaterHeight, input.BreakWater.Height);
+
+ breakWater = new BreakWater(nonDefaultBreakWaterType, nonDefaultBreakWaterHeight);
+ }
+
+ double orientation = 96;
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ foreshoreGeometry.ToArray(),
+ breakWater,
+ new ForeshoreProfile.ConstructionProperties
+ {
+ Orientation = orientation
+ });
+
// Call
- input.StormDuration = distributionToSet;
+ input.ForeshoreProfile = foreshoreProfile;
// Assert
- AssertDistributionCorrectlySet(input.StormDuration, distributionToSet, expectedDistribution);
+ Assert.AreSame(foreshoreProfile, input.ForeshoreProfile);
+ Assert.AreEqual(withBreakWater, input.UseBreakWater);
+ Assert.AreEqual(withBreakWater ? foreshoreProfile.BreakWater.Type : originalBreakWaterType, input.BreakWater.Type);
+ Assert.AreEqual(withBreakWater ? foreshoreProfile.BreakWater.Height : originalBreakWaterHeight, input.BreakWater.Height);
+ Assert.AreEqual(withValidForeshore, input.UseForeshore);
+ CollectionAssert.AreEqual(foreshoreProfile.Geometry, input.ForeshoreGeometry);
+ Assert.AreSame(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
}
[Test]
- public void Properties_Structure_UpdateValuesAccordingly()
+ public void ForeshoreProfile_SetNullValue_InputSyncedToDefaults()
{
// Setup
- var structure = new SimpleStructure(new StructureBase.ConstructionProperties
- {
- Name = "",
- Location = new Point2D(0, 0),
- Id = "id"
- });
-
var input = new SimpleStructuresInput();
+ BreakWaterType originalBreakWaterType = input.BreakWater.Type;
+ RoundedDouble originalBreakWaterHeight = input.BreakWater.Height;
+ HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation;
+ var foreshoreProfile = new ForeshoreProfile(new Point2D(0, 0),
+ new[]
+ {
+ new Point2D(3.3, 4.4),
+ new Point2D(5.5, 6.6)
+ },
+ new BreakWater(BreakWaterType.Caisson, 2.2),
+ new ForeshoreProfile.ConstructionProperties
+ {
+ Orientation = 96
+ });
+
+ input.ForeshoreProfile = foreshoreProfile;
+
// Precondition
- Assert.IsNull(input.Structure);
- Assert.IsFalse(input.Updated);
+ Assert.AreSame(foreshoreProfile, input.ForeshoreProfile);
+ Assert.IsTrue(input.UseBreakWater);
+ Assert.AreNotEqual(originalBreakWaterType, input.BreakWater.Type);
+ Assert.AreNotEqual(originalBreakWaterHeight, input.BreakWater.Height);
+ Assert.IsTrue(input.UseForeshore);
+ CollectionAssert.IsNotEmpty(input.ForeshoreGeometry);
+ Assert.AreSame(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
// Call
- input.Structure = structure;
+ input.ForeshoreProfile = null;
// Assert
- Assert.AreSame(structure, input.Structure);
- Assert.IsTrue(input.Updated);
+ Assert.IsFalse(input.UseBreakWater);
+ Assert.AreEqual(originalBreakWaterType, input.BreakWater.Type);
+ Assert.AreEqual(originalBreakWaterHeight, input.BreakWater.Height);
+ Assert.IsFalse(input.UseForeshore);
+ CollectionAssert.IsEmpty(input.ForeshoreGeometry);
+ Assert.AreSame(originalHydraulicBoundaryLocation, input.HydraulicBoundaryLocation);
}
+ #endregion
+
+ #region Helpers
+
private static void AssertAreEqual(double expectedValue, RoundedDouble actualValue)
{
Assert.AreEqual(expectedValue, actualValue, actualValue.GetAccuracy());
@@ -525,19 +558,6 @@
DistributionAssert.AreEqual(expectedDistribution, distributionToAssert);
}
- private class SimpleStructuresInput : StructuresInputBase
- {
- protected override void UpdateStructureProperties()
- {
- Updated = true;
- }
-
- public bool Updated { get; private set; }
- }
-
- private class SimpleStructure : StructureBase
- {
- public SimpleStructure(ConstructionProperties constructionProperties) : base(constructionProperties) {}
- }
+ #endregion
}
}
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs
===================================================================
diff -u -r5e9769061c2802f1182ed502e2a32581cfb68196 -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision 5e9769061c2802f1182ed502e2a32581cfb68196)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsInput.cs (.../GrassCoverErosionInwardsInput.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -141,7 +141,7 @@
}
///
- /// Gets or sets the hydraulic boundary location from which to use the assessment level.
+ /// Gets or sets the hydraulic boundary location.
///
public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; }
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs
===================================================================
diff -u -rba2eefab3569d05ed59629b5d02dc8420bc1163a -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision ba2eefab3569d05ed59629b5d02dc8420bc1163a)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresInput.cs (.../HeightStructuresInput.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -89,7 +89,7 @@
#endregion
- protected override void UpdateStructureProperties()
+ protected override void UpdateStructureParameters()
{
if (Structure != null)
{
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs
===================================================================
diff -u -rfabcc9cb4752cec071fb7290280043982974dffd -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision fabcc9cb4752cec071fb7290280043982974dffd)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresInputTest.cs (.../HeightStructuresInputTest.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -55,7 +55,7 @@
}
[Test]
- public void Properties_StructureNull_DoesNotChangeValues()
+ public void Input_StructureNull_DoesNotChangeValues()
{
// Setup
var input = new HeightStructuresInput();
@@ -68,7 +68,7 @@
}
[Test]
- public void Properties_Structure_UpdateValuesAccordingly()
+ public void Input_Structure_UpdateValuesAccordingly()
{
// Setup
var input = new HeightStructuresInput();
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs
===================================================================
diff -u -r79037d58200b1305bb0768cfda981ff742111d05 -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision 79037d58200b1305bb0768cfda981ff742111d05)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/WaveConditionsInput.cs (.../WaveConditionsInput.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -64,7 +64,7 @@
}
///
- /// Gets or sets the hydraulic boundary location from which to use the assessment level.
+ /// Gets or sets the hydraulic boundary location.
///
public HydraulicBoundaryLocation HydraulicBoundaryLocation { get; set; }
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs
===================================================================
diff -u -rfabcc9cb4752cec071fb7290280043982974dffd -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision fabcc9cb4752cec071fb7290280043982974dffd)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -157,7 +157,7 @@
};
}
- protected override void UpdateStructureProperties()
+ protected override void UpdateStructureParameters()
{
if (Structure != null)
{
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs
===================================================================
diff -u -rfabcc9cb4752cec071fb7290280043982974dffd -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision fabcc9cb4752cec071fb7290280043982974dffd)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f)
@@ -164,7 +164,7 @@
}
[Test]
- public void Properties_StructureNull_DoesNotChangeValues()
+ public void Input_StructureNull_DoesNotChangeValues()
{
var input = new StabilityPointStructuresInput();
@@ -176,7 +176,7 @@
}
[Test]
- public void Properties_Structure_UpdateValuesAccordingly()
+ public void Input_Structure_UpdateValuesAccordingly()
{
// Setup
var input = new StabilityPointStructuresInput();