Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/IMacroStabilityInwardsCalculatorFactory.cs
===================================================================
diff -u -ra1b68821bc11b10c5ec147df7109ffd69e0acbd2 -r63f6b06168b756e6bd94c7b764c2c6e426a5badb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/IMacroStabilityInwardsCalculatorFactory.cs (.../IMacroStabilityInwardsCalculatorFactory.cs) (revision a1b68821bc11b10c5ec147df7109ffd69e0acbd2)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/IMacroStabilityInwardsCalculatorFactory.cs (.../IMacroStabilityInwardsCalculatorFactory.cs) (revision 63f6b06168b756e6bd94c7b764c2c6e426a5badb)
@@ -42,12 +42,21 @@
IUpliftVanCalculator CreateUpliftVanCalculator(UpliftVanCalculatorInput input, IMacroStabilityInwardsKernelFactory factory);
///
- /// Creates a Waternet calculator.
+ /// Creates a Waternet calculator for the extreme circumstances.
///
/// The containing all the values required
/// for performing a Waternet calculation.
/// The factory responsible for creating the Waternet kernel.
/// The Waternet calculator.
- IWaternetCalculator CreateWaternetCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory);
+ IWaternetCalculator CreateWaternetExtremeCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory);
+
+ ///
+ /// Creates a Waternet calculator for the daily circumstances.
+ ///
+ /// The containing all the values required
+ /// for performing a Waternet calculation.
+ /// The factory responsible for creating the Waternet kernel.
+ /// The Waternet calculator.
+ IWaternetCalculator CreateWaternetDailyCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory);
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/MacroStabilityInwardsCalculatorFactory.cs
===================================================================
diff -u -rf2eea656d0dcf8ed238cad8822bd7310840b45c4 -r63f6b06168b756e6bd94c7b764c2c6e426a5badb
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/MacroStabilityInwardsCalculatorFactory.cs (.../MacroStabilityInwardsCalculatorFactory.cs) (revision f2eea656d0dcf8ed238cad8822bd7310840b45c4)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/MacroStabilityInwardsCalculatorFactory.cs (.../MacroStabilityInwardsCalculatorFactory.cs) (revision 63f6b06168b756e6bd94c7b764c2c6e426a5badb)
@@ -54,9 +54,14 @@
return new UpliftVanCalculator(input, factory);
}
- public IWaternetCalculator CreateWaternetCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
+ public IWaternetCalculator CreateWaternetExtremeCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
{
return new WaternetExtremeCalculator(input, factory);
}
+
+ public IWaternetCalculator CreateWaternetDailyCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
+ {
+ return new WaternetDailyCalculator(input, factory);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/MacroStabilityInwardsCalculatorFactoryTest.cs
===================================================================
diff -u -ra1b68821bc11b10c5ec147df7109ffd69e0acbd2 -r63f6b06168b756e6bd94c7b764c2c6e426a5badb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/MacroStabilityInwardsCalculatorFactoryTest.cs (.../MacroStabilityInwardsCalculatorFactoryTest.cs) (revision a1b68821bc11b10c5ec147df7109ffd69e0acbd2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/MacroStabilityInwardsCalculatorFactoryTest.cs (.../MacroStabilityInwardsCalculatorFactoryTest.cs) (revision 63f6b06168b756e6bd94c7b764c2c6e426a5badb)
@@ -98,13 +98,13 @@
}
[Test]
- public void CreateWaternetCalculator_Always_ReturnsWaternetCalculator()
+ public void CreateWaternetExtremeCalculator_Always_ReturnsWaternetExtremeCalculator()
{
// Setup
IMacroStabilityInwardsCalculatorFactory factory = MacroStabilityInwardsCalculatorFactory.Instance;
// Call
- IWaternetCalculator waternetCalculator = factory.CreateWaternetCalculator(
+ IWaternetCalculator waternetCalculator = factory.CreateWaternetExtremeCalculator(
new WaternetCalculatorInput(new WaternetCalculatorInput.ConstructionProperties
{
SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"),
@@ -115,7 +115,28 @@
}), new TestMacroStabilityInwardsKernelFactory());
// Assert
- Assert.IsInstanceOf(waternetCalculator);
+ Assert.IsInstanceOf(waternetCalculator);
}
+
+ [Test]
+ public void CreateWaternetDailyCalculator_Always_ReturnsWaternetDailyCalculator()
+ {
+ // Setup
+ IMacroStabilityInwardsCalculatorFactory factory = MacroStabilityInwardsCalculatorFactory.Instance;
+
+ // Call
+ IWaternetCalculator waternetCalculator = factory.CreateWaternetDailyCalculator(
+ new WaternetCalculatorInput(new WaternetCalculatorInput.ConstructionProperties
+ {
+ SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"),
+ SoilProfile = new TestSoilProfile(),
+ PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(),
+ PhreaticLineOffsetsDaily = new PhreaticLineOffsets(),
+ DrainageConstruction = new DrainageConstruction(),
+ }), new TestMacroStabilityInwardsKernelFactory());
+
+ // Assert
+ Assert.IsInstanceOf(waternetCalculator);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs
===================================================================
diff -u -ra1b68821bc11b10c5ec147df7109ffd69e0acbd2 -r63f6b06168b756e6bd94c7b764c2c6e426a5badb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsCalculatorFactoryTest.cs) (revision a1b68821bc11b10c5ec147df7109ffd69e0acbd2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsCalculatorFactoryTest.cs) (revision 63f6b06168b756e6bd94c7b764c2c6e426a5badb)
@@ -73,7 +73,7 @@
}
[Test]
- public void CreateWaternetCalculator_Always_ReturnStubWithInputSet()
+ public void CreateWaternetExtremeCalculator_Always_ReturnStubWithInputSet()
{
// Setup
var factory = new TestMacroStabilityInwardsCalculatorFactory();
@@ -87,11 +87,33 @@
});
// Call
- var calculator = (WaternetCalculatorStub) factory.CreateWaternetCalculator(input, new TestMacroStabilityInwardsKernelFactory());
+ var calculator = (WaternetCalculatorStub) factory.CreateWaternetExtremeCalculator(input, new TestMacroStabilityInwardsKernelFactory());
// Assert
Assert.IsInstanceOf(calculator);
Assert.AreSame(input, calculator.Input);
}
+
+ [Test]
+ public void CreateWaternetDailyCalculator_Always_ReturnStubWithInputSet()
+ {
+ // Setup
+ var factory = new TestMacroStabilityInwardsCalculatorFactory();
+ var input = new WaternetCalculatorInput(new WaternetCalculatorInput.ConstructionProperties
+ {
+ SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"),
+ SoilProfile = new TestSoilProfile(),
+ PhreaticLineOffsetsExtreme = new PhreaticLineOffsets(),
+ PhreaticLineOffsetsDaily = new PhreaticLineOffsets(),
+ DrainageConstruction = new DrainageConstruction(),
+ });
+
+ // Call
+ var calculator = (WaternetCalculatorStub) factory.CreateWaternetDailyCalculator(input, new TestMacroStabilityInwardsKernelFactory());
+
+ // Assert
+ Assert.IsInstanceOf(calculator);
+ Assert.AreSame(input, calculator.Input);
+ }
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/TestMacroStabilityInwardsCalculatorFactory.cs
===================================================================
diff -u -ra1b68821bc11b10c5ec147df7109ffd69e0acbd2 -r63f6b06168b756e6bd94c7b764c2c6e426a5badb
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/TestMacroStabilityInwardsCalculatorFactory.cs (.../TestMacroStabilityInwardsCalculatorFactory.cs) (revision a1b68821bc11b10c5ec147df7109ffd69e0acbd2)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Calculators/TestMacroStabilityInwardsCalculatorFactory.cs (.../TestMacroStabilityInwardsCalculatorFactory.cs) (revision 63f6b06168b756e6bd94c7b764c2c6e426a5badb)
@@ -61,11 +61,18 @@
return LastCreatedUpliftVanCalculator;
}
- public IWaternetCalculator CreateWaternetCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
+ public IWaternetCalculator CreateWaternetExtremeCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
{
LastCreatedWaternetCalculator.Input = input;
return LastCreatedWaternetCalculator;
}
+
+ public IWaternetCalculator CreateWaternetDailyCalculator(WaternetCalculatorInput input, IMacroStabilityInwardsKernelFactory factory)
+ {
+ LastCreatedWaternetCalculator.Input = input;
+
+ return LastCreatedWaternetCalculator;
+ }
}
}
\ No newline at end of file