Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs
===================================================================
diff -u -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -57,7 +57,7 @@
private bool canceled;
private IOvertoppingCalculator overtoppingCalculator;
- private IDikeHeightCalculator dikeHeightCalculator;
+ private IHydraulicLoadsCalculator dikeHeightCalculator;
private IHydraulicLoadsCalculator overtoppingRateCalculator;
///
@@ -598,7 +598,7 @@
double targetReliability,
double targetProbability)
{
- double dikeHeight = dikeHeightCalculator.DikeHeight;
+ double dikeHeight = dikeHeightCalculator.Value;
double reliability = dikeHeightCalculator.ReliabilityIndex;
double probability = StatisticsConverter.ReliabilityToProbability(reliability);
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -raaeb6b78529e3c46c5035b6bad846b53ec64f1ca -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision aaeb6b78529e3c46c5035b6bad846b53ec64f1ca)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -218,7 +218,7 @@
using (new HydraRingCalculatorFactoryConfig())
{
TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
- calculator.DikeHeight = double.NaN;
+ calculator.Value = double.NaN;
calculator.EndInFailure = true;
// Call
@@ -367,7 +367,7 @@
using (new HydraRingCalculatorFactoryConfig())
{
TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
- calculator.DikeHeight = 2;
+ calculator.Value = 2;
calculator.ReliabilityIndex = -1;
// Call
@@ -596,7 +596,7 @@
using (new HydraRingCalculatorFactoryConfig())
{
TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
- calculator.DikeHeight = double.NaN;
+ calculator.Value = double.NaN;
calculator.EndInFailure = true;
activity.Run();
@@ -989,10 +989,10 @@
// Assert
TestDikeHeightCalculator dikeHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator;
- DikeHeightCalculationInput[] dikeHeightCalculationInputs = dikeHeightCalculator.ReceivedInputs.ToArray();
+ HydraulicLoadsCalculationInput[] dikeHeightCalculationInputs = dikeHeightCalculator.ReceivedInputs.ToArray();
Assert.AreEqual(1, dikeHeightCalculationInputs.Length);
- DikeHeightCalculationInput actualInput = dikeHeightCalculationInputs[0];
+ HydraulicLoadsCalculationInput actualInput = dikeHeightCalculationInputs[0];
GeneralGrassCoverErosionInwardsInput generalInput = assessmentSection.GrassCoverErosionInwards.GeneralInput;
GrassCoverErosionInwardsInput input = calculation.InputParameters;
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs
===================================================================
diff -u -r28409889b18ffaecebe9737e65410a30be956206 -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs (.../DikeHeightCalculator.cs) (revision 28409889b18ffaecebe9737e65410a30be956206)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs (.../DikeHeightCalculator.cs) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -31,7 +31,7 @@
/// Calculator which calculates the dike height associated to the result of iterating towards a
/// probability of failure given a norm.
///
- internal class DikeHeightCalculator : HydraRingCalculatorBase, IDikeHeightCalculator
+ internal class DikeHeightCalculator : HydraRingCalculatorBase, IHydraulicLoadsCalculator
{
private readonly ReliabilityIndexCalculationParser targetProbabilityParser;
private readonly ConvergenceParser convergenceParser;
@@ -47,17 +47,17 @@
targetProbabilityParser = new ReliabilityIndexCalculationParser();
convergenceParser = new ConvergenceParser();
- DikeHeight = double.NaN;
+ Value = double.NaN;
ReliabilityIndex = double.NaN;
}
- public double DikeHeight { get; private set; }
+ public double Value { get; private set; }
public double ReliabilityIndex { get; private set; }
public bool? Converged { get; private set; }
- public void Calculate(DikeHeightCalculationInput input)
+ public void Calculate(HydraulicLoadsCalculationInput input)
{
Calculate(HydraRingUncertaintiesType.All, input);
}
@@ -72,7 +72,7 @@
{
if (targetProbabilityParser.Output != null)
{
- DikeHeight = targetProbabilityParser.Output.Result;
+ Value = targetProbabilityParser.Output.Result;
ReliabilityIndex = targetProbabilityParser.Output.CalculatedReliabilityIndex;
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs
===================================================================
diff -u -r5d1d4dedecdc577e53f6090156794fe85dce68f2 -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs (.../HydraRingCalculatorFactory.cs) (revision 5d1d4dedecdc577e53f6090156794fe85dce68f2)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs (.../HydraRingCalculatorFactory.cs) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -54,7 +54,7 @@
return new OvertoppingCalculator(hlcdDirectory);
}
- public IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory)
+ public IHydraulicLoadsCalculator CreateDikeHeightCalculator(string hlcdDirectory)
{
return new DikeHeightCalculator(hlcdDirectory);
}
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs
===================================================================
diff -u -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -49,9 +49,9 @@
/// Creates a calculator for calculating a dike height.
///
/// The directory where the hydraulic database can be found.
- /// A new .
+ /// A new .
/// Thrown when is null.
- IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory);
+ IHydraulicLoadsCalculator CreateDikeHeightCalculator(string hlcdDirectory);
///
/// Creates a calculator for calculating an overtopping rate.
Fisheye: Tag add49dd7a9fbfed57cd9ce8faba5708d497b46c3 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDikeHeightCalculator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj
===================================================================
diff -u -r5d1d4dedecdc577e53f6090156794fe85dce68f2 -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 5d1d4dedecdc577e53f6090156794fe85dce68f2)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -56,7 +56,6 @@
-
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DikeHeightCalculatorTest.cs
===================================================================
diff -u -rae74507edbfc4fe632ba5f964a147aff630dfe6e -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DikeHeightCalculatorTest.cs (.../DikeHeightCalculatorTest.cs) (revision ae74507edbfc4fe632ba5f964a147aff630dfe6e)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DikeHeightCalculatorTest.cs (.../DikeHeightCalculatorTest.cs) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -35,7 +35,7 @@
// Assert
Assert.IsInstanceOf(calculator);
- Assert.IsNaN(calculator.DikeHeight);
+ Assert.IsNaN(calculator.Value);
Assert.IsNaN(calculator.ReliabilityIndex);
Assert.IsNull(calculator.Converged);
Assert.IsNull(calculator.OutputDirectory);
Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs
===================================================================
diff -u -r3464fedec6f35ac0b2a4973ee9c3385b104bf64d -radd49dd7a9fbfed57cd9ce8faba5708d497b46c3
--- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 3464fedec6f35ac0b2a4973ee9c3385b104bf64d)
+++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision add49dd7a9fbfed57cd9ce8faba5708d497b46c3)
@@ -56,7 +56,7 @@
return OvertoppingCalculator;
}
- public IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory)
+ public IHydraulicLoadsCalculator CreateDikeHeightCalculator(string hlcdDirectory)
{
DikeHeightCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory;
return DikeHeightCalculator;
@@ -135,9 +135,9 @@
public string LastErrorFileContent { get; set; }
}
- public class TestDikeHeightCalculator : TestHydraRingCalculator, IDikeHeightCalculator
+ public class TestDikeHeightCalculator : TestHydraRingCalculator, IHydraulicLoadsCalculator
{
- public double DikeHeight { get; set; }
+ public double Value { get; set; }
public double ReliabilityIndex { get; set; }
public string OutputDirectory { get; set; }
public string LastErrorFileContent { get; set; }