Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs
===================================================================
diff -u -r774ce2424ba4ccab70c6dad6198472977e2a8ace -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 774ce2424ba4ccab70c6dad6198472977e2a8ace)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsInput.cs (.../MacroStabilityInwardsInput.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -509,7 +509,7 @@
}
///
- /// Gets or sets whether phreatic line 3 and 4 should be adjusted for uplift.
+ /// Gets or sets whether phreatic line 3 and 4 should be adjusted for Uplift.
///
public bool AdjustPhreaticLine3And4ForUplift { get; set; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs
===================================================================
diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs (.../MacroStabilityInwardsOutput.cs) (revision 01bd90d4fab9699280c5619754fc55b4f03be08a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs (.../MacroStabilityInwardsOutput.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -34,7 +34,7 @@
/// Creates a new instance of .
///
/// The sliding curve result.
- /// The slip plane uplift Van result.
+ /// The slip plane Uplift Van result.
/// The container of the properties for the
/// .
/// Thrown when any parameter
@@ -63,8 +63,6 @@
ZValue = properties.ZValue;
ForbiddenZonesXEntryMin = properties.ForbiddenZonesXEntryMin;
ForbiddenZonesXEntryMax = properties.ForbiddenZonesXEntryMax;
- ForbiddenZonesAutomaticallyCalculated = properties.ForbiddenZonesAutomaticallyCalculated;
- GridAutomaticallyCalculated = properties.GridAutomaticallyCalculated;
}
#region Properties
@@ -99,16 +97,6 @@
///
public double ForbiddenZonesXEntryMax { get; }
- ///
- /// Gets whether the forbidden zones are automatically calculated.
- ///
- public bool ForbiddenZonesAutomaticallyCalculated { get; }
-
- ///
- /// Gets whether the grid is automatically calculated.
- ///
- public bool GridAutomaticallyCalculated { get; }
-
#endregion
///
@@ -146,16 +134,6 @@
/// Gets or sets the forbidden zones x entry max.
///
public double ForbiddenZonesXEntryMax { internal get; set; }
-
- ///
- /// Gets or sets whether the forbidden zones are automatically calculated.
- ///
- public bool ForbiddenZonesAutomaticallyCalculated { internal get; set; }
-
- ///
- /// Gets or sets whether the grid is automatically calculated.
- ///
- public bool GridAutomaticallyCalculated { internal get; set; }
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Input/UpliftVanCalculatorInput.cs (.../UpliftVanCalculatorInput.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -42,6 +42,7 @@
{
throw new ArgumentNullException(nameof(properties));
}
+
AssessmentLevel = properties.AssessmentLevel;
SurfaceLine = properties.SurfaceLine;
SoilProfile = properties.SoilProfile;
@@ -120,7 +121,7 @@
///
/// Gets or sets the outside high water level.
- /// [m]
+ /// [m+NAP]
///
public double AssessmentLevel { internal get; set; }
@@ -210,7 +211,7 @@
public double PhreaticLineOffsetBelowDikeToeAtPolder { internal get; set; }
///
- /// Gets or sets whether phreatic line 3 and 4 should be adjusted for uplift.
+ /// Gets or sets whether phreatic line 3 and 4 should be adjusted for Uplift.
///
public bool AdjustPhreaticLine3And4ForUplift { internal get; set; }
@@ -328,7 +329,7 @@
///
/// Gets the outside high water level.
- /// [m]
+ /// [m+NAP]
///
public double AssessmentLevel { get; }
@@ -418,7 +419,7 @@
public double PhreaticLineOffsetBelowDikeToeAtPolder { get; }
///
- /// Gets whether phreatic line 3 and 4 should be adjusted for uplift.
+ /// Gets whether phreatic line 3 and 4 should be adjusted for Uplift.
///
public bool AdjustPhreaticLine3And4ForUplift { get; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanCalculatorResult.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanCalculatorResult.cs (.../UpliftVanCalculatorResult.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanCalculatorResult.cs (.../UpliftVanCalculatorResult.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -59,8 +59,6 @@
ZValue = properties.ZValue;
ForbiddenZonesXEntryMin = properties.ForbiddenZonesXEntryMin;
ForbiddenZonesXEntryMax = properties.ForbiddenZonesXEntryMax;
- ForbiddenZonesAutomaticallyCalculated = properties.ForbiddenZonesAutomaticallyCalculated;
- GridAutomaticallyCalculated = properties.GridAutomaticallyCalculated;
}
///
@@ -98,16 +96,6 @@
/// Gets or sets the forbidden zones x entry max.
///
public double ForbiddenZonesXEntryMax { internal get; set; }
-
- ///
- /// Gets or sets whether the forbidden zones are automatically calculated.
- ///
- public bool ForbiddenZonesAutomaticallyCalculated { internal get; set; }
-
- ///
- /// Gets or sets whether the grid is automatically calculated.
- ///
- public bool GridAutomaticallyCalculated { internal get; set; }
}
#region Properties
@@ -142,16 +130,6 @@
///
public double ForbiddenZonesXEntryMax { get; }
- ///
- /// Gets whether the forbidden zones are automatically calculated.
- ///
- public bool ForbiddenZonesAutomaticallyCalculated { get; }
-
- ///
- /// Gets whether the grid is automatically calculated.
- ///
- public bool GridAutomaticallyCalculated { get; }
-
#endregion
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSliceResult.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSliceResult.cs (.../UpliftVanSliceResult.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSliceResult.cs (.../UpliftVanSliceResult.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -135,11 +135,12 @@
///
/// Gets the critical pressure.
+ /// [kN/m²]
///
public double CriticalPressure { get; }
///
- /// Gets the OCR.
+ /// Gets the over consolidation ratio.
/// [-]
///
public double OverConsolidationRatio { get; }
@@ -295,6 +296,9 @@
///
public double Weight { get; }
+ ///
+ /// Container for properties for constructing a .
+ ///
public class ConstructionProperties
{
///
@@ -348,11 +352,12 @@
///
/// Gets or sets the critical pressure.
+ /// [kN/m²]
///
public double CriticalPressure { internal get; set; }
///
- /// Gets or sets the OCR.
+ /// Gets or sets the over consolidation ratio.
/// [-]
///
public double OverConsolidationRatio { internal get; set; }
@@ -387,7 +392,7 @@
public double ExternalLoad { internal get; set; }
///
- /// Gets or sets the hydraostatic pore pressure.
+ /// Gets or sets the hydrostatic pore pressure.
/// [kN/m²]
///
public double HydrostaticPorePressure { internal get; set; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResult.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResult.cs (.../UpliftVanSlidingCircleResult.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResult.cs (.../UpliftVanSlidingCircleResult.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -49,6 +49,7 @@
{
throw new ArgumentNullException(nameof(center));
}
+
Center = center;
Radius = radius;
IsActive = isActive;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Calculators/UpliftVan/UpliftVanCalculator.cs (.../UpliftVanCalculator.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -52,11 +52,11 @@
{
if (input == null)
{
- throw new ArgumentNullException(nameof(input), @"UpliftVanCalculatorInput required for creating a UpliftVanCalculator.");
+ throw new ArgumentNullException(nameof(input));
}
if (factory == null)
{
- throw new ArgumentNullException(nameof(factory), @"IMacroStabilityInwardsKernelFactory required for creating a UpliftVanCalculator.");
+ throw new ArgumentNullException(nameof(factory));
}
this.input = input;
this.factory = factory;
@@ -74,9 +74,7 @@
FactorOfStability = upliftVanKernel.FactorOfStability,
ZValue = upliftVanKernel.ZValue,
ForbiddenZonesXEntryMin = upliftVanKernel.ForbiddenZonesXEntryMin,
- ForbiddenZonesXEntryMax = upliftVanKernel.ForbiddenZonesXEntryMax,
- ForbiddenZonesAutomaticallyCalculated = upliftVanKernel.ForbiddenZonesAutomaticallyCalculated,
- GridAutomaticallyCalculated = upliftVanKernel.GridAutomaticallyCalculated
+ ForbiddenZonesXEntryMax = upliftVanKernel.ForbiddenZonesXEntryMax
});
}
@@ -103,14 +101,7 @@
private IUpliftVanKernel CreateUpliftVanKernel()
{
- IUpliftVanKernel upliftVanKernel = factory.CreateUpliftVanKernel();
-
- upliftVanKernel.MoveGrid = input.MoveGrid;
- upliftVanKernel.MaximumSliceWidth = input.MaximumSliceWidth;
-
Soil[] soils = SoilCreator.Create(input.SoilProfile);
- upliftVanKernel.SoilModel = SoilModelCreator.Create(soils);
-
Dictionary layersWithSoils =
input.SoilProfile.Layers
.Zip(soils, (layer, soil) => new
@@ -120,6 +111,11 @@
})
.ToDictionary(x => x.layer, x => x.soil);
+ IUpliftVanKernel upliftVanKernel = factory.CreateUpliftVanKernel();
+
+ upliftVanKernel.MoveGrid = input.MoveGrid;
+ upliftVanKernel.MaximumSliceWidth = input.MaximumSliceWidth;
+ upliftVanKernel.SoilModel = SoilModelCreator.Create(soils);
upliftVanKernel.SoilProfile = SoilProfileCreator.Create(input.SoilProfile, layersWithSoils);
upliftVanKernel.Location = StabilityLocationCreator.Create(input);
upliftVanKernel.SurfaceLine = SurfaceLineCreator.Create(input.SurfaceLine);
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs (.../IUpliftVanKernel.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/IUpliftVanKernel.cs (.../IUpliftVanKernel.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -121,16 +121,6 @@
double ForbiddenZonesXEntryMax { get; }
///
- /// Gets whether the forbidden zones are automatically calculated.
- ///
- bool ForbiddenZonesAutomaticallyCalculated { get; }
-
- ///
- /// Gets whether the grid is automatically calculated.
- ///
- bool GridAutomaticallyCalculated { get; }
-
- ///
/// Gets the sliding curve result.
///
SlidingDualCircle SlidingCurveResult { get; }
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs (.../UpliftVanKernelWrapper.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/UpliftVan/UpliftVanKernelWrapper.cs (.../UpliftVanKernelWrapper.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -174,10 +174,6 @@
public double ForbiddenZonesXEntryMax { get; private set; }
- public bool ForbiddenZonesAutomaticallyCalculated { get; private set; }
-
- public bool GridAutomaticallyCalculated { get; private set; }
-
public SlidingDualCircle SlidingCurveResult { get; private set; }
public SlipPlaneUpliftVan SlipPlaneResult { get; private set; }
@@ -203,11 +199,8 @@
FactorOfStability = convertedResult.FactorOfSafety;
ZValue = convertedResult.ZValue;
-
ForbiddenZonesXEntryMin = convertedResult.XMinEntry;
ForbiddenZonesXEntryMax = convertedResult.XMaxEntry;
- ForbiddenZonesAutomaticallyCalculated = convertedResult.AreForbiddenZonesAuto;
- GridAutomaticallyCalculated = convertedResult.IsGridAuto;
SlidingCurveResult = (SlidingDualCircle) convertedResult.Curve;
SlipPlaneResult = convertedResult.SlipPlaneUpliftVan;
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -24,7 +24,6 @@
using Ringtoets.Common.Service;
using Ringtoets.Common.Service.ValidationRules;
using Ringtoets.MacroStabilityInwards.Data;
-using Ringtoets.MacroStabilityInwards.KernelWrapper;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
@@ -104,14 +103,12 @@
MacroStabilityInwardsSlidingCurveConverter.Convert(macroStabilityInwardsResult.SlidingCurveResult),
MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(macroStabilityInwardsResult.CalculationGridResult),
new MacroStabilityInwardsOutput.ConstructionProperties
- {
- FactorOfStability = macroStabilityInwardsResult.FactorOfStability,
- ZValue = macroStabilityInwardsResult.ZValue,
- ForbiddenZonesXEntryMin = macroStabilityInwardsResult.ForbiddenZonesXEntryMin,
- ForbiddenZonesXEntryMax = macroStabilityInwardsResult.ForbiddenZonesXEntryMax,
- ForbiddenZonesAutomaticallyCalculated = macroStabilityInwardsResult.ForbiddenZonesAutomaticallyCalculated,
- GridAutomaticallyCalculated = macroStabilityInwardsResult.GridAutomaticallyCalculated
- });
+ {
+ FactorOfStability = macroStabilityInwardsResult.FactorOfStability,
+ ZValue = macroStabilityInwardsResult.ZValue,
+ ForbiddenZonesXEntryMin = macroStabilityInwardsResult.ForbiddenZonesXEntryMin,
+ ForbiddenZonesXEntryMax = macroStabilityInwardsResult.ForbiddenZonesXEntryMax
+ });
}
finally
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs
===================================================================
diff -u -r1b16d1bbb40c8246bd53a1dcfa7803cb92501915 -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs (.../MacroStabilityInwardsOutputTest.cs) (revision 1b16d1bbb40c8246bd53a1dcfa7803cb92501915)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs (.../MacroStabilityInwardsOutputTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -21,7 +21,6 @@
using System;
using Core.Common.Base;
-using Core.Common.TestUtil;
using NUnit.Framework;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.MacroStabilityInwards.Data.TestUtil;
@@ -98,7 +97,7 @@
// Call
var output = new MacroStabilityInwardsOutput(slidingCurve, slipPlane, new MacroStabilityInwardsOutput.ConstructionProperties());
-
+
// Assert
Assert.AreSame(slidingCurve, output.SlidingCurve);
Assert.AreSame(slipPlane, output.SlipPlane);
@@ -124,8 +123,6 @@
Assert.IsNaN(output.ZValue);
Assert.IsNaN(output.ForbiddenZonesXEntryMin);
Assert.IsNaN(output.ForbiddenZonesXEntryMax);
- Assert.IsFalse(output.ForbiddenZonesAutomaticallyCalculated);
- Assert.IsFalse(output.GridAutomaticallyCalculated);
}
[Test]
@@ -145,17 +142,13 @@
double zValue = random.NextDouble();
double xEntryMin = random.NextDouble();
double xEntryMax = random.NextDouble();
- bool forbiddenZonesAutomaticallyCalculated = random.NextBoolean();
- bool gridAutomaticallyCalculated = random.NextBoolean();
var properties = new MacroStabilityInwardsOutput.ConstructionProperties
{
FactorOfStability = factorOfStability,
ZValue = zValue,
ForbiddenZonesXEntryMin = xEntryMin,
- ForbiddenZonesXEntryMax = xEntryMax,
- ForbiddenZonesAutomaticallyCalculated = forbiddenZonesAutomaticallyCalculated,
- GridAutomaticallyCalculated = gridAutomaticallyCalculated
+ ForbiddenZonesXEntryMax = xEntryMax
};
// Call
@@ -169,8 +162,6 @@
Assert.AreEqual(zValue, output.ZValue);
Assert.AreEqual(xEntryMin, output.ForbiddenZonesXEntryMin);
Assert.AreEqual(xEntryMax, output.ForbiddenZonesXEntryMax);
- Assert.AreEqual(forbiddenZonesAutomaticallyCalculated, output.ForbiddenZonesAutomaticallyCalculated);
- Assert.AreEqual(gridAutomaticallyCalculated, output.GridAutomaticallyCalculated);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculationGridResultTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculationGridResultTest.cs (.../UpliftVanCalculationGridResultTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculationGridResultTest.cs (.../UpliftVanCalculationGridResultTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -74,7 +74,7 @@
}
[Test]
- public void Constructor_ExpectedValues()
+ public void Constructor_ValidParameters_ExpectedValues()
{
// Setup
UpliftVanGridResult leftGrid = UpliftVanGridResultTestFactory.Create();
@@ -93,7 +93,7 @@
// Assert
Assert.AreSame(leftGrid, result.LeftGrid);
Assert.AreSame(rightGrid, result.RightGrid);
- CollectionAssert.AreEqual(tangentLines, result.TangentLines);
+ Assert.AreSame(tangentLines, result.TangentLines);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculatorResultTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculatorResultTest.cs (.../UpliftVanCalculatorResultTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanCalculatorResultTest.cs (.../UpliftVanCalculatorResultTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -20,7 +20,6 @@
// All rights reserved.
using System;
-using Core.Common.TestUtil;
using NUnit.Framework;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
using Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Result;
@@ -54,7 +53,6 @@
// Call
TestDelegate call = () => new UpliftVanCalculatorResult(slidingCurveResult, null, new UpliftVanCalculatorResult.ConstructionProperties());
- ;
// Assert
var exception = Assert.Throws(call);
@@ -112,8 +110,6 @@
Assert.IsNaN(result.ZValue);
Assert.IsNaN(result.ForbiddenZonesXEntryMin);
Assert.IsNaN(result.ForbiddenZonesXEntryMax);
- Assert.IsFalse(result.ForbiddenZonesAutomaticallyCalculated);
- Assert.IsFalse(result.GridAutomaticallyCalculated);
}
[Test]
@@ -125,17 +121,13 @@
double zValue = random.NextDouble();
double xEntryMin = random.NextDouble();
double xEntryMax = random.NextDouble();
- bool forbiddenZonesAutomaticallyCalculated = random.NextBoolean();
- bool gridAutomaticallyCalculated = random.NextBoolean();
var constructionProperties = new UpliftVanCalculatorResult.ConstructionProperties
{
FactorOfStability = factorOfStability,
ZValue = zValue,
ForbiddenZonesXEntryMin = xEntryMin,
- ForbiddenZonesXEntryMax = xEntryMax,
- ForbiddenZonesAutomaticallyCalculated = forbiddenZonesAutomaticallyCalculated,
- GridAutomaticallyCalculated = gridAutomaticallyCalculated
+ ForbiddenZonesXEntryMax = xEntryMax
};
UpliftVanSlidingCurveResult slidingCurveResult = UpliftVanSlidingCurveResultTestFactory.Create();
@@ -151,8 +143,6 @@
Assert.AreEqual(zValue, result.ZValue);
Assert.AreEqual(xEntryMin, result.ForbiddenZonesXEntryMin);
Assert.AreEqual(xEntryMax, result.ForbiddenZonesXEntryMax);
- Assert.AreEqual(forbiddenZonesAutomaticallyCalculated, result.ForbiddenZonesAutomaticallyCalculated);
- Assert.AreEqual(gridAutomaticallyCalculated, result.GridAutomaticallyCalculated);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanGridResultTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanGridResultTest.cs (.../UpliftVanGridResultTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanGridResultTest.cs (.../UpliftVanGridResultTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -37,19 +37,19 @@
double xRight = random.Next();
double zTop = random.Next();
double zBottom = random.Next();
- int nrOfHorizontalPoints = random.Next();
- int nrOfVerticalPoints = random.Next();
+ int numberOfHorizontalPoints = random.Next();
+ int numberOfVerticalPoints = random.Next();
// Call
- var gridResult = new UpliftVanGridResult(xLeft, xRight, zTop, zBottom, nrOfHorizontalPoints, nrOfVerticalPoints);
+ var gridResult = new UpliftVanGridResult(xLeft, xRight, zTop, zBottom, numberOfHorizontalPoints, numberOfVerticalPoints);
// Assert
Assert.AreEqual(xLeft, gridResult.XLeft);
Assert.AreEqual(xRight, gridResult.XRight);
Assert.AreEqual(zTop, gridResult.ZTop);
Assert.AreEqual(zBottom, gridResult.ZBottom);
- Assert.AreEqual(nrOfHorizontalPoints, gridResult.NumberOfHorizontalPoints);
- Assert.AreEqual(nrOfVerticalPoints, gridResult.NumberOfVerticalPoints);
+ Assert.AreEqual(numberOfHorizontalPoints, gridResult.NumberOfHorizontalPoints);
+ Assert.AreEqual(numberOfVerticalPoints, gridResult.NumberOfVerticalPoints);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSliceResultTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSliceResultTest.cs (.../UpliftVanSliceResultTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSliceResultTest.cs (.../UpliftVanSliceResultTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -102,10 +102,10 @@
new UpliftVanSliceResult.ConstructionProperties());
// Assert
- Assert.AreEqual(topLeftPoint, slice.TopLeftPoint);
- Assert.AreEqual(topRightPoint, slice.TopRightPoint);
- Assert.AreEqual(bottomLeftPoint, slice.BottomLeftPoint);
- Assert.AreEqual(bottomRightPoint, slice.BottomRightPoint);
+ Assert.AreSame(topLeftPoint, slice.TopLeftPoint);
+ Assert.AreSame(topRightPoint, slice.TopRightPoint);
+ Assert.AreSame(bottomLeftPoint, slice.BottomLeftPoint);
+ Assert.AreSame(bottomRightPoint, slice.BottomRightPoint);
}
[Test]
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResultTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResultTest.cs (.../UpliftVanSlidingCircleResultTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSlidingCircleResultTest.cs (.../UpliftVanSlidingCircleResultTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -42,7 +42,7 @@
}
[Test]
- public void Constructor_ExpectedValues()
+ public void Constructor_ValidParameters_ExpectedValues()
{
// Setup
var random = new Random(11);
@@ -58,7 +58,7 @@
var circle = new UpliftVanSlidingCircleResult(center, radius, isActive, nonIteratedForce, iteratedForce, drivingMoment, resistingMoment);
// Assert
- Assert.AreEqual(center, circle.Center);
+ Assert.AreSame(center, circle.Center);
Assert.AreEqual(radius, circle.Radius);
Assert.AreEqual(isActive, circle.IsActive);
Assert.AreEqual(nonIteratedForce, circle.NonIteratedForce);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSlidingCurveResultTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSlidingCurveResultTest.cs (.../UpliftVanSlidingCurveResultTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/Output/UpliftVanSlidingCurveResultTest.cs (.../UpliftVanSlidingCurveResultTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -74,7 +74,7 @@
}
[Test]
- public void Constructor_ExpectedValues()
+ public void Constructor_ValidParameters_ExpectedValues()
{
// Setup
var random = new Random(21);
@@ -97,7 +97,7 @@
Assert.AreSame(rightCircle, curve.RightCircle);
Assert.AreEqual(nonIteratedHorizontalForce, curve.NonIteratedHorizontalForce);
Assert.AreEqual(iteratedHorizontalForce, curve.IteratedHorizontalForce);
- CollectionAssert.AreEqual(slices, curve.Slices);
+ Assert.AreSame(slices, curve.Slices);
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs (.../UpliftVanCalculatorTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Calculators/UpliftVan/UpliftVanCalculatorTest.cs (.../UpliftVanCalculatorTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -43,7 +43,7 @@
public class UpliftVanCalculatorTest
{
[Test]
- public void Constructor_WithoutInput_ArgumentNullException()
+ public void Constructor_InputNull_ArgumentNullException()
{
// Setup
var mocks = new MockRepository();
@@ -54,8 +54,8 @@
TestDelegate call = () => new UpliftVanCalculator(null, factory);
// Assert
- const string expectedMessage = "UpliftVanCalculatorInput required for creating a UpliftVanCalculator.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage);
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("input", exception.ParamName);
mocks.VerifyAll();
}
@@ -67,12 +67,12 @@
TestDelegate call = () => new UpliftVanCalculator(input, null);
// Assert
- const string expectedMessage = "IMacroStabilityInwardsKernelFactory required for creating a UpliftVanCalculator.";
- TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage);
+ var exception = Assert.Throws(call);
+ Assert.AreEqual("factory", exception.ParamName);
}
[Test]
- public void Constructor_ExpectedValues()
+ public void Constructor_ValidParameters_ExpectedValues()
{
// Setup
var mocks = new MockRepository();
@@ -101,8 +101,6 @@
upliftVanKernel.ZValue = random.NextDouble();
upliftVanKernel.ForbiddenZonesXEntryMax = random.NextDouble();
upliftVanKernel.ForbiddenZonesXEntryMin = random.NextDouble();
- upliftVanKernel.ForbiddenZonesAutomaticallyCalculated = random.NextBoolean();
- upliftVanKernel.GridAutomaticallyCalculated = random.NextBoolean();
upliftVanKernel.SlidingCurveResult = SlidingDualCircleTestFactory.Create();
upliftVanKernel.SlipPlaneResult = SlipPlaneUpliftVanTestFactory.Create();
@@ -115,8 +113,6 @@
Assert.AreEqual(upliftVanKernel.ZValue, actual.ZValue);
Assert.AreEqual(upliftVanKernel.ForbiddenZonesXEntryMax, actual.ForbiddenZonesXEntryMax);
Assert.AreEqual(upliftVanKernel.ForbiddenZonesXEntryMin, actual.ForbiddenZonesXEntryMin);
- Assert.AreEqual(upliftVanKernel.ForbiddenZonesAutomaticallyCalculated, actual.ForbiddenZonesAutomaticallyCalculated);
- Assert.AreEqual(upliftVanKernel.GridAutomaticallyCalculated, actual.GridAutomaticallyCalculated);
UpliftVanCalculatorResultHelper.AssertSlidingCurve(UpliftVanSlidingCurveResultCreator.Create(upliftVanKernel.SlidingCurveResult),
actual.SlidingCurveResult);
UpliftVanCalculatorResultHelper.AssertSlipPlaneGrid(UpliftVanCalculationGridResultCreator.Create(upliftVanKernel.SlipPlaneResult),
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/UpliftVanCalculatorResultTestFactoryTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/UpliftVanCalculatorResultTestFactoryTest.cs (.../UpliftVanCalculatorResultTestFactoryTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/UpliftVanCalculatorResultTestFactoryTest.cs (.../UpliftVanCalculatorResultTestFactoryTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -39,8 +39,6 @@
Assert.AreEqual(0.2, result.ZValue);
Assert.AreEqual(0.3, result.ForbiddenZonesXEntryMin);
Assert.AreEqual(0.4, result.ForbiddenZonesXEntryMax);
- Assert.IsTrue(result.GridAutomaticallyCalculated);
- Assert.IsTrue(result.ForbiddenZonesAutomaticallyCalculated);
AssertSlidingCurve(result.SlidingCurveResult);
AssertUpliftVanCalculationGrid(result.CalculationGridResult);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernel/UpliftVanKernelStub.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernel/UpliftVanKernelStub.cs (.../UpliftVanKernelStub.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernel/UpliftVanKernelStub.cs (.../UpliftVanKernelStub.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -67,10 +67,6 @@
public double ForbiddenZonesXEntryMax { get; set; }
- public bool ForbiddenZonesAutomaticallyCalculated { get; set; }
-
- public bool GridAutomaticallyCalculated { get; set; }
-
public SlidingDualCircle SlidingCurveResult { get; set; }
public SlipPlaneUpliftVan SlipPlaneResult { get; set; }
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/UpliftVanCalculatorResultTestFactory.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/UpliftVanCalculatorResultTestFactory.cs (.../UpliftVanCalculatorResultTestFactory.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/UpliftVanCalculatorResultTestFactory.cs (.../UpliftVanCalculatorResultTestFactory.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -52,9 +52,7 @@
FactorOfStability = 0.1,
ZValue = 0.2,
ForbiddenZonesXEntryMin = 0.3,
- ForbiddenZonesXEntryMax = 0.4,
- GridAutomaticallyCalculated = true,
- ForbiddenZonesAutomaticallyCalculated = true
+ ForbiddenZonesXEntryMax = 0.4
});
}
}
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs
===================================================================
diff -u -rf2821a4b299043f78c93fb0acf5851081f96961b -r0e809897e28ca8673b98ec8abb68b42939a3a647
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision f2821a4b299043f78c93fb0acf5851081f96961b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 0e809897e28ca8673b98ec8abb68b42939a3a647)
@@ -29,7 +29,6 @@
using Ringtoets.Common.Service.TestUtil;
using Ringtoets.MacroStabilityInwards.Data;
using Ringtoets.MacroStabilityInwards.Data.TestUtil;
-using Ringtoets.MacroStabilityInwards.KernelWrapper;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Input;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.UpliftVan.Output;
@@ -392,8 +391,6 @@
Assert.AreEqual(expectedOutput.ZValue, actualOutput.ZValue);
Assert.AreEqual(expectedOutput.ForbiddenZonesXEntryMin, actualOutput.ForbiddenZonesXEntryMin);
Assert.AreEqual(expectedOutput.ForbiddenZonesXEntryMax, actualOutput.ForbiddenZonesXEntryMax);
- Assert.AreEqual(expectedOutput.GridAutomaticallyCalculated, actualOutput.GridAutomaticallyCalculated);
- Assert.AreEqual(expectedOutput.ForbiddenZonesAutomaticallyCalculated, actualOutput.ForbiddenZonesAutomaticallyCalculated);
AssertSlidingCurve(expectedOutput.SlidingCurveResult, actualOutput.SlidingCurve);
AssertSlipPlane(expectedOutput.CalculationGridResult, actualOutput.SlipPlane);
}