Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2AAssessmentResultExtensions.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2AAssessmentResultExtensions.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2AAssessmentResultExtensions.cs (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -0,0 +1,125 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using System.ComponentModel; +using System.Linq; +using Core.Common.Base.Data; +using Core.Common.Base.Geometry; +using Ringtoets.Common.Data.Calculation; + +namespace Ringtoets.Piping.Data +{ + /// + /// Extension methods for obtaining level 2a results from output for an assessment of the piping failure mechanism. + /// + public static class PipingFailureMechanismSection2AAssessmentResultExtensions + { + /// + /// Gets the value for the detailed assessment of safety per failure mechanism section as a probability. + /// + /// The result to get the result for. + /// All calculations in the failure mechanism. + public static double GetAssessmentLayerTwoA(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, + IEnumerable calculations) + { + List calculationScenarios = pipingFailureMechanismSectionResult + .GetCalculationScenarios(calculations) + .Where(cs => cs.Status == CalculationScenarioStatus.Done) + .ToList(); + + return calculationScenarios.Any() + ? calculationScenarios.Sum(scenario => scenario.Probability * scenario.Contribution.Value) + : double.NaN; + } + + /// + /// Gets the contribution of all relevant together. + /// + /// The result to get the result for. + /// All calculations in the failure mechanism. + public static RoundedDouble GetTotalContribution(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, + IEnumerable calculations) + { + return (RoundedDouble) pipingFailureMechanismSectionResult + .GetCalculationScenarios(calculations) + .Aggregate(0, (current, calculationScenario) => current + calculationScenario.Contribution); + } + + /// + /// Gets a list of the relevant . + /// + /// The result to get the result for. + /// All calculations in the failure mechanism. + public static IEnumerable GetCalculationScenarios(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, + IEnumerable calculations) + { + IEnumerable lineSegments = Math2D.ConvertLinePointsToLineSegments(pipingFailureMechanismSectionResult.Section.Points); + + return calculations + .Where(pc => pc.IsRelevant && pc.IsSurfaceLineIntersectionWithReferenceLineInSection(lineSegments)); + } + + /// + /// Gets the status of the section result depending on the relevant calculation scenarios. + /// + /// The result to get the result for. + /// All calculations in the failure mechanism. + /// Thrown when any of the relevant calculations + /// in has an invalid . + public static CalculationScenarioStatus GetCalculationScenarioStatus(this PipingFailureMechanismSectionResult pipingFailureMechanismSectionResult, + IEnumerable calculations) + { + var failed = false; + var notCalculated = false; + foreach (PipingCalculationScenario calculationScenario in pipingFailureMechanismSectionResult.GetCalculationScenarios(calculations).Where(cs => cs.IsRelevant)) + { + switch (calculationScenario.Status) + { + case CalculationScenarioStatus.Failed: + failed = true; + break; + case CalculationScenarioStatus.NotCalculated: + notCalculated = true; + break; + case CalculationScenarioStatus.Done: + continue; + default: + throw new InvalidEnumArgumentException(nameof(pipingFailureMechanismSectionResult), + (int) calculationScenario.Status, + typeof(CalculationScenarioStatus)); + } + } + + if (failed) + { + return CalculationScenarioStatus.Failed; + } + + if (notCalculated) + { + return CalculationScenarioStatus.NotCalculated; + } + + return CalculationScenarioStatus.Done; + } + } +} \ No newline at end of file Fisheye: Tag db77ae03f93f27b25268dd9f62f0091a47fe22d8 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs (.../PipingProbabilityAssessmentInput.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs (.../PipingProbabilityAssessmentInput.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -72,7 +72,7 @@ /// Gets 'b' parameter used to factor in the 'length effect' when determining the /// maximum tolerated probability of failure. /// - public double B { get; private set; } + public double B { get; } /// /// Gets or sets the length of the assessment section. Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -44,7 +44,7 @@ - + Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs (.../PipingContext.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingContext.cs (.../PipingContext.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -26,6 +26,7 @@ using Core.Common.Controls.PresentationObjects; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.IO.SoilProfile; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.SoilProfile; using Ringtoets.Piping.Primitives; @@ -66,13 +67,13 @@ /// Gets the available piping surface lines in order for the user to select one to /// set . /// - public IEnumerable AvailablePipingSurfaceLines { get; private set; } + public IEnumerable AvailablePipingSurfaceLines { get; } /// /// Gets the available stochastic soil models in order for the user to select a and /// to set and . /// - public IEnumerable AvailableStochasticSoilModels { get; private set; } + public IEnumerable AvailableStochasticSoilModels { get; } /// /// Gets the available hydraulic boundary locations in order for the user to select one to Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs (.../PipingInputContext.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingInputContext.cs (.../PipingInputContext.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -64,6 +64,6 @@ /// /// Gets the calculation scenario which the piping context belongs to. /// - public PipingCalculationScenario PipingCalculation { get; private set; } + public PipingCalculationScenario PipingCalculation { get; } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -49,6 +49,6 @@ /// /// Gets the semi-probabilistic output created from the piping output. /// - public PipingSemiProbabilisticOutput SemiProbabilisticOutput { get; private set; } + public PipingSemiProbabilisticOutput SemiProbabilisticOutput { get; } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingScenariosContext.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingScenariosContext.cs (.../PipingScenariosContext.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingScenariosContext.cs (.../PipingScenariosContext.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -47,6 +47,6 @@ ParentFailureMechanism = failureMechanism; } - public PipingFailureMechanism ParentFailureMechanism { get; private set; } + public PipingFailureMechanism ParentFailureMechanism { get; } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs (.../LogNormalDistributionDesignVariableProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/LogNormalDistributionDesignVariableProperties.cs (.../LogNormalDistributionDesignVariableProperties.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -29,7 +29,7 @@ namespace Ringtoets.Piping.Forms.PropertyClasses { /// - /// ViewModel of of for properties panel. + /// ViewModel of of for properties panel. /// public class LogNormalDistributionDesignVariableProperties : DesignVariableProperties { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs (.../NormalDistributionDesignVariableProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/NormalDistributionDesignVariableProperties.cs (.../NormalDistributionDesignVariableProperties.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -29,7 +29,7 @@ namespace Ringtoets.Piping.Forms.PropertyClasses { /// - /// ViewModel of of for properties panel. + /// ViewModel of of for properties panel. /// public class NormalDistributionDesignVariableProperties : DesignVariableProperties { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs (.../ShiftedLogNormalDistributionDesignVariableProperties.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/ShiftedLogNormalDistributionDesignVariableProperties.cs (.../ShiftedLogNormalDistributionDesignVariableProperties.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -31,7 +31,7 @@ namespace Ringtoets.Piping.Forms.PropertyClasses { /// - /// ViewModel of of + /// ViewModel of of /// including the shift for properties panel. /// public class ShiftedLogNormalDistributionDesignVariableProperties : LogNormalDistributionDesignVariableProperties Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -178,6 +178,10 @@ Ringtoets.Common.Forms False + + {52BA7627-CBAB-4209-BE77-3B5F31378277} + Ringtoets.Common.IO + {14C6F716-64E2-4BC4-A1EF-05865FCEFA4C} Ringtoets.Piping.Primitives Fisheye: Tag db77ae03f93f27b25268dd9f62f0091a47fe22d8 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.IO/Exceptions/SoilProfileBuilderException.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj (.../Ringtoets.Piping.IO.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Ringtoets.Piping.IO.csproj (.../Ringtoets.Piping.IO.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -34,7 +34,6 @@ Properties\GlobalAssembly.cs - @@ -97,7 +96,6 @@ C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.dll - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.0\System.XML.dll Fisheye: Tag db77ae03f93f27b25268dd9f62f0091a47fe22d8 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Creators/PipingProfileCreatorException.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs =================================================================== diff -u -r0ecc2eb11789b230484e87fd6109bc61dc8d9b2d -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs (.../PipingSurfaceLineCreator.cs) (revision 0ecc2eb11789b230484e87fd6109bc61dc8d9b2d) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs (.../PipingSurfaceLineCreator.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -23,7 +23,6 @@ using System.Linq; using Core.Common.Base.Geometry; using Deltares.WTIPiping; -using PipingSurfaceLine = Ringtoets.Piping.Primitives.PipingSurfaceLine; namespace Ringtoets.Piping.KernelWrapper.Creators { @@ -38,9 +37,9 @@ /// /// The surface line configured in the Ringtoets application. /// The surface line to be consumed by the kernel. - public static Deltares.WTIPiping.PipingSurfaceLine Create(PipingSurfaceLine line) + public static PipingSurfaceLine Create(Primitives.PipingSurfaceLine line) { - var surfaceLine = new Deltares.WTIPiping.PipingSurfaceLine + var surfaceLine = new PipingSurfaceLine { Name = line.Name }; @@ -52,7 +51,7 @@ return surfaceLine; } - private static IEnumerable CreatePoints(PipingSurfaceLine line) + private static IEnumerable CreatePoints(Primitives.PipingSurfaceLine line) { Point2D[] projectedPoints = line.LocalGeometry.ToArray(); var pipingPoints = new List(); @@ -65,7 +64,7 @@ return pipingPoints; } - private static IEnumerable CreatePoint(PipingSurfaceLine line, Point2D[] projectedPoints, int index) + private static IEnumerable CreatePoint(Primitives.PipingSurfaceLine line, Point2D[] projectedPoints, int index) { Point3D surfaceLinePoint = line.Points[index]; Point2D projectedPoint = projectedPoints[index]; Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs =================================================================== diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs (.../PipingCalculatorInput.cs) (revision 01bd90d4fab9699280c5619754fc55b4f03be08a) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs (.../PipingCalculatorInput.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -69,151 +69,6 @@ SoilProfile = properties.SoilProfile; } - #region Properties - - /// - /// Gets the volumetric weight of water. - /// [kN/m³] - /// - public double WaterVolumetricWeight { get; private set; } - - /// - /// Gets the calculation value used to account for uncertainty in the model for uplift. - /// - public double UpliftModelFactor { get; private set; } - - /// - /// Gets the outside high water level. - /// [m] - /// - public double AssessmentLevel { get; private set; } - - /// - /// Gets the piezometric head at the exit point. - /// [m] - /// - public double PiezometricHeadExit { get; private set; } - - /// - /// Gets the damping factor at the exit point. - /// - public double DampingFactorExit { get; private set; } - - /// - /// Gets the phreatic level at the exit point. - /// [m] - /// - public double PhreaticLevelExit { get; private set; } - - /// - /// Gets the critical exit gradient for heave. - /// - public double CriticalHeaveGradient { get; private set; } - - /// - /// Gets the total thickness of the coverage layer at the exit point. - /// [m] - /// - public double ThicknessCoverageLayer { get; private set; } - - /// - /// Gets the effective thickness of the coverage layer at the exit point. - /// [m] - /// - public double EffectiveThicknessCoverageLayer { get; private set; } - - /// - /// Gets the calculation value used to account for uncertainty in the model for Sellmeijer. - /// - public double SellmeijerModelFactor { get; private set; } - - /// - /// Gets the reduction factor Sellmeijer. - /// - public double SellmeijerReductionFactor { get; private set; } - - /// - /// Gets the horizontal distance between entry and exit point. - /// [m] - /// - public double SeepageLength { get; private set; } - - /// - /// Gets the (lowerbound) volumic weight of sand grain material of a sand layer under water. - /// [kN/m³] - /// - public double SandParticlesVolumicWeight { get; private set; } - - /// - /// Gets the White's drag coefficient. - /// - public double WhitesDragCoefficient { get; private set; } - - /// - /// Gets the sieve size through which 70% of the grains of the top part of the aquifer pass. - /// [m] - /// - public double Diameter70 { get; private set; } - - /// - /// Gets the Darcy-speed with which water flows through the aquifer layer. - /// [m/s] - /// - public double DarcyPermeability { get; private set; } - - /// - /// Gets the kinematic viscosity of water at 10 °C. - /// [m²/s] - /// - public double WaterKinematicViscosity { get; private set; } - - /// - /// Gets the gravitational acceleration. - /// [m/s²] - /// - public double Gravity { get; private set; } - - /// - /// Gets the thickness of the aquifer layer. - /// [m] - /// - public double ThicknessAquiferLayer { get; private set; } - - /// - /// Gets the mean diameter of small scale tests applied to different kinds of sand, on which the formula of Sellmeijer has been fit. - /// [m] - /// - public double MeanDiameter70 { get; private set; } - - /// - /// Gets the angle of the force balance representing the amount in which sand grains resist rolling. - /// [°] - /// - public double BeddingAngle { get; private set; } - - /// - /// Gets the X-coordinate of the exit point. - /// [m] - /// - public double ExitPointXCoordinate { get; private set; } - - /// - /// Gets the surface line. - /// - public PipingSurfaceLine SurfaceLine { get; private set; } - - /// - /// Gets the profile which contains a 1 dimensional definition of soil layers with properties. - /// - public PipingSoilProfile SoilProfile { get; private set; } - - /// - /// Gets the volumic weight of the coverage layer when saturated. - /// - public double SaturatedVolumicWeightOfCoverageLayer { get; private set; } - - #endregion - public class ConstructionProperties { /// @@ -393,5 +248,150 @@ #endregion } + + #region Properties + + /// + /// Gets the volumetric weight of water. + /// [kN/m³] + /// + public double WaterVolumetricWeight { get; } + + /// + /// Gets the calculation value used to account for uncertainty in the model for uplift. + /// + public double UpliftModelFactor { get; } + + /// + /// Gets the outside high water level. + /// [m] + /// + public double AssessmentLevel { get; } + + /// + /// Gets the piezometric head at the exit point. + /// [m] + /// + public double PiezometricHeadExit { get; } + + /// + /// Gets the damping factor at the exit point. + /// + public double DampingFactorExit { get; } + + /// + /// Gets the phreatic level at the exit point. + /// [m] + /// + public double PhreaticLevelExit { get; } + + /// + /// Gets the critical exit gradient for heave. + /// + public double CriticalHeaveGradient { get; } + + /// + /// Gets the total thickness of the coverage layer at the exit point. + /// [m] + /// + public double ThicknessCoverageLayer { get; } + + /// + /// Gets the effective thickness of the coverage layer at the exit point. + /// [m] + /// + public double EffectiveThicknessCoverageLayer { get; } + + /// + /// Gets the calculation value used to account for uncertainty in the model for Sellmeijer. + /// + public double SellmeijerModelFactor { get; } + + /// + /// Gets the reduction factor Sellmeijer. + /// + public double SellmeijerReductionFactor { get; } + + /// + /// Gets the horizontal distance between entry and exit point. + /// [m] + /// + public double SeepageLength { get; } + + /// + /// Gets the (lowerbound) volumic weight of sand grain material of a sand layer under water. + /// [kN/m³] + /// + public double SandParticlesVolumicWeight { get; } + + /// + /// Gets the White's drag coefficient. + /// + public double WhitesDragCoefficient { get; } + + /// + /// Gets the sieve size through which 70% of the grains of the top part of the aquifer pass. + /// [m] + /// + public double Diameter70 { get; } + + /// + /// Gets the Darcy-speed with which water flows through the aquifer layer. + /// [m/s] + /// + public double DarcyPermeability { get; } + + /// + /// Gets the kinematic viscosity of water at 10 °C. + /// [m²/s] + /// + public double WaterKinematicViscosity { get; } + + /// + /// Gets the gravitational acceleration. + /// [m/s²] + /// + public double Gravity { get; } + + /// + /// Gets the thickness of the aquifer layer. + /// [m] + /// + public double ThicknessAquiferLayer { get; } + + /// + /// Gets the mean diameter of small scale tests applied to different kinds of sand, on which the formula of Sellmeijer has been fit. + /// [m] + /// + public double MeanDiameter70 { get; } + + /// + /// Gets the angle of the force balance representing the amount in which sand grains resist rolling. + /// [°] + /// + public double BeddingAngle { get; } + + /// + /// Gets the X-coordinate of the exit point. + /// [m] + /// + public double ExitPointXCoordinate { get; } + + /// + /// Gets the surface line. + /// + public PipingSurfaceLine SurfaceLine { get; } + + /// + /// Gets the profile which contains a 1 dimensional definition of soil layers with properties. + /// + public PipingSoilProfile SoilProfile { get; } + + /// + /// Gets the volumic weight of the coverage layer when saturated. + /// + public double SaturatedVolumicWeightOfCoverageLayer { get; } + + #endregion } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorResult.cs =================================================================== diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorResult.cs (.../PipingCalculatorResult.cs) (revision 01bd90d4fab9699280c5619754fc55b4f03be08a) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorResult.cs (.../PipingCalculatorResult.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -138,57 +138,57 @@ /// /// Gets the z-value of the Uplift sub calculation. /// - public double UpliftZValue { get; private set; } + public double UpliftZValue { get; } /// /// Gets the factor of safety of the Uplift sub calculation. /// - public double UpliftFactorOfSafety { get; private set; } + public double UpliftFactorOfSafety { get; } /// /// Gets the z-value of the Heave sub calculation. /// - public double HeaveZValue { get; private set; } + public double HeaveZValue { get; } /// /// Gets the factor of safety of the Heave sub calculation. /// - public double HeaveFactorOfSafety { get; private set; } + public double HeaveFactorOfSafety { get; } /// /// Gets the z-value of the Sellmeijer sub calculation. /// - public double SellmeijerZValue { get; private set; } + public double SellmeijerZValue { get; } /// /// Gets the factor of safety of the Sellmeijer sub calculation. /// - public double SellmeijerFactorOfSafety { get; private set; } + public double SellmeijerFactorOfSafety { get; } /// /// Gets the effective stress that was calculated for the uplift sub calculation. /// - public double UpliftEffectiveStress { get; private set; } + public double UpliftEffectiveStress { get; } /// /// Gets the gradient that was calculated for the heave sub calculation. /// - public double HeaveGradient { get; private set; } + public double HeaveGradient { get; } /// /// Gets the creep coefficient that was calculated for the Sellmeijer sub calculation. /// - public double SellmeijerCreepCoefficient { get; private set; } + public double SellmeijerCreepCoefficient { get; } /// /// Gets the critical fall that was calculated for the Sellmeijer sub calculation. /// - public double SellmeijerCriticalFall { get; private set; } + public double SellmeijerCriticalFall { get; } /// /// Gets the reduced fall that was calculated for the Sellmeijer sub calculation. /// - public double SellmeijerReducedFall { get; private set; } + public double SellmeijerReducedFall { get; } #endregion } Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj (.../Ringtoets.Piping.KernelWrapper.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Ringtoets.Piping.KernelWrapper.csproj (.../Ringtoets.Piping.KernelWrapper.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -47,7 +47,6 @@ - Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingDataSynchronizationService.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingDataSynchronizationService.cs (.../PipingDataSynchronizationService.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingDataSynchronizationService.cs (.../PipingDataSynchronizationService.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -26,6 +26,7 @@ using Core.Common.Base; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.IO.SoilProfile; using Ringtoets.Common.Service; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.SoilProfile; Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs =================================================================== diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision 01bd90d4fab9699280c5619754fc55b4f03be08a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -43,22 +43,22 @@ private readonly double contribution; // Intermediate results + private double heaveProbability; private double heaveReliability; - private double upliftReliability; - private double sellmeijerReliability; - private double heaveProbability; private double upliftProbability; + private double upliftReliability; + private double sellmeijerProbability; + private double sellmeijerReliability; private double pipingProbability; private double pipingReliability; + private double pipingFactorOfSafety; private double requiredProbability; private double requiredReliability; - private double pipingFactorOfSafety; - /// /// Creates a new instance of . /// Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj (.../Ringtoets.Piping.Service.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/Ringtoets.Piping.Service.csproj (.../Ringtoets.Piping.Service.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -71,6 +71,10 @@ Ringtoets.Common.Forms False + + {52BA7627-CBAB-4209-BE77-3B5F31378277} + Ringtoets.Common.IO + {D951D6DA-FE83-4920-9FDB-63BF96480B54} Ringtoets.Common.Service Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -ra7250eadfcaa33555a923aac13f3ac00c0a12e1f -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision a7250eadfcaa33555a923aac13f3ac00c0a12e1f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -26,7 +26,6 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Piping.Data.TestUtil; -using Ringtoets.Piping.KernelWrapper.TestUtil; namespace Ringtoets.Piping.Data.Test { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs =================================================================== diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision 07f3d67fe9512b3c8303ff09398b0a234900d546) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -26,7 +26,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data.Calculation; using Ringtoets.Piping.Data.TestUtil; -using Ringtoets.Piping.KernelWrapper.TestUtil; namespace Ringtoets.Piping.Data.Test { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2AAssessmentResultExtensionsTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2AAssessmentResultExtensionsTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2AAssessmentResultExtensionsTest.cs (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -0,0 +1,282 @@ +// Copyright (C) Stichting Deltares 2017. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Linq; +using Core.Common.Base.Data; +using NUnit.Framework; +using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Piping.Data.TestUtil; + +namespace Ringtoets.Piping.Data.Test +{ + [TestFixture] + public class PipingFailureMechanismSection2AAssessmentResultExtensionsTest + { + [Test] + public void GetAssessmentLayerTwoA_MultipleScenarios_ReturnsValueBasedOnRelevantAndDoneScenarios() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + const double contribution1 = 0.2; + const double contribution2 = 0.8; + const double probability1 = 1.0 / 1000000.0; + const double probability2 = 1.0 / 2000000.0; + + PipingCalculationScenario pipingCalculationScenario1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability1, section); + PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(probability2, section); + PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.0, section); + PipingCalculationScenario pipingCalculationScenario4 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); + + pipingCalculationScenario1.IsRelevant = true; + pipingCalculationScenario1.Contribution = (RoundedDouble) contribution1; + + pipingCalculationScenario2.IsRelevant = true; + pipingCalculationScenario2.Contribution = (RoundedDouble) contribution2; + + pipingCalculationScenario3.IsRelevant = false; + + pipingCalculationScenario4.IsRelevant = true; + + var calculations = new[] + { + pipingCalculationScenario1, + pipingCalculationScenario2, + pipingCalculationScenario3, + pipingCalculationScenario4 + }; + + // Call + double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(calculations); + + // Assert + const double expectedProbability = probability1 * contribution1 + probability2 * contribution2; + Assert.AreEqual(expectedProbability, assessmentLayerTwoA, 1e-8); + } + + [Test] + public void GetAssessmentLayerTwoA_ScenarioInvalidOutput_ReturnsZero() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); + pipingCalculationScenario.Contribution = (RoundedDouble) 1.0; + + // Call + double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] + { + pipingCalculationScenario + }); + + // Assert + Assert.IsNaN(assessmentLayerTwoA); + } + + [Test] + public void GetAssessmentLayerTwoA_NoScenarios_ReturnsZero() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + // Call + double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(Enumerable.Empty()); + + // Assert + Assert.IsNaN(assessmentLayerTwoA); + } + + [Test] + public void GetAssessmentLayerTwoA_NoRelevantScenarios_ReturnsZero() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario calculationScenario1 = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); + PipingCalculationScenario calculationScenario2 = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); + + var calculationScenarios = new[] + { + calculationScenario1, + calculationScenario2 + }; + + // Call + double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(calculationScenarios); + + // Assert + Assert.IsNaN(assessmentLayerTwoA); + } + + [Test] + public void GetAssessmentLayerTwoA_ScenarioNotCalculated_ReturnsZero() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + + // Call + double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] + { + pipingCalculationScenario + }); + + // Assert + Assert.IsNaN(assessmentLayerTwoA); + } + + [Test] + public void GetTotalContribution_Always_ReturnsTotalRelevantScenarioContribution() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); + pipingCalculationScenario.Contribution = (RoundedDouble) 0.3; + + PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); + pipingCalculationScenario2.Contribution = (RoundedDouble) 0.5; + + PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); + + var calculationScenarios = new[] + { + pipingCalculationScenario, + pipingCalculationScenario2, + pipingCalculationScenario3 + }; + + // Call + RoundedDouble totalContribution = failureMechanismSectionResult.GetTotalContribution(calculationScenarios); + + // Assert + Assert.AreEqual((RoundedDouble) 0.8, totalContribution); + } + + [Test] + public void GetCalculationScenarioStatus_ScenarioNotCalculated_ReturnsStatusNotCalculated() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + + // Call + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] + { + pipingCalculationScenario + }); + + // Assert + Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status); + } + + [Test] + public void GetCalculationScenarioStatus_ScenarioInvalidOutput_ReturnsStatusFailed() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); + pipingCalculationScenario.Contribution = (RoundedDouble) 1.0; + + // Call + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] + { + pipingCalculationScenario + }); + + // Assert + Assert.AreEqual(CalculationScenarioStatus.Failed, status); + } + + [Test] + public void GetCalculationScenarioStatus_ScenarioInvalidOutputAndNotCalculated_ReturnsStatusFailed() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + pipingCalculationScenario.IsRelevant = true; + + PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateFailedPipingCalculationScenario(section); + pipingCalculationScenario2.Contribution = (RoundedDouble) 1.0; + + var calculationScenarios = new[] + { + pipingCalculationScenario, + pipingCalculationScenario2 + }; + + // Call + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(calculationScenarios); + + // Assert + Assert.AreEqual(CalculationScenarioStatus.Failed, status); + } + + [Test] + public void GetCalculationScenarioStatus_ScenariosCalculated_ReturnsStatusDone() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(0.1, section); + pipingCalculationScenario.Contribution = (RoundedDouble) 1.0; + + // Call + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] + { + pipingCalculationScenario + }); + + // Assert + Assert.AreEqual(CalculationScenarioStatus.Done, status); + } + + [Test] + public void GetCalculationScenarioStatus_NoScenarios_ReturnsStatusDone() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + // Call + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(Enumerable.Empty()); + + // Assert + Assert.AreEqual(CalculationScenarioStatus.Done, status); + } + } +} \ No newline at end of file Fisheye: Tag db77ae03f93f27b25268dd9f62f0091a47fe22d8 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj (.../Ringtoets.Piping.Data.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj (.../Ringtoets.Piping.Data.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -59,7 +59,7 @@ - + Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs (.../PipingCalculationScenarioFactory.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs (.../PipingCalculationScenarioFactory.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -27,7 +27,6 @@ using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Piping.Data.SoilProfile; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Data.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs =================================================================== diff -u -rd6fe8399e8398224cf1bda9259052232d85b85a4 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs (.../PipingTestDataGeneratorHelper.cs) (revision d6fe8399e8398224cf1bda9259052232d85b85a4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGeneratorHelper.cs (.../PipingTestDataGeneratorHelper.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -23,6 +23,7 @@ using System.Linq; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.IO.SoilProfile; using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.Data.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj (.../Ringtoets.Piping.Data.TestUtil.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj (.../Ringtoets.Piping.Data.TestUtil.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -81,6 +81,10 @@ Ringtoets.Common.Data True + + {52BA7627-CBAB-4209-BE77-3B5F31378277} + Ringtoets.Common.IO + {4843D6E5-066F-4795-94F5-1D53932DD03C} Ringtoets.Common.Data.TestUtil @@ -93,10 +97,6 @@ {14C6F716-64E2-4BC4-A1EF-05865FCEFA4C} Ringtoets.Piping.Primitives - - {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} - Ringtoets.Piping.KernelWrapper.TestUtil - {6F568E38-592A-4F99-A901-86B74C4F24D2} Ringtoets.Piping.Primitives.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -r5e5695f9f466a0ab54a59b61879f5d7a66e6ffb1 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 5e5695f9f466a0ab54a59b61879f5d7a66e6ffb1) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -507,8 +507,7 @@ // Assert Tuple expectedMessage = Tuple.Create( - string.Format("Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen.", - testName), + $"Geen ondergrondschematisaties gevonden voor profielschematisatie '{testName}'. De profielschematisatie is overgeslagen.", LogLevelConstant.Warn); TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage); CollectionAssert.IsEmpty(result); @@ -791,9 +790,7 @@ // Assert Tuple expectedMessage = Tuple.Create( - string.Format( - "Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen.", - surfaceLineName2), + $"Geen ondergrondschematisaties gevonden voor profielschematisatie '{surfaceLineName2}'. De profielschematisatie is overgeslagen.", LogLevelConstant.Warn); TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedMessage, 1); @@ -875,8 +872,8 @@ var calculationInput1 = (PipingCalculationScenario) group.Children[0]; var calculationInput2 = (PipingCalculationScenario) group.Children[1]; - Assert.AreEqual(string.Format("{0} {1}", surfaceLine.Name, soilProfile1.Name), calculationInput1.Name); - Assert.AreEqual(string.Format("{0} {1}", surfaceLine.Name, soilProfile2.Name), calculationInput2.Name); + Assert.AreEqual($"{surfaceLine.Name} {soilProfile1.Name}", calculationInput1.Name); + Assert.AreEqual($"{surfaceLine.Name} {soilProfile2.Name}", calculationInput2.Name); CompareGeneralInputToInput(generalInput, calculationInput1); CompareGeneralInputToInput(generalInput, calculationInput2); @@ -947,9 +944,9 @@ var calculationInput2 = (PipingCalculationScenario) group.Children[1]; var calculationInput3 = (PipingCalculationScenario) group.Children[2]; - Assert.AreEqual(string.Format("{0} {1}", surfaceLine.Name, soilProfile1.Name), calculationInput1.Name); - Assert.AreEqual(string.Format("{0} {1} (1)", surfaceLine.Name, soilProfile2.Name), calculationInput2.Name); - Assert.AreEqual(string.Format("{0} {1} (2)", surfaceLine.Name, soilProfile3.Name), calculationInput3.Name); + Assert.AreEqual($"{surfaceLine.Name} {soilProfile1.Name}", calculationInput1.Name); + Assert.AreEqual($"{surfaceLine.Name} {soilProfile2.Name} (1)", calculationInput2.Name); + Assert.AreEqual($"{surfaceLine.Name} {soilProfile3.Name} (2)", calculationInput3.Name); } #endregion Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -25,7 +25,6 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Piping.KernelWrapper.TestUtil; namespace Ringtoets.Piping.Forms.Test.PresentationObjects { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision d485f27eb5a6d688406882dce60c3229e22f2ac2) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -764,7 +764,7 @@ // Call & Assert SetPropertyAndVerifyNotificationsForCalculation(properties => properties.UseAssessmentLevelManualInput = true, - calculation); + calculation); } [Test] Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -179,10 +179,6 @@ {14C6F716-64E2-4BC4-A1EF-05865FCEFA4C} Ringtoets.Piping.Primitives - - {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} - Ringtoets.Piping.KernelWrapper.TestUtil - {955e574d-67ce-4347-aa6b-7df8a04ed754} Ringtoets.Piping.Data.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -rd491788b870f9a9d2e08c93b52777f613809a133 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision d491788b870f9a9d2e08c93b52777f613809a133) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -350,7 +350,7 @@ // Assert Assert.IsEmpty(dataGridViewCell.ErrorText); - Assert.AreEqual(string.Format("1/{0:N0}", 1 / calculationScenario.Probability), + Assert.AreEqual($"1/{1 / calculationScenario.Probability:N0}", formattedValue); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -r57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 57bc6a475f6cdd57b1a0ebf70cdf533014afd1ff) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -255,13 +255,13 @@ ReferenceLine = referenceLine }; - var stochasticSoilModel1 = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("name1", new[] + PipingStochasticSoilModel stochasticSoilModel1 = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("name1", new[] { new Point2D(1.0, 2.0), new Point2D(1.1, 2.2) }); - var stochasticSoilModel2 = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("name2", new[] + PipingStochasticSoilModel stochasticSoilModel2 = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("name2", new[] { new Point2D(3.0, 4.0), new Point2D(3.3, 4.4) @@ -678,7 +678,7 @@ var failureMechanism = new PipingFailureMechanism(); var failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - var stochasticSoilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("", new[] + PipingStochasticSoilModel stochasticSoilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("", new[] { new Point2D(1, 2), new Point2D(1, 2) Fisheye: Tag db77ae03f93f27b25268dd9f62f0091a47fe22d8 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exceptions/SoilProfileBuilderExceptionTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj (.../Ringtoets.Piping.IO.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Ringtoets.Piping.IO.Test.csproj (.../Ringtoets.Piping.IO.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -59,7 +59,6 @@ Properties\GlobalAssembly.cs - @@ -96,10 +95,6 @@ {4843D6E5-066F-4795-94F5-1D53932DD03C} Ringtoets.Common.Data.TestUtil - - {516E7E2A-83F6-43EB-895A-A1F4F90FA531} - Ringtoets.Common.IO.TestUtil.Test - {33508D7C-1602-4C0D-8503-73AAE98C19E5} Ringtoets.Common.IO.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilProfileTransformerTest.cs =================================================================== diff -u -re343b677ebba0cff9ce37025214aa3109af39a1a -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilProfileTransformerTest.cs (.../PipingStochasticSoilProfileTransformerTest.cs) (revision e343b677ebba0cff9ce37025214aa3109af39a1a) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingStochasticSoilProfileTransformerTest.cs (.../PipingStochasticSoilProfileTransformerTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -57,7 +57,7 @@ var soilProfile = mockRepository.Stub(); mockRepository.ReplayAll(); - var stochasticSoilProfile = StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(soilProfile); + StochasticSoilProfile stochasticSoilProfile = StochasticSoilProfileTestFactory.CreateStochasticSoilProfileWithValidProbability(soilProfile); // Call TestDelegate test = () => PipingStochasticSoilProfileTransformer.Transform(stochasticSoilProfile, null); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil.Test/Ringtoets.Piping.IO.TestUtil.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil.Test/Ringtoets.Piping.IO.TestUtil.Test.csproj (.../Ringtoets.Piping.IO.TestUtil.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil.Test/Ringtoets.Piping.IO.TestUtil.Test.csproj (.../Ringtoets.Piping.IO.TestUtil.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -45,7 +45,6 @@ - @@ -65,10 +64,6 @@ {3BBFD65B-B277-4E50-AE6D-BD24C3434609} Core.Common.Base - - {D749EE4C-CE50-4C17-BF01-9A953028C126} - Core.Common.TestUtil - {52BA7627-CBAB-4209-BE77-3B5F31378277} Ringtoets.Common.IO Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil/Ringtoets.Piping.IO.TestUtil.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil/Ringtoets.Piping.IO.TestUtil.csproj (.../Ringtoets.Piping.IO.TestUtil.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil/Ringtoets.Piping.IO.TestUtil.csproj (.../Ringtoets.Piping.IO.TestUtil.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -40,7 +40,6 @@ - Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -r1f0cd3fafaa7340a446612870810629587474302 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision 1f0cd3fafaa7340a446612870810629587474302) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -32,7 +32,6 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.Views; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Service; namespace Ringtoets.Piping.Integration.Test @@ -124,15 +123,15 @@ pipingCalculation1.Output = new TestPipingOutput(); pipingCalculation1.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(probability); pipingCalculation1.NotifyObservers(); - Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / pipingCalculation1.Probability), + Assert.AreEqual($"1/{1.0 / pipingCalculation1.Probability:N0}", dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.IsEmpty(dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Add another, nested calculation without surface line and ensure the data grid view is updated when the surface line is set var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); - Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / pipingCalculation1.Probability), + Assert.AreEqual($"1/{1.0 / pipingCalculation1.Probability:N0}", dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.IsEmpty(dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); @@ -166,7 +165,7 @@ // Set contribution again so we have a probability. pipingCalculation1.Contribution = (RoundedDouble) 1.0; pipingCalculation1.NotifyObservers(); - Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / pipingCalculation1.Probability), + Assert.AreEqual($"1/{1.0 / pipingCalculation1.Probability:N0}", dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.IsEmpty(dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj (.../Ringtoets.Piping.Integration.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/Ringtoets.Piping.Integration.Test.csproj (.../Ringtoets.Piping.Integration.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -107,10 +107,6 @@ {955E574D-67CE-4347-AA6B-7DF8A04ED754} Ringtoets.Piping.Data.TestUtil - - {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} - Ringtoets.Piping.KernelWrapper.TestUtil - Fisheye: Tag db77ae03f93f27b25268dd9f62f0091a47fe22d8 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/Creators/PipingProfileCreatorExceptionTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs =================================================================== diff -u -r99f686f22091051a65ff1ee20abd68ffad713647 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision 99f686f22091051a65ff1ee20abd68ffad713647) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -428,7 +428,7 @@ List validationMessages = calculation.Validate(); // Assert - string message = string.Format("De onderkant({0}) van het ondergrondprofiel is niet laag genoeg. Het moet tenminste {1} m onder de bovenkant van de diepste laag ({2}) liggen.", bottom, 0.001, top); + string message = $"De onderkant({bottom}) van het ondergrondprofiel is niet laag genoeg. Het moet tenminste {0.001} m onder de bovenkant van de diepste laag ({top}) liggen."; Assert.AreEqual(1, validationMessages.Count); Assert.AreEqual(message, validationMessages[0]); } Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/Ringtoets.Piping.KernelWrapper.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/Ringtoets.Piping.KernelWrapper.Test.csproj (.../Ringtoets.Piping.KernelWrapper.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/Ringtoets.Piping.KernelWrapper.Test.csproj (.../Ringtoets.Piping.KernelWrapper.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -57,7 +57,6 @@ - @@ -82,14 +81,6 @@ {D4200F43-3F72-4F42-AF0A-8CED416A38EC} Ringtoets.Common.Data - - {4843D6E5-066F-4795-94F5-1D53932DD03C} - Ringtoets.Common.Data.TestUtil - - - {ce994cc9-6f6a-48ac-b4be-02c30a21f4db} - Ringtoets.Piping.Data - {d64e4f0e-e341-496f-82b2-941ad202b4e3} Ringtoets.Piping.KernelWrapper @@ -98,10 +89,6 @@ {14C6F716-64E2-4BC4-A1EF-05865FCEFA4C} Ringtoets.Piping.Primitives - - {955E574D-67CE-4347-AA6B-7DF8A04ED754} - Ringtoets.Piping.Data.TestUtil - {27e0a5c9-3abf-426a-a3da-7d0b83a218c8} Ringtoets.Piping.KernelWrapper.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/Ringtoets.Piping.KernelWrapper.TestUtil.csproj (.../Ringtoets.Piping.KernelWrapper.TestUtil.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -60,18 +60,6 @@ - - {3bbfd65b-b277-4e50-ae6d-bd24c3434609} - Core.Common.Base - - - {d4200f43-3f72-4f42-af0a-8ced416a38ec} - Ringtoets.Common.Data - - - {ce994cc9-6f6a-48ac-b4be-02c30a21f4db} - Ringtoets.Piping.Data - {d64e4f0e-e341-496f-82b2-941ad202b4e3} Ringtoets.Piping.KernelWrapper Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj (.../Ringtoets.Piping.Plugin.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj (.../Ringtoets.Piping.Plugin.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -51,7 +51,6 @@ ..\..\..\..\lib\NUnitForms.dll - ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll True @@ -188,10 +187,6 @@ {955E574D-67CE-4347-AA6B-7DF8A04ED754} Ringtoets.Piping.Data.TestUtil - - {27E0A5C9-3ABF-426A-A3DA-7D0B83A218C8} - Ringtoets.Piping.KernelWrapper.TestUtil - {6F568E38-592A-4F99-A901-86B74C4F24D2} Ringtoets.Piping.Primitives.TestUtil Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r7371a70ed0751d341d41a7b951b780d286f83791 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 7371a70ed0751d341d41a7b951b780d286f83791) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -1041,6 +1041,7 @@ CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.Current); Assert.IsTrue(msgs.MoveNext()); Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gelukt.", msgs.Current); + msgs.Dispose(); }); Assert.IsNotNull(calculation.Output); Assert.IsNotNull(calculation.SemiProbabilisticOutput); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 09693d79085118c47709b7059ab7c1ef459ad2aa) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -43,7 +43,6 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Piping.KernelWrapper.TestUtil; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs =================================================================== diff -u -r09693d79085118c47709b7059ab7c1ef459ad2aa -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs (.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision 09693d79085118c47709b7059ab7c1ef459ad2aa) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs (.../PipingStochasticSoilModelCollectionContextUpdateInfoTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -37,7 +37,6 @@ using Ringtoets.Piping.Data.SoilProfile; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Piping.KernelWrapper.TestUtil; using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; namespace Ringtoets.Piping.Plugin.Test.UpdateInfos Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/Ringtoets.Piping.Primitives.TestUtil.Test.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/Ringtoets.Piping.Primitives.TestUtil.Test.csproj (.../Ringtoets.Piping.Primitives.TestUtil.Test.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil.Test/Ringtoets.Piping.Primitives.TestUtil.Test.csproj (.../Ringtoets.Piping.Primitives.TestUtil.Test.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -41,7 +41,6 @@ - Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/Ringtoets.Piping.Primitives.TestUtil.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/Ringtoets.Piping.Primitives.TestUtil.csproj (.../Ringtoets.Piping.Primitives.TestUtil.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/Ringtoets.Piping.Primitives.TestUtil.csproj (.../Ringtoets.Piping.Primitives.TestUtil.csproj) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -37,7 +37,6 @@ - Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs =================================================================== diff -u -r6cf604a94300560817de70fd42d09baa5b22c3a6 -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision 6cf604a94300560817de70fd42d09baa5b22c3a6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) @@ -29,7 +29,6 @@ using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.SoilProfile; using Ringtoets.Piping.Data.TestUtil; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Primitives; using Ringtoets.Piping.Primitives.TestUtil;