Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs
===================================================================
diff -u -re95718a891fa178feab8e70bee2db77e9dedc790 -r966dc7335defa901104fd4168d57c08315db2de0
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision e95718a891fa178feab8e70bee2db77e9dedc790)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/MacroStabilityInwardsCalculator.cs (.../MacroStabilityInwardsCalculator.cs) (revision 966dc7335defa901104fd4168d57c08315db2de0)
@@ -24,7 +24,6 @@
using System.Linq;
using Deltares.WTIStability.Data.Geo;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Creators;
-using Ringtoets.MacroStabilityInwards.KernelWrapper.Result;
using Ringtoets.MacroStabilityInwards.KernelWrapper.SubCalculator;
using Ringtoets.MacroStabilityInwards.Primitives.MacroStabilityInwardsSoilUnderSurfaceLine;
@@ -34,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
+ public class MacroStabilityInwardsCalculator : IMacroStabilityInwardsCalculator
{
private readonly MacroStabilityInwardsCalculatorInput input;
private readonly IMacroStabilityInwardsSubCalculatorFactory factory;
@@ -61,33 +60,24 @@
this.factory = factory;
}
- ///
- /// Performs the actual sub calculations and returns a , which
- /// contains the results of all sub calculations.
- ///
- /// A containing the results of the sub calculations.
public MacroStabilityInwardsCalculatorResult Calculate()
{
IUpliftVanCalculator upliftVanCalculator = CalculateUpliftVan();
return new MacroStabilityInwardsCalculatorResult(
- MacroStabilityInwardsSlidingCurveResultCreator.Create(upliftVanCalculator.SlidingCurve),
+ MacroStabilityInwardsSlidingCurveResultCreator.Create(upliftVanCalculator.SlidingCurveResult),
null,
new MacroStabilityInwardsCalculatorResult.ConstructionProperties
- {
- FactorOfStability = upliftVanCalculator.FactoryOfStability,
- ZValue = upliftVanCalculator.ZValue,
- ForbiddenZonesXEntryMin = upliftVanCalculator.ForbiddenZonesXEntryMin,
- ForbiddenZonesXEntryMax = upliftVanCalculator.ForbiddenZonesXEntryMax,
- ForbiddenZonesAutomaticallyCalculated = upliftVanCalculator.ForbiddenZonesAutomaticallyCalculated,
- GridAutomaticallyCalculated = upliftVanCalculator.GridAutomaticallyCalculated
- });
+ {
+ FactorOfStability = upliftVanCalculator.FactoryOfStability,
+ ZValue = upliftVanCalculator.ZValue,
+ ForbiddenZonesXEntryMin = upliftVanCalculator.ForbiddenZonesXEntryMin,
+ ForbiddenZonesXEntryMax = upliftVanCalculator.ForbiddenZonesXEntryMax,
+ ForbiddenZonesAutomaticallyCalculated = upliftVanCalculator.ForbiddenZonesAutomaticallyCalculated,
+ GridAutomaticallyCalculated = upliftVanCalculator.GridAutomaticallyCalculated
+ });
}
- ///
- /// Returns a list of validation messages. The validation messages are based on the values of the
- /// which was provided to this and are determined by the kernel.
- ///
public List Validate()
{
return new List();