Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs =================================================================== diff -u -rc0a3ced404197fd781c6fcbcfc21c6676592be57 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision c0a3ced404197fd781c6fcbcfc21c6676592be57) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingInput.cs (.../PipingInput.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -98,7 +98,6 @@ /// Gets or sets the outside high water level. /// [m] /// - /// is . public RoundedDouble AssessmentLevel { get @@ -152,7 +151,7 @@ /// /// Gets or sets the l-coordinate of the exit point, which, together with - /// the l-coordinate of the exit point, is used to determine the seepage + /// the l-coordinate of the entry point, is used to determine the seepage /// length of . /// [m] /// @@ -339,7 +338,7 @@ public NormalDistribution PhreaticLevelExit { get; set; } /// - /// Gets or sets the horizontal distance between entree and exit point. + /// Gets or sets the horizontal distance between entry and exit point. /// [m] /// public LognormalDistribution SeepageLength { get; set; } @@ -377,7 +376,7 @@ /// Gets or sets the volumic weight of the saturated coverage layer. /// public ShiftedLognormalDistribution SaturatedVolumicWeightOfCoverageLayer { get; set; } - + #endregion private void UpdateEntryAndExitPoint() Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs =================================================================== diff -u -ra9c4c3b9c62339476e2e901bd2b402ed22ac772b -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision a9c4c3b9c62339476e2e901bd2b402ed22ac772b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -22,7 +22,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Drawing.Design; - using Core.Common.Base.Data; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; @@ -42,7 +41,31 @@ /// public class PipingInputContextProperties : ObjectProperties { + #region Model Settings + /// + /// Gets or sets the design variable for . + /// + [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] + [ResourcesCategory(typeof(Resources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_DampingFactorExit_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_DampingFactorExit_Description")] + public DesignVariable DampingFactorExit + { + get + { + return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedData); + } + set + { + data.WrappedData.DampingFactorExit = value.Distribution; + data.WrappedData.NotifyObservers(); + } + } + + #endregion + + /// /// Gets the available surface lines on . /// public IEnumerable GetAvailableSurfaceLines() @@ -65,9 +88,12 @@ { return data.AvailableHydraulicBoundaryLocations; } - + #region Hydraulic data + /// + /// Gets or sets the . + /// [Editor(typeof(PipingInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] [ResourcesDisplayName(typeof(Resources), "PipingInput_HydraulicBoundaryLocation_DisplayName")] @@ -85,6 +111,9 @@ } } + /// + /// Gets the assessment level. + /// [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] [ResourcesDisplayName(typeof(Resources), "PipingInput_AssessmentLevel_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_AssessmentLevel_Description")] @@ -96,6 +125,9 @@ } } + /// + /// Gets the piezometric head at the exit point. + /// [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] [ResourcesDisplayName(typeof(Resources), "PipingInput_PiezometricHeadExit_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_PiezometricHeadExit_Description")] @@ -107,6 +139,9 @@ } } + /// + /// Gets or sets the design variable for . + /// [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))] [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] [ResourcesDisplayName(typeof(Resources), "PipingInput_PhreaticLevelExit_DisplayName")] @@ -128,6 +163,9 @@ #region Schematization + /// + /// Gets or sets the . + /// [Editor(typeof(PipingInputContextSurfaceLineSelectionEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_SurfaceLine_DisplayName")] @@ -145,6 +183,9 @@ } } + /// + /// Gets or sets the . + /// [Editor(typeof(PipingInputContextSoilProfileSelectionEditor), typeof(UITypeEditor))] [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_SoilProfile_DisplayName")] @@ -162,6 +203,9 @@ } } + /// + /// Gets or sets the l-coordinate of the entry point. + /// [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_EntryPointL_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_EntryPointL_Description")] @@ -178,6 +222,9 @@ } } + /// + /// Gets or sets the l-coordinate of the exit point. + /// [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_ExitPointL_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_ExitPointL_Description")] @@ -194,6 +241,9 @@ } } + /// + /// Gets or sets the design variable for . + /// [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_SeepageLength_DisplayName")] @@ -206,6 +256,9 @@ } } + /// + /// Gets or sets the design variable for . + /// [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessCoverageLayer_DisplayName")] @@ -218,6 +271,9 @@ } } + /// + /// Gets or sets the design variable for . + /// [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessAquiferLayer_DisplayName")] @@ -234,6 +290,9 @@ #region Soil Properties + /// + /// Gets or sets the design variable for . + /// [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] [ResourcesCategory(typeof(Resources), "Categories_SoilProperties")] [ResourcesDisplayName(typeof(Resources), "PipingInput_DarcyPermeability_DisplayName")] @@ -251,6 +310,9 @@ } } + /// + /// Gets or sets the design variable for . + /// [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] [ResourcesCategory(typeof(Resources), "Categories_SoilProperties")] [ResourcesDisplayName(typeof(Resources), "PipingInput_Diameter70_DisplayName")] @@ -271,26 +333,5 @@ // TODO: Verzadigd gewicht deklaag #endregion - - #region Model Settings - - [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_ModelSettings")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_DampingFactorExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_DampingFactorExit_Description")] - public DesignVariable DampingFactorExit - { - get - { - return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedData); - } - set - { - data.WrappedData.DampingFactorExit = value.Distribution; - data.WrappedData.NotifyObservers(); - } - } - - #endregion } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculator.cs (.../PipingCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -31,7 +31,7 @@ namespace Ringtoets.Piping.KernelWrapper { /// - /// This class represents a combination of piping sub-calculations, which together can be used + /// This class represents a combination of piping sub calculations, which together can be used /// to assess based on piping. /// public class PipingCalculator @@ -45,7 +45,7 @@ /// /// The containing all the values required /// for performing a piping calculation. - /// + /// The factory responsible for creating the sub calculators. /// or is null. public PipingCalculator(PipingCalculatorInput input, IPipingSubCalculatorFactory factory) { @@ -66,7 +66,7 @@ /// contains the results of all sub calculations. /// /// A containing the results of the sub calculations. - /// Thrown when any of the invocations of the sub-calculations from the kernel throws an Exception. + /// Thrown when any of the invocations of the sub calculations from the kernel throws an Exception. public PipingCalculatorResult Calculate() { var upliftResult = CalculateUplift(); @@ -116,7 +116,7 @@ /// surface at exit point's x-coordinate is higher than the soil profile /// surface line is null /// soil profile is null - /// soil profile's aquifer layer + /// soil profile's aquifer layer is not set /// public double CalculateThicknessCoverageLayer() { @@ -323,10 +323,10 @@ /// /// Determines the effective stress for a one layer profile. /// - /// The thickness of aquitard layer. - /// The saturated volumic weight of aquitard layer. - /// - /// + /// The thickness of the aquitard layer. + /// The saturated volumic weight of the aquitard layer. + /// The volumetric weight of water. + /// The effective stress. private static double DetermineEffectiveStressForOneLayerProfile(double thicknessOfCoverageLayer, double volumicWeightOfCoverageLayer, double waterVolumetricWeight) { return thicknessOfCoverageLayer * (volumicWeightOfCoverageLayer - waterVolumetricWeight); Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs (.../PipingCalculatorInput.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs (.../PipingCalculatorInput.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -58,18 +58,17 @@ /// in the piping sub calculations. /// /// The volumetric weight of water. [kN/m³] - /// + /// The volumic weight of the coverage layer when saturated. /// The calculation value used to account for uncertainty in the model for uplift. /// The outside high water level. [m] /// The piezometric head at the exit point. [m] /// The damping factor at the exit point. /// The phreatic level at the exit point. [m] - /// The piezometric head in the hinterland. [m] /// The critical exit gradient for heave. /// The total thickness of the coverage layer at the exit point. [m] /// The calculation value used to account for uncertainty in the model for Sellmeijer. /// The reduction factor Sellmeijer. - /// The horizontal distance between entree and exit point. [m] + /// The horizontal distance between entry and exit point. [m] /// The (lowerbound) volumic weight of sand grain material of a sand layer under water. [kN/m³] /// The White's drag coefficient. /// The sieve size through which 70% fraction of the grains of the top part of the aquifer passes. [m] @@ -228,7 +227,7 @@ } /// - /// Gets the horizontal distance between entree and exit point. + /// Gets the horizontal distance between entry and exit point. /// [m] /// public double SeepageLength Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj (.../Ringtoets.Piping.KernelWrapper.csproj) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj (.../Ringtoets.Piping.KernelWrapper.csproj) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -98,6 +98,7 @@ ResXFileCodeGenerator Resources.Designer.cs + Designer Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/EffectiveThicknessCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/EffectiveThicknessCalculator.cs (.../EffectiveThicknessCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/EffectiveThicknessCalculator.cs (.../EffectiveThicknessCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,11 +1,38 @@ -using Deltares.WTIPiping; +// Copyright (C) Stichting Deltares 2016. 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 Deltares.WTIPiping; + namespace Ringtoets.Piping.KernelWrapper.SubCalculator { + /// + /// Class which wraps a . + /// public class EffectiveThicknessCalculator : IEffectiveThicknessCalculator { private readonly Deltares.WTIPiping.EffectiveThicknessCalculator wrappedCalculator; + /// + /// Creates a new instance of . + /// public EffectiveThicknessCalculator() { wrappedCalculator = new Deltares.WTIPiping.EffectiveThicknessCalculator(); Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs (.../HeaveCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/HeaveCalculator.cs (.../HeaveCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,5 +1,26 @@ -using System.Collections.Generic; +// Copyright (C) Stichting Deltares 2016. 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.Piping.KernelWrapper.SubCalculator { /// Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs (.../IEffectiveThicknessCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IEffectiveThicknessCalculator.cs (.../IEffectiveThicknessCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,5 +1,26 @@ -using Deltares.WTIPiping; +// Copyright (C) Stichting Deltares 2016. 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 Deltares.WTIPiping; + namespace Ringtoets.Piping.KernelWrapper.SubCalculator { /// Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs (.../IHeaveCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IHeaveCalculator.cs (.../IHeaveCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,5 +1,26 @@ -using System.Collections.Generic; +// Copyright (C) Stichting Deltares 2016. 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.Piping.KernelWrapper.SubCalculator { /// @@ -38,12 +59,12 @@ double RExit { set; } /// - /// Returns the Zh property to use in the heave calculation. + /// Returns the Zh property of the heave calculation. /// double Zh { get; } /// - /// Returns the FoSh property to use in the heave calculation. + /// Returns the FoSh property of the heave calculation. /// double FoSh { get; } @@ -55,6 +76,7 @@ /// /// Performs the heave validation. /// + /// A list of validation strings. List Validate(); } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPiezoHeadCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPiezoHeadCalculator.cs (.../IPiezoHeadCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPiezoHeadCalculator.cs (.../IPiezoHeadCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,7 +1,28 @@ -namespace Ringtoets.Piping.KernelWrapper.SubCalculator +// Copyright (C) Stichting Deltares 2016. 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. + +namespace Ringtoets.Piping.KernelWrapper.SubCalculator { /// - /// Interface with operations for performing an piezometric head at exit sub calculation. + /// Interface with operations for performing a piezometric head at exit sub calculation. /// public interface IPiezoHeadCalculator { @@ -26,7 +47,7 @@ double PhiExit { get; } /// - /// Performs the piezomteric head at exit calculation. + /// Performs the piezometric head at exit calculation. /// void Calculate(); } Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPipingSubCalculatorFactory.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPipingSubCalculatorFactory.cs (.../IPipingSubCalculatorFactory.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IPipingSubCalculatorFactory.cs (.../IPipingSubCalculatorFactory.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,4 +1,25 @@ -namespace Ringtoets.Piping.KernelWrapper.SubCalculator +// Copyright (C) Stichting Deltares 2016. 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. + +namespace Ringtoets.Piping.KernelWrapper.SubCalculator { /// /// Factory responsible for creating the sub calculators required for a piping calculation. Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs (.../ISellmeijerCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/ISellmeijerCalculator.cs (.../ISellmeijerCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,5 +1,26 @@ -using System.Collections.Generic; +// Copyright (C) Stichting Deltares 2016. 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.Piping.KernelWrapper.SubCalculator { /// @@ -8,82 +29,82 @@ public interface ISellmeijerCalculator { /// - /// Sets the BeddingAngle property to use in the Sellmeijer calculation + /// Sets the BeddingAngle property to use in the Sellmeijer calculation. /// double BeddingAngle { set; } /// - /// Sets the D70 to use in the Sellmeijer calculation + /// Sets the D70 property to use in the Sellmeijer calculation. /// double D70 { set; } /// - /// Sets the D70Mean property to use in the Sellmeijer calculation + /// Sets the D70Mean property to use in the Sellmeijer calculation. /// double D70Mean { set; } /// - /// Sets the DAquifer property to use in the Sellmeijer calculation + /// Sets the DAquifer property to use in the Sellmeijer calculation. /// double DAquifer { set; } /// - /// Sets the DarcyPermeability property to use in the Sellmeijer calculation + /// Sets the DarcyPermeability property to use in the Sellmeijer calculation. /// double DarcyPermeability { set; } /// - /// Sets the DTotal property to use in the Sellmeijer calculation + /// Sets the DTotal property to use in the Sellmeijer calculation. /// double DTotal { set; } /// - /// Sets the GammaSubParticles property to use in the Sellmeijer calculation + /// Sets the GammaSubParticles property to use in the Sellmeijer calculation. /// double GammaSubParticles { set; } /// - /// Sets the Gravity property to use in the Sellmeijer calculation + /// Sets the Gravity property to use in the Sellmeijer calculation. /// double Gravity { set; } /// - /// Sets the HExit property to use in the Sellmeijer calculation + /// Sets the HExit property to use in the Sellmeijer calculation. /// double HExit { set; } /// - /// Sets the HRiver property to use in the Sellmeijer calculation + /// Sets the HRiver property to use in the Sellmeijer calculation. /// double HRiver { set; } /// - /// Sets the KinematicViscosityWater property to use in the Sellmeijer calculation + /// Sets the KinematicViscosityWater property to use in the Sellmeijer calculation. /// double KinematicViscosityWater { set; } /// - /// Sets the ModelFactorPiping property to use in the Sellmeijer calculation + /// Sets the ModelFactorPiping property to use in the Sellmeijer calculation. /// double ModelFactorPiping { set; } /// - /// Sets the Rc property to use in the Sellmeijer calculation + /// Sets the Rc property to use in the Sellmeijer calculation. /// double Rc { set; } /// - /// Sets the SeepageLength property to use in the Sellmeijer calculation + /// Sets the SeepageLength property to use in the Sellmeijer calculation. /// double SeepageLength { set; } /// - /// Sets the VolumetricWeightOfWater property to use in the Sellmeijer calculation + /// Sets the VolumetricWeightOfWater property to use in the Sellmeijer calculation. /// double VolumetricWeightOfWater { set; } /// - /// Sets the WhitesDragCoefficient property to use in the Sellmeijer calculation + /// Sets the WhitesDragCoefficient property to use in the Sellmeijer calculation. /// double WhitesDragCoefficient { set; } @@ -105,6 +126,7 @@ /// /// Performs the Sellmeijer validation. /// + /// A list of validation strings. List Validate(); } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs (.../IUpliftCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/IUpliftCalculator.cs (.../IUpliftCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,67 +1,92 @@ -using System.Collections.Generic; +// Copyright (C) Stichting Deltares 2016. 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.Piping.KernelWrapper.SubCalculator { + /// + /// Interface with operations for performing an uplift sub calculation. + /// public interface IUpliftCalculator { /// - /// Sets the EffectiveStress property to use in the uplift calculation + /// Sets the EffectiveStress property to use in the uplift calculation. /// double EffectiveStress { set; } /// - /// Sets the HExit property to use in the uplift calculation + /// Sets the HExit property to use in the uplift calculation. /// double HExit { set; } /// - /// Sets the HRiver property to use in the uplift calculation + /// Sets the HRiver property to use in the uplift calculation. /// double HRiver { set; } /// - /// Sets the ModelFactorUplift property to use in the uplift calculation + /// Sets the ModelFactorUplift property to use in the uplift calculation. /// double ModelFactorUplift { set; } /// - /// Sets the PhiExit property to use in the uplift calculation + /// Sets the PhiExit property to use in the uplift calculation. /// double PhiExit { set; } /// - /// Sets the PhiPolder property to use in the uplift calculation + /// Sets the PhiPolder property to use in the uplift calculation. /// double PhiPolder { set; } /// - /// Sets the RExit property to use in the uplift calculation + /// Sets the RExit property to use in the uplift calculation. /// double RExit { set; } /// - /// Sets the VolumetricWeightOfWater property to use in the uplift calculation + /// Sets the VolumetricWeightOfWater property to use in the uplift calculation. /// double VolumetricWeightOfWater { set; } /// - /// Gets the Zu property of the uplift calculation + /// Gets the Zu property of the uplift calculation. /// double Zu { get; } /// - /// Gets the FoSu property of the uplift calculation + /// Gets the FoSu property of the uplift calculation. /// double FoSu { get; } /// - /// Performs the uplift validation. + /// Performs the uplift calculation. /// void Calculate(); /// /// Performs the uplift validation. /// + /// A list of validation strings. List Validate(); } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PiezoHeadCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PiezoHeadCalculator.cs (.../PiezoHeadCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PiezoHeadCalculator.cs (.../PiezoHeadCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,10 +1,31 @@ +// Copyright (C) Stichting Deltares 2016. 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. + namespace Ringtoets.Piping.KernelWrapper.SubCalculator { /// /// Class which wraps the . /// - public class PiezoHeadCalculator : IPiezoHeadCalculator { - + public class PiezoHeadCalculator : IPiezoHeadCalculator + { public double PhiPolder { private get; set; } public double RExit { private get; set; } Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PipingSubCalculatorFactory.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PipingSubCalculatorFactory.cs (.../PipingSubCalculatorFactory.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/PipingSubCalculatorFactory.cs (.../PipingSubCalculatorFactory.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,4 +1,25 @@ -namespace Ringtoets.Piping.KernelWrapper.SubCalculator +// Copyright (C) Stichting Deltares 2016. 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. + +namespace Ringtoets.Piping.KernelWrapper.SubCalculator { /// /// Factory which creates the sub calculators from the piping kernel. Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs (.../SellmeijerCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/SellmeijerCalculator.cs (.../SellmeijerCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,4 +1,25 @@ -using System.Collections.Generic; +// Copyright (C) Stichting Deltares 2016. 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; using Deltares.WTIPiping; namespace Ringtoets.Piping.KernelWrapper.SubCalculator @@ -11,7 +32,7 @@ private readonly Sellmeijer2011Calculator wrappedCalculator; /// - /// Creates a new instance of + /// Creates a new instance of . /// public SellmeijerCalculator() { Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/SubCalculator/UpliftCalculator.cs (.../UpliftCalculator.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -1,4 +1,25 @@ -using System.Collections.Generic; +// Copyright (C) Stichting Deltares 2016. 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; using Deltares.WTIPiping; namespace Ringtoets.Piping.KernelWrapper.SubCalculator @@ -11,7 +32,7 @@ private readonly WTIUpliftCalculator wrappedCalculator; /// - /// Creates a new instance of + /// Creates a new instance of . /// public UpliftCalculator() { Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs =================================================================== diff -u -r65ea41e01d41d77df1e30bf8e850a44de46e870f -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 65ea41e01d41d77df1e30bf8e850a44de46e870f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationService.cs (.../PipingCalculationService.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -37,14 +37,18 @@ public static class PipingCalculationService { private static readonly ILog pipingCalculationLogger = LogManager.GetLogger(typeof(PipingCalculation)); + + /// + /// The to use for creating piping sub calculators. + /// public static IPipingSubCalculatorFactory SubCalculatorFactory = new PipingSubCalculatorFactory(); /// /// Performs validation over the values on the given . Error and status information is logged during /// the execution of the operation. /// /// The for which to validate the values. - /// False if contains validation errors; True otherwise. + /// False if contains validation errors; True otherwise. public static bool Validate(PipingCalculation calculation) { pipingCalculationLogger.Info(String.Format(Resources.Validation_Subject_0_started_Time_1_, @@ -104,7 +108,7 @@ /// /// Calculates the thickness of the coverage layer based on the values of the . /// - /// The thickness of the coverage layer, or -1 if the thickness could not be calculated. + /// The thickness of the coverage layer, or NaN if the thickness could not be calculated. public static double CalculateThicknessCoverageLayer(PipingInput input) { try @@ -147,6 +151,10 @@ ); } + /// + /// Calculates the piezometric head at the exit point based on the values of the . + /// + /// The piezometric head at the exit point. public static double CalculatePiezometricHeadAtExit(PipingInput input) { return new PipingCalculator(CreateInputFromData(input), SubCalculatorFactory).CalculatePiezometricHeadAtExit(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingInputSynchronizer.cs =================================================================== diff -u -r9d6862354c5ed380b027fa07dc87c8ade4df59c3 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingInputSynchronizer.cs (.../PipingInputSynchronizer.cs) (revision 9d6862354c5ed380b027fa07dc87c8ade4df59c3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingInputSynchronizer.cs (.../PipingInputSynchronizer.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -7,6 +7,9 @@ namespace Ringtoets.Piping.Service { + /// + /// Class responsible for synchronizing piping input. + /// public class PipingInputSynchronizer : IObserver { private static readonly ILog log = LogManager.GetLogger(typeof(PipingInputSynchronizer)); Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs =================================================================== diff -u -r23ecc584602719f982f2206ad49a329fbf5dc028 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision 23ecc584602719f982f2206ad49a329fbf5dc028) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -5,7 +5,7 @@ namespace Ringtoets.Piping.Service { /// - /// This class is responsible for calculating a factor of safety for piping based on the sub-calculations. + /// This class is responsible for calculating a factor of safety for piping based on the sub calculations. /// public class PipingSemiProbabilisticCalculationService { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -155,10 +155,6 @@ {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} Ringtoets.HydraRing.Data - - {d64e4f0e-e341-496f-82b2-941ad202b4e3} - Ringtoets.Piping.KernelWrapper - {ce994cc9-6f6a-48ac-b4be-02c30a21f4db} Ringtoets.Piping.Data @@ -171,10 +167,6 @@ {1D3D58B6-EF7E-401E-92A0-104067D222EE} Ringtoets.Piping.Plugin - - {10B8D63D-87E8-46DF-ACA9-A8CF22EE8FB5} - Ringtoets.Piping.Service - {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} Ringtoets.Piping.KernelWrapper.TestUtil @@ -183,10 +175,6 @@ {955e574d-67ce-4347-aa6b-7df8a04ed754} Ringtoets.Piping.Data.TestUtil - - {C05B4F73-480E-46A4-B037-40954F8276DC} - Ringtoets.Piping.Service.TestUtil - Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -29,7 +29,7 @@ { // Call TestDelegate call = () => new PipingCalculator(new TestPipingInput().AsRealInput(), null); - + // Assert TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "IPipingSubCalculatorFactory required for creating a PipingCalculator."); } Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSemiProbabilisticDesignValueFactoryTest.cs (.../PipingSemiProbabilisticDesignValueFactoryTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -23,7 +23,7 @@ } [Test] - public void GetSaturatedVolumicWeightOfCoverageLayer_ValidPipingCalculation_CreateDesignVariableForThicknessCoverageLayer() + public void GetSaturatedVolumicWeightOfCoverageLayer_ValidPipingCalculation_CreateDesignVariableForSaturatedVolumicWeightOfCoverageLayer() { // Setup var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs (.../PipingSurfaceLineCreatorTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs (.../PipingSurfaceLineCreatorTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -33,7 +33,7 @@ CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.X).ToArray(), actual.Points.Select(p => p.X).ToArray()); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Y).ToArray(), actual.Points.Select(p => p.Y).ToArray()); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z).ToArray(), actual.Points.Select(p => p.Z).ToArray()); - CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Count()), actual.Points.Select(p => p.Type)); + CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Length), actual.Points.Select(p => p.Type)); } [Test] @@ -62,7 +62,7 @@ CollectionAssert.AreEqual(expectedCoordinatesX, actual.Points.Select(p => p.X).ToArray()); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Y).ToArray(), actual.Points.Select(p => p.Y).ToArray()); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z).ToArray(), actual.Points.Select(p => p.Z).ToArray()); - CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Count()), actual.Points.Select(p => p.Type)); + CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Length), actual.Points.Select(p => p.Type)); } [Test] @@ -76,28 +76,28 @@ }; surfaceLine.SetGeometry(new[] { - new Point3D (1.0, 1.0, 2.2), - new Point3D (2.0, 3.0, 4.4), // Outlier from line specified by extrema - new Point3D (3.0, 4.0, 7.7), + new Point3D(1.0, 1.0, 2.2), + new Point3D(2.0, 3.0, 4.4), // Outlier from line specified by extrema + new Point3D(3.0, 4.0, 7.7) }); // Call PipingSurfaceLine actual = PipingSurfaceLineCreator.Create(surfaceLine); // Assert - var length = Math.Sqrt(2 * 2 + 3 * 3); - const double secondCoordinateFactor = (2.0 * 1.0 + 3.0 * 2.0) / (2.0 * 2.0 + 3.0 * 3.0); + var length = Math.Sqrt(2*2 + 3*3); + const double secondCoordinateFactor = (2.0*1.0 + 3.0*2.0)/(2.0*2.0 + 3.0*3.0); var expectedCoordinatesX = new[] { 0.0, - secondCoordinateFactor * length, + secondCoordinateFactor*length, length }; Assert.AreEqual(name, actual.Name); CollectionAssert.AreEqual(expectedCoordinatesX, actual.Points.Select(p => p.X).ToArray()); - CollectionAssert.AreEqual(Enumerable.Repeat(0, surfaceLine.Points.Count()).ToArray(), actual.Points.Select(p => p.Y).ToArray()); + CollectionAssert.AreEqual(Enumerable.Repeat(0, surfaceLine.Points.Length).ToArray(), actual.Points.Select(p => p.Y).ToArray()); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z).ToArray(), actual.Points.Select(p => p.Z).ToArray()); - CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Count()), actual.Points.Select(p => p.Type)); + CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Length), actual.Points.Select(p => p.Type)); } [Test] @@ -111,7 +111,7 @@ }; surfaceLine.SetGeometry(new[] { - new Point3D (1.0, 1.0, 2.2), + new Point3D(1.0, 1.0, 2.2) }); // Call @@ -120,13 +120,13 @@ // Assert var expectedCoordinatesX = new[] { - 0.0, + 0.0 }; Assert.AreEqual(name, actual.Name); CollectionAssert.AreEqual(expectedCoordinatesX, actual.Points.Select(p => p.X).ToArray()); - CollectionAssert.AreEqual(Enumerable.Repeat(0, surfaceLine.Points.Count()).ToArray(), actual.Points.Select(p => p.Y).ToArray()); + CollectionAssert.AreEqual(Enumerable.Repeat(0, surfaceLine.Points.Length).ToArray(), actual.Points.Select(p => p.Y).ToArray()); CollectionAssert.AreEqual(surfaceLine.Points.Select(p => p.Z).ToArray(), actual.Points.Select(p => p.Z).ToArray()); - CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Count()), actual.Points.Select(p => p.Type)); + CollectionAssert.AreEqual(Enumerable.Repeat(PipingCharacteristicPointType.None, surfaceLine.Points.Length), actual.Points.Select(p => p.Type)); } [Test] @@ -156,10 +156,10 @@ { Name = name }; - var point = new Point3D (1.0, 1.0, 2.2); + var point = new Point3D(1.0, 1.0, 2.2); surfaceLine.SetGeometry(new[] { - point, + point }); surfaceLine.SetDikeToeAtPolderAt(point); @@ -184,7 +184,7 @@ var point = new Point3D(1.0, 1.0, 2.2); surfaceLine.SetGeometry(new[] { - point, + point }); surfaceLine.SetDitchDikeSideAt(point); @@ -209,7 +209,7 @@ var point = new Point3D(1.0, 1.0, 2.2); surfaceLine.SetGeometry(new[] { - point, + point }); surfaceLine.SetBottomDitchDikeSideAt(point); @@ -234,7 +234,7 @@ var point = new Point3D(1.0, 1.0, 2.2); surfaceLine.SetGeometry(new[] { - point, + point }); surfaceLine.SetBottomDitchPolderSideAt(point); @@ -259,7 +259,7 @@ var point = new Point3D(1.0, 1.0, 2.2); surfaceLine.SetGeometry(new[] { - point, + point }); surfaceLine.SetDitchPolderSideAt(point); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/HeaveCalculatorTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/HeaveCalculatorTest.cs (.../HeaveCalculatorTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/HeaveCalculatorTest.cs (.../HeaveCalculatorTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -15,6 +15,7 @@ // Assert Assert.IsInstanceOf(calculator); Assert.AreEqual(0.0, calculator.Zh); + Assert.AreEqual(0.0, calculator.FoSh); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/SellmeijerCalculatorTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/SellmeijerCalculatorTest.cs (.../SellmeijerCalculatorTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/SellmeijerCalculatorTest.cs (.../SellmeijerCalculatorTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -15,6 +15,7 @@ // Assert Assert.IsInstanceOf(calculator); Assert.AreEqual(0.0, calculator.Zp); + Assert.AreEqual(0.0, calculator.FoSp); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/UpliftCalculatorTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/UpliftCalculatorTest.cs (.../UpliftCalculatorTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/SubCalculator/UpliftCalculatorTest.cs (.../UpliftCalculatorTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -15,6 +15,7 @@ // Assert Assert.IsInstanceOf(calculator); Assert.AreEqual(double.NaN, calculator.Zu); - } + Assert.AreEqual(double.NaN, calculator.FoSu); + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/EffectiveThicknessCalculatorStubTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/EffectiveThicknessCalculatorStubTest.cs (.../EffectiveThicknessCalculatorStubTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/EffectiveThicknessCalculatorStubTest.cs (.../EffectiveThicknessCalculatorStubTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -6,7 +6,6 @@ [TestFixture] public class EffectiveThicknessCalculatorStubTest { - [Test] public void DefaultConstructor_PropertiesSet() { @@ -19,7 +18,7 @@ Assert.IsNull(stub.SoilProfile); Assert.IsNull(stub.SurfaceLine); Assert.AreEqual(0, stub.VolumicWeightOfWater); - + Assert.AreEqual(0, stub.EffectiveHeight); Assert.AreEqual(0, stub.EffectiveStress); } @@ -35,6 +34,6 @@ // Assert Assert.DoesNotThrow(call); - } + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/HeaveCalculatorStubTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/HeaveCalculatorStubTest.cs (.../HeaveCalculatorStubTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/HeaveCalculatorStubTest.cs (.../HeaveCalculatorStubTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -48,6 +48,6 @@ // Assert Assert.DoesNotThrow(call); - } + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/SellmeijerCalculatorStubTest.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/SellmeijerCalculatorStubTest.cs (.../SellmeijerCalculatorStubTest.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil.Test/SubCalculator/SellmeijerCalculatorStubTest.cs (.../SellmeijerCalculatorStubTest.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -59,6 +59,6 @@ // Assert Assert.DoesNotThrow(call); - } + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -66,10 +66,6 @@ {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base - - {70F8CC9C-5BC8-4FB2-B201-EAE7FA8088C2} - Ringtoets.HydraRing.Data - {ce994cc9-6f6a-48ac-b4be-02c30a21f4db} Ringtoets.Piping.Data Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs (.../EffectiveThicknessCalculatorStub.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/EffectiveThicknessCalculatorStub.cs (.../EffectiveThicknessCalculatorStub.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -3,16 +3,19 @@ namespace Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator { - public class EffectiveThicknessCalculatorStub : IEffectiveThicknessCalculator { + /// + /// Stub for the real effective thickness sub calculator of piping. + /// + public class EffectiveThicknessCalculatorStub : IEffectiveThicknessCalculator + { public double ExitPointXCoordinate { get; set; } public double PhreaticLevel { get; set; } public double VolumicWeightOfWater { get; set; } public PipingProfile SoilProfile { get; set; } public PipingSurfaceLine SurfaceLine { get; set; } public double EffectiveHeight { get; private set; } public double EffectiveStress { get; private set; } - public void Calculate() - { - } + + public void Calculate() {} } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs (.../HeaveCalculatorStub.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/HeaveCalculatorStub.cs (.../HeaveCalculatorStub.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -6,7 +6,8 @@ /// /// Stub for the real heave sub calculator of piping. /// - public class HeaveCalculatorStub : IHeaveCalculator { + public class HeaveCalculatorStub : IHeaveCalculator + { public double DTotal { get; set; } public double HExit { get; set; } public double Ich { get; set; } @@ -15,10 +16,9 @@ public double RExit { get; set; } public double Zh { get; private set; } public double FoSh { get; private set; } - public void Calculate() - { - } + public void Calculate() {} + public List Validate() { return new List(); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs (.../PiezoHeadCalculatorStub.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs (.../PiezoHeadCalculatorStub.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -5,13 +5,13 @@ /// /// Stub for the real piezometric head at exit sub calculator of piping. /// - public class PiezoHeadCalculatorStub : IPiezoHeadCalculator { + public class PiezoHeadCalculatorStub : IPiezoHeadCalculator + { public double PhiPolder { get; set; } public double RExit { get; set; } public double HRiver { get; set; } public double PhiExit { get; private set; } - public void Calculate() - { - } + + public void Calculate() {} } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs (.../SellmeijerCalculatorStub.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/SellmeijerCalculatorStub.cs (.../SellmeijerCalculatorStub.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -6,7 +6,8 @@ /// /// Stub for the real Sellmeijer sub calculator of piping. /// - public class SellmeijerCalculatorStub : ISellmeijerCalculator { + public class SellmeijerCalculatorStub : ISellmeijerCalculator + { public double BeddingAngle { get; set; } public double D70 { get; set; } public double D70Mean { get; set; } @@ -25,10 +26,9 @@ public double WhitesDragCoefficient { get; set; } public double Zp { get; private set; } public double FoSp { get; private set; } - public void Calculate() - { - } + public void Calculate() {} + public List Validate() { return new List(); Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/TestPipingSubCalculatorFactory.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/TestPipingSubCalculatorFactory.cs (.../TestPipingSubCalculatorFactory.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/TestPipingSubCalculatorFactory.cs (.../TestPipingSubCalculatorFactory.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -8,6 +8,12 @@ /// public class TestPipingSubCalculatorFactory : IPipingSubCalculatorFactory { + public EffectiveThicknessCalculatorStub LastCreatedEffectiveThicknessCalculator { get; private set; } + public UpliftCalculatorStub LastCreatedUpliftCalculator { get; private set; } + public SellmeijerCalculatorStub LastCreatedSellmeijerCalculator { get; private set; } + public HeaveCalculatorStub LastCreatedHeaveCalculator { get; private set; } + public PiezoHeadCalculatorStub LastCreatedPiezometricHeadAtExitCalculator { get; private set; } + public IUpliftCalculator CreateUpliftCalculator() { LastCreatedUpliftCalculator = new UpliftCalculatorStub(); @@ -37,11 +43,5 @@ LastCreatedPiezometricHeadAtExitCalculator = new PiezoHeadCalculatorStub(); return LastCreatedPiezometricHeadAtExitCalculator; } - - public EffectiveThicknessCalculatorStub LastCreatedEffectiveThicknessCalculator { get; private set; } - public UpliftCalculatorStub LastCreatedUpliftCalculator { get; private set; } - public SellmeijerCalculatorStub LastCreatedSellmeijerCalculator { get; private set; } - public HeaveCalculatorStub LastCreatedHeaveCalculator { get; private set; } - public PiezoHeadCalculatorStub LastCreatedPiezometricHeadAtExitCalculator { get; private set; } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs (.../UpliftCalculatorStub.cs) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/UpliftCalculatorStub.cs (.../UpliftCalculatorStub.cs) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -6,7 +6,8 @@ /// /// Stub for the real uplift sub calculator of piping. /// - public class UpliftCalculatorStub : IUpliftCalculator { + public class UpliftCalculatorStub : IUpliftCalculator + { public double EffectiveStress { get; set; } public double HExit { get; set; } public double HRiver { get; set; } @@ -17,10 +18,9 @@ public double VolumetricWeightOfWater { get; set; } public double Zu { get; private set; } public double FoSu { get; private set; } - public void Calculate() - { - } + public void Calculate() {} + public List Validate() { return new List(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj =================================================================== diff -u -rc2fe76d04e1517a4e0aaf62184bccd413de0e472 -r89488cc05b12fd5720cd28a4eeeb001dc9b1456d --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision c2fe76d04e1517a4e0aaf62184bccd413de0e472) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/Ringtoets.Piping.Service.Test.csproj (.../Ringtoets.Piping.Service.Test.csproj) (revision 89488cc05b12fd5720cd28a4eeeb001dc9b1456d) @@ -69,10 +69,6 @@ {3bbfd65b-b277-4e50-ae6d-bd24c3434609} Core.Common.Base - - {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} - Core.Common.Utils - {D749EE4C-CE50-4C17-BF01-9A953028C126} Core.Common.TestUtil