Fisheye: Tag d6c2f6364fcba038152ea93e0e420e03989dd35a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IMacroStabilityInwardsCalculator.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IMacroStabilityInwardsCalculatorFactory.cs
===================================================================
diff -u -ra818b067c89f222fa27f864ef9b0c26ba95f40d8 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IMacroStabilityInwardsCalculatorFactory.cs (.../IMacroStabilityInwardsCalculatorFactory.cs) (revision a818b067c89f222fa27f864ef9b0c26ba95f40d8)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IMacroStabilityInwardsCalculatorFactory.cs (.../IMacroStabilityInwardsCalculatorFactory.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -35,6 +35,6 @@
/// for performing a macro stability inwards calculation.
/// The factory responsible for creating the sub calculators.
/// The calculator.
- IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory);
+ IUpliftVanCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory);
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IUpliftVanCalculator.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IUpliftVanCalculator.cs (revision 0)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/IUpliftVanCalculator.cs (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -0,0 +1,50 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+
+namespace Ringtoets.MacroStabilityInwards.KernelWrapper
+{
+ ///
+ /// Interface representing an Uplift Van calculator.
+ ///
+ ///
+ /// This interface is introduced for being able to test the conversion of:
+ ///
+ /// - Ringtoets macro stability inwards input into calculator input;
+ /// - calculator output into Ringtoets macro stability inwards output.
+ ///
+ ///
+ public interface IUpliftVanCalculator
+ {
+ ///
+ /// Performs the calculation.
+ ///
+ /// A .
+ MacroStabilityInwardsCalculatorResult Calculate();
+
+ ///
+ /// Performs the validation.
+ ///
+ /// A list of validation messages.
+ List Validate();
+ }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs
===================================================================
diff -u -r83f824a69b1a78fc4822ac19375e60e6c9be7d87 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision 83f824a69b1a78fc4822ac19375e60e6c9be7d87)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -33,7 +33,7 @@
/// This class represents a combination of macro stability inwards sub calculations, which together can be used
/// to assess based on macro stability inwards.
///
- public class MacroStabilityInwardsCalculator : IMacroStabilityInwardsCalculator
+ public class MacroStabilityInwardsCalculator : IUpliftVanCalculator
{
private readonly MacroStabilityInwardsCalculatorInput input;
private readonly IMacroStabilityInwardsKernelFactory factory;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorFactory.cs
===================================================================
diff -u -ra818b067c89f222fa27f864ef9b0c26ba95f40d8 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorFactory.cs (.../MacroStabilityInwardsCalculatorFactory.cs) (revision a818b067c89f222fa27f864ef9b0c26ba95f40d8)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculatorFactory.cs (.../MacroStabilityInwardsCalculatorFactory.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -32,7 +32,7 @@
///
/// Sets the current , which is used to create
- /// instances.
+ /// instances.
///
public static IMacroStabilityInwardsCalculatorFactory Instance
{
@@ -46,7 +46,7 @@
}
}
- public IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
+ public IUpliftVanCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
{
return new MacroStabilityInwardsCalculator(input, factory);
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj
===================================================================
diff -u -ra818b067c89f222fa27f864ef9b0c26ba95f40d8 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj) (revision a818b067c89f222fa27f864ef9b0c26ba95f40d8)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Ringtoets.MacroStabilityInwards.KernelWrapper.csproj (.../Ringtoets.MacroStabilityInwards.KernelWrapper.csproj) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -47,7 +47,7 @@
-
+
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -ra818b067c89f222fa27f864ef9b0c26ba95f40d8 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision a818b067c89f222fa27f864ef9b0c26ba95f40d8)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -65,7 +65,7 @@
}
MacroStabilityInwardsCalculatorInput macroStabilityInwardsCalculatorInput = CreateInputFromData(calculation.InputParameters);
- IMacroStabilityInwardsCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateCalculator(macroStabilityInwardsCalculatorInput, MacroStabilityInwardsKernelWrapperFactory.Instance);
+ IUpliftVanCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateCalculator(macroStabilityInwardsCalculatorInput, MacroStabilityInwardsKernelWrapperFactory.Instance);
List validationResults = calculator.Validate();
CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonServiceResources.Error_in_validation_0, validationResults.ToArray());
@@ -93,7 +93,7 @@
try
{
- IMacroStabilityInwardsCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateCalculator(CreateInputFromData(calculation.InputParameters), MacroStabilityInwardsKernelWrapperFactory.Instance);
+ IUpliftVanCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateCalculator(CreateInputFromData(calculation.InputParameters), MacroStabilityInwardsKernelWrapperFactory.Instance);
MacroStabilityInwardsCalculatorResult macroStabilityInwardsResult = calculator.Calculate();
calculation.Output = new MacroStabilityInwardsOutput(
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsSemiProbabilisticCalculationService.cs
===================================================================
diff -u -re784fb70612baecb35fcc2d0d3ee8cc304b4df32 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsSemiProbabilisticCalculationService.cs (.../MacroStabilityInwardsSemiProbabilisticCalculationService.cs) (revision e784fb70612baecb35fcc2d0d3ee8cc304b4df32)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsSemiProbabilisticCalculationService.cs (.../MacroStabilityInwardsSemiProbabilisticCalculationService.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -26,7 +26,7 @@
namespace Ringtoets.MacroStabilityInwards.Service
{
///
- /// This class is responsible for calculating a factor of safety for macro stability inwards based on the sub calculations.
+ /// This class is responsible for calculating a factor of safety for macro stability inwards.
///
public class MacroStabilityInwardsSemiProbabilisticCalculationService
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/MacroStabilityInwardsCalculatorTest.cs
===================================================================
diff -u -r83f824a69b1a78fc4822ac19375e60e6c9be7d87 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/MacroStabilityInwardsCalculatorTest.cs (.../MacroStabilityInwardsCalculatorTest.cs) (revision 83f824a69b1a78fc4822ac19375e60e6c9be7d87)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/MacroStabilityInwardsCalculatorTest.cs (.../MacroStabilityInwardsCalculatorTest.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -82,7 +82,7 @@
var calculator = new MacroStabilityInwardsCalculator(input, factory);
// Assert
- Assert.IsInstanceOf(calculator);
+ Assert.IsInstanceOf(calculator);
}
[Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorStubTest.cs
===================================================================
diff -u -r37b140fe95b895b99d5d93a853b9bc1b4e96d5e4 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorStubTest.cs (.../MacroStabilityInwardsCalculatorStubTest.cs) (revision 37b140fe95b895b99d5d93a853b9bc1b4e96d5e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/MacroStabilityInwardsCalculatorStubTest.cs (.../MacroStabilityInwardsCalculatorStubTest.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -34,7 +34,7 @@
var calculator = new MacroStabilityInwardsCalculatorStub();
// Assert
- Assert.IsInstanceOf(calculator);
+ Assert.IsInstanceOf(calculator);
Assert.IsNull(calculator.Input);
Assert.IsNull(calculator.Output);
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorStub.cs
===================================================================
diff -u -r37b140fe95b895b99d5d93a853b9bc1b4e96d5e4 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorStub.cs (.../MacroStabilityInwardsCalculatorStub.cs) (revision 37b140fe95b895b99d5d93a853b9bc1b4e96d5e4)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/MacroStabilityInwardsCalculatorStub.cs (.../MacroStabilityInwardsCalculatorStub.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -26,7 +26,7 @@
///
/// Stub for the real macro stability inwards calculator.
///
- public class MacroStabilityInwardsCalculatorStub : IMacroStabilityInwardsCalculator
+ public class MacroStabilityInwardsCalculatorStub : IUpliftVanCalculator
{
public MacroStabilityInwardsCalculatorInput Input { get; set; }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/TestMacroStabilityInwardsCalculatorFactory.cs
===================================================================
diff -u -ra818b067c89f222fa27f864ef9b0c26ba95f40d8 -rd6c2f6364fcba038152ea93e0e420e03989dd35a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/TestMacroStabilityInwardsCalculatorFactory.cs (.../TestMacroStabilityInwardsCalculatorFactory.cs) (revision a818b067c89f222fa27f864ef9b0c26ba95f40d8)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/TestMacroStabilityInwardsCalculatorFactory.cs (.../TestMacroStabilityInwardsCalculatorFactory.cs) (revision d6c2f6364fcba038152ea93e0e420e03989dd35a)
@@ -41,7 +41,7 @@
///
public MacroStabilityInwardsCalculatorStub LastCreatedCalculator { get; }
- public IMacroStabilityInwardsCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
+ public IUpliftVanCalculator CreateCalculator(MacroStabilityInwardsCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
{
LastCreatedCalculator.Input = input;
return LastCreatedCalculator;