Fisheye: Tag 77d25c75ebe120c39ed7956a0aace093ed96e135 refers to a dead (removed) revision in file `Ringtoets/Piping/src/Ringtoets.Piping.Data/NormProbabilityPipingInput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs =================================================================== diff -u -rdd8bb1e310fb6ebef30770f6f739255979946552 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision dd8bb1e310fb6ebef30770f6f739255979946552) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -40,7 +40,7 @@ /// are used in a semi-probabilistic piping assessment. /// When or /// is null. - public PipingCalculation(GeneralPipingInput generalInputParameters, NormProbabilityPipingInput normProbabilityInputParameters) + public PipingCalculation(GeneralPipingInput generalInputParameters, PipingProbabilityAssessmentInput normProbabilityInputParameters) { if (normProbabilityInputParameters == null) { @@ -55,7 +55,7 @@ /// /// Gets the parameters required to perform a semi-probabilistic assessment. /// - public NormProbabilityPipingInput NormProbabilityParameters { get; private set; } + public PipingProbabilityAssessmentInput NormProbabilityParameters { get; private set; } /// /// Gets the input parameters to perform a piping calculation with. Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs =================================================================== diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculationScenario.cs (.../PipingCalculationScenario.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -38,7 +38,7 @@ /// Parameters which influence the probability estimate for a piping assessment. /// When or /// is null. - public PipingCalculationScenario(GeneralPipingInput generalInputParameters, NormProbabilityPipingInput normProbabilityInputParameters) + public PipingCalculationScenario(GeneralPipingInput generalInputParameters, PipingProbabilityAssessmentInput normProbabilityInputParameters) : base(generalInputParameters, normProbabilityInputParameters) { IsRelevant = true; Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -ref49fd08b8b47114cc398b3e0cdced469037bc4a -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision ef49fd08b8b47114cc398b3e0cdced469037bc4a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -42,7 +42,7 @@ public PipingFailureMechanism() : base(PipingDataResources.PipingFailureMechanism_DisplayName, PipingDataResources.PipingFailureMechanism_DisplayCode) { - NormProbabilityInput = new NormProbabilityPipingInput(); + NormProbabilityInput = new PipingProbabilityAssessmentInput(); GeneralInput = new GeneralPipingInput(); SurfaceLines = new List(); StochasticSoilModels = new ObservableList(); @@ -90,7 +90,7 @@ /// Gets the general semi-probabilistic calculation input parameters that apply to each calculation /// in a semi-probabilistic assessment. /// - public NormProbabilityPipingInput NormProbabilityInput { get; private set; } + public PipingProbabilityAssessmentInput NormProbabilityInput { get; private set; } public CalculationGroup CalculationsGroup { get; private set; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs =================================================================== diff -u --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs (revision 0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingProbabilityAssessmentInput.cs (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -0,0 +1,88 @@ +// 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; +using Ringtoets.Common.Data.Properties; + +namespace Ringtoets.Piping.Data +{ + /// + /// This class holds parameters which influence the probability estimate for a piping assessment. + /// + public class PipingProbabilityAssessmentInput + { + private double contribution; + + /// + /// Creates a new instance of . + /// + public PipingProbabilityAssessmentInput() + { + A = 1.0; + B = 350.0; + SectionLength = double.NaN; + Norm = 0; + Contribution = double.NaN; + } + + /// + /// Gets 'a' parameter used to factor in the 'length effect' when determining the + /// maximum tolerated probability of failure. + /// + public double A { get; private set; } + + /// + /// Gets 'b' parameter used to factor in the 'length effect' when determining the + /// maximum tolerated probability of failure. + /// + public double B { get; private set; } + + /// + /// Gets or sets the length of the assessment section. + /// + public double SectionLength { get; set; } + + /// + /// Gets or sets the contribution of piping as a percentage (0-100) to the total of the failure + /// probability of the assessment section. + /// + public double Contribution + { + get + { + return contribution; + } + set + { + if (value < 0 || value > 100) + { + throw new ArgumentOutOfRangeException("value", Resources.Contribution_Value_should_be_in_interval_0_100); + } + contribution = value; + } + } + + /// + /// Gets or sets the return period to assess for. + /// + public int Norm { get; set; } + } +} \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj =================================================================== diff -u -r64d5609bb2912cd52dc74deffdd189222e240599 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision 64d5609bb2912cd52dc74deffdd189222e240599) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Ringtoets.Piping.Data.csproj (.../Ringtoets.Piping.Data.csproj) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -67,7 +67,7 @@ True Resources.resx - + Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -rd148009f276fb1d4a7a4cbacb730c31114b7e4ae -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision d148009f276fb1d4a7a4cbacb730c31114b7e4ae) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -58,7 +58,7 @@ /// is null /// is null /// - public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) + public static IEnumerable GenerateCalculationItemsStructure(IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput normProbabilityInput) { if (surfaceLines == null) { @@ -123,7 +123,7 @@ return soilModelObjectsForCalculation; } - private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) + private static CalculationGroup CreateCalculationGroup(RingtoetsPipingSurfaceLine surfaceLine, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput normProbabilityInput) { var calculationGroup = new CalculationGroup(surfaceLine.Name, true); var stochasticSoilModels = GetStochasticSoilModelsForSurfaceLine(surfaceLine, soilModels); @@ -138,7 +138,7 @@ return calculationGroup; } - private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) + private static ICalculationBase CreatePipingCalculation(RingtoetsPipingSurfaceLine surfaceLine, StochasticSoilModel stochasticSoilModel, StochasticSoilProfile stochasticSoilProfile, IEnumerable calculations, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput normProbabilityInput) { var nameBase = string.Format("{0} {1}", surfaceLine.Name, stochasticSoilProfile); var name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 5b8f476716cb75977616203318fa250f608fe7a5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -629,7 +629,7 @@ nodeData.FailureMechanism.NotifyObservers(); } - private void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, NormProbabilityPipingInput normProbabilityInput) + private void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput, PipingProbabilityAssessmentInput normProbabilityInput) { foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput, normProbabilityInput)) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs =================================================================== diff -u -ra053684de9667dfb70aa8cf669e22843c2bd39ed -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision a053684de9667dfb70aa8cf669e22843c2bd39ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingSemiProbabilisticCalculationService.cs (.../PipingSemiProbabilisticCalculationService.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -70,18 +70,18 @@ { ValidateOutputOnCalculation(calculation); - NormProbabilityPipingInput normProbabilityParameters = calculation.NormProbabilityParameters; + PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput = calculation.NormProbabilityParameters; PipingOutput pipingOutput = calculation.Output; var calculator = new PipingSemiProbabilisticCalculationService( pipingOutput.UpliftFactorOfSafety, pipingOutput.HeaveFactorOfSafety, pipingOutput.SellmeijerFactorOfSafety, - normProbabilityParameters.Norm, - normProbabilityParameters.A, - normProbabilityParameters.B, - normProbabilityParameters.SectionLength, - normProbabilityParameters.Contribution/100); + pipingProbabilityAssessmentInput.Norm, + pipingProbabilityAssessmentInput.A, + pipingProbabilityAssessmentInput.B, + pipingProbabilityAssessmentInput.SectionLength, + pipingProbabilityAssessmentInput.Contribution/100); calculator.Calculate(); Fisheye: Tag 77d25c75ebe120c39ed7956a0aace093ed96e135 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/NormProbabilityPipingInputTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs (.../PipingCalculationGroupExtensionsTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationGroupExtensionsTest.cs (.../PipingCalculationGroupExtensionsTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -97,7 +97,7 @@ // Setup var failureMechanism = GetFailureMechanismWithSections(); var stochasticSoilModel = failureMechanism.StochasticSoilModels.First(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs =================================================================== diff -u -r54c270e65b7ea51ec9855500fbc7cd9f5869fceb -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 54c270e65b7ea51ec9855500fbc7cd9f5869fceb) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioExtensionsTest.cs (.../PipingCalculationScenarioExtensionsTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -35,7 +35,7 @@ public void IsSurfaceLineIntersectionWithReferenceLineInSection_SurfaceLineNull_ReturnsFalse() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); // Call var intersects = calculation.IsSurfaceLineIntersectionWithReferenceLineInSection(Enumerable.Empty()); @@ -65,7 +65,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -101,7 +101,7 @@ new Point2D(10.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -139,7 +139,7 @@ new Point2D(20.0, 0.0) }); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -r209bfd7b71ef53a57e1a52337f1333d38122282f -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 209bfd7b71ef53a57e1a52337f1333d38122282f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -35,14 +35,14 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); // Call - PipingCalculationScenario scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); + PipingCalculationScenario scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); // Assert Assert.IsInstanceOf(scenario); - Assert.AreSame(semiProbabilisticInputParameters, scenario.NormProbabilityParameters); + Assert.AreSame(pipingProbabilityAssessmentInput, scenario.NormProbabilityParameters); Assert.IsTrue(scenario.IsRelevant); Assert.AreEqual((RoundedDouble) 1.0, scenario.Contribution); Assert.AreEqual(CalculationScenarioStatus.NotCalculated, scenario.Status); @@ -55,9 +55,9 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); + var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); // Call scenario.IsRelevant = isRelevant; @@ -73,9 +73,9 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); + var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); var roundedDouble = (RoundedDouble) newValue; @@ -93,9 +93,9 @@ RoundedDouble expectedProbability = new RoundedDouble(0, 49862180); var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters) + var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) { Output = new TestPipingOutput(), SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) @@ -113,9 +113,9 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); + var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); // Call RoundedDouble probability; @@ -130,9 +130,9 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters); + var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput); // Call CalculationScenarioStatus status = scenario.Status; @@ -146,9 +146,9 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters) + var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) { Output = new TestPipingOutput(), SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, double.NaN, 0, 0) @@ -168,9 +168,9 @@ RoundedDouble expectedProbability = new RoundedDouble(0, 49862180); var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); - var scenario = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters) + var scenario = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) { Output = new TestPipingOutput(), SemiProbabilisticOutput = new PipingSemiProbabilisticOutput(0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, expectedProbability, 0, 0) Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs =================================================================== diff -u -r47d80506f9f8166de93579dbba94e57f4101927b -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision 47d80506f9f8166de93579dbba94e57f4101927b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -45,10 +45,10 @@ { // Setup var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); // Call - var calculation = new PipingCalculation(generalInputParameters, semiProbabilisticInputParameters); + var calculation = new PipingCalculation(generalInputParameters, pipingProbabilityAssessmentInput); // Assert Assert.IsInstanceOf(calculation); @@ -67,14 +67,14 @@ public void Constructor_GeneralPipingInputIsNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => new PipingCalculation(null, new NormProbabilityPipingInput()); + TestDelegate call = () => new PipingCalculation(null, new PipingProbabilityAssessmentInput()); // Assert Assert.Throws(call); } [Test] - public void Constructor_SemiProbabilisticPipingInputIsNull_ThrowArgumentNullException() + public void Constructor_PipingProbabilisticAssessmentInputIsNull_ThrowArgumentNullException() { // Call TestDelegate call = () => new PipingCalculation(new GeneralPipingInput(), null); @@ -92,7 +92,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); calculation.Attach(observer); @@ -108,7 +108,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Never(); mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); calculation.Attach(observer); calculation.Detach(observer); @@ -129,7 +129,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); calculation.Attach(observerA); calculation.Attach(observerB); @@ -150,7 +150,7 @@ mockRepository.ReplayAll(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); calculation.Attach(observerA); calculation.Attach(observerB); @@ -166,7 +166,7 @@ // Setup var observer = mockRepository.StrictMock(); - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); // Call & Assert calculation.Detach(observer); @@ -176,7 +176,7 @@ public void ClearOutput_Always_SetsOutputToNull() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = new TestPipingOutput() }; @@ -192,7 +192,7 @@ public void HasOutput_OutputNull_ReturnsFalse() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = null }; @@ -205,7 +205,7 @@ public void HasOutput_OutputSet_ReturnsTrue() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = new TestPipingOutput() }; @@ -218,7 +218,7 @@ public void ClearHydraulicBoundaryLocation_Always_SetHydraulicBoundaryLocationToNull() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0); calculation.InputParameters.HydraulicBoundaryLocation = hydraulicBoundaryLocation; @@ -236,7 +236,7 @@ public void ClearHydraulicBoundaryLocation_Always_SetAssessmentLevelToNaN() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var assessmentLevel = new RoundedDouble(2, 7.60); calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0) { @@ -257,7 +257,7 @@ public void GetObservableInput_Always_ReturnsInputParameters() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var inputParameters = calculation.InputParameters; // Call @@ -272,7 +272,7 @@ { // Setup var output = new PipingOutput(2.0, 3.0, 1.4, 50.3, 16.3, 58.2); - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = output }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs =================================================================== diff -u -r89e5c41b732ccf30350026e8d35a01d9a180fdfc -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision 89e5c41b732ccf30350026e8d35a01d9a180fdfc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismTest.cs (.../PipingFailureMechanismTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -161,7 +161,7 @@ public void Calculations_AddPipingCalculation_ItemIsAddedToCollection() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); @@ -176,7 +176,7 @@ public void Calculations_RemovePipingCalculation_ItemIsRemovedFromCollection() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingProbabilityAssessmentInputTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingProbabilityAssessmentInputTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingProbabilityAssessmentInputTest.cs (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -0,0 +1,80 @@ +// 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; +using Core.Common.TestUtil; +using NUnit.Framework; + +namespace Ringtoets.Piping.Data.Test +{ + [TestFixture] + public class PipingProbabilityAssessmentInputTest + { + [Test] + public void Constructor_DefaultPropertiesSet() + { + // Call + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + + // Assert + Assert.AreEqual(1.0, pipingProbabilityAssessmentInput.A); + Assert.AreEqual(350.0, pipingProbabilityAssessmentInput.B); + + Assert.IsNaN(pipingProbabilityAssessmentInput.SectionLength); + Assert.AreEqual(0, pipingProbabilityAssessmentInput.Norm); + Assert.IsNaN(pipingProbabilityAssessmentInput.Contribution); + } + + [Test] + [TestCase(0)] + [TestCase(45.67)] + [TestCase(100)] + public void Contribution_SetNewValidValue_GetNewValue(double newContributionValue) + { + // Setup + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + + // Call + pipingProbabilityAssessmentInput.Contribution = newContributionValue; + + // Assert + Assert.AreEqual(newContributionValue, pipingProbabilityAssessmentInput.Contribution); + } + + [Test] + [TestCase(-1e-6)] + [TestCase(-123.545)] + [TestCase(100 + 1e-6)] + [TestCase(5678.9)] + public void Contribution_SetNewInvalidValue_ThrowArgumentOutOfRangeException(double newContributionValue) + { + // Setup + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + + // Call + TestDelegate call = () => pipingProbabilityAssessmentInput.Contribution = newContributionValue; + + // Assert + const string expectedMessage = "De waarde voor de toegestane bijdrage aan faalkans moet in interval [0,100] liggen."; + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj =================================================================== diff -u -rc196992ccccf32ce0fd55b83a17e3f3574467a1e -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj (.../Ringtoets.Piping.Data.Test.csproj) (revision c196992ccccf32ce0fd55b83a17e3f3574467a1e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/Ringtoets.Piping.Data.Test.csproj (.../Ringtoets.Piping.Data.Test.csproj) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -70,7 +70,7 @@ - + Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -31,7 +31,7 @@ { public static PipingCalculationScenario CreateCalculationWithInvalidData() { - return new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + return new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); } public static PipingCalculationScenario CreateCalculationWithValidInput() @@ -78,7 +78,7 @@ { DesignWaterLevel = (RoundedDouble) 1.0 }; - return new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + return new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -rfff12e249602fb700b2854c14a3b7cdd0b73c023 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision fff12e249602fb700b2854c14a3b7cdd0b73c023) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -353,7 +353,7 @@ null, Enumerable.Empty(), new GeneralPipingInput(), - new NormProbabilityPipingInput()); + new PipingProbabilityAssessmentInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -368,7 +368,7 @@ Enumerable.Empty(), null, new GeneralPipingInput(), - new NormProbabilityPipingInput()); + new PipingProbabilityAssessmentInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -383,7 +383,7 @@ Enumerable.Empty(), Enumerable.Empty(), null, - new NormProbabilityPipingInput()); + new PipingProbabilityAssessmentInput()); // Assert var parameter = Assert.Throws(test).ParamName; @@ -442,7 +442,7 @@ ringtoetsPipingSurfaceLines, Enumerable.Empty(), new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); }; // Assert @@ -515,7 +515,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -580,7 +580,7 @@ result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( surfaceLines, availableSoilModels, new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); }; // Assert @@ -658,7 +658,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); }; // Assert @@ -740,7 +740,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); // Assert Assert.AreEqual(1, result.Count()); @@ -849,7 +849,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); // Assert Assert.AreEqual(2, result.Count()); @@ -975,7 +975,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); }; // Assert @@ -1061,7 +1061,7 @@ }; GeneralPipingInput generalInput = new GeneralPipingInput(); - NormProbabilityPipingInput normProbabilityInput = new NormProbabilityPipingInput(); + PipingProbabilityAssessmentInput normProbabilityInput = new PipingProbabilityAssessmentInput(); // Call IEnumerable result = PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure( @@ -1156,7 +1156,7 @@ surfaceLines, availableSoilModels, new GeneralPipingInput(), - new NormProbabilityPipingInput()).ToArray(); + new PipingProbabilityAssessmentInput()).ToArray(); // Assert var group = result.First(sl => sl.Name == surfaceLine.Name) as CalculationGroup; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs =================================================================== diff -u -r255ffcdbfd4ffff68c336ad9922e6196636c2803 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs (.../PipingCalculationScenarioContextTest.cs) (revision 255ffcdbfd4ffff68c336ad9922e6196636c2803) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingCalculationScenarioContextTest.cs (.../PipingCalculationScenarioContextTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -25,7 +25,7 @@ { new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var mocks = new MockRepository(); var pipingFailureMechanismMock = mocks.StrictMock(); @@ -66,7 +66,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var context = new PipingCalculationScenarioContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); // Call @@ -96,7 +96,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var context = new PipingCalculationScenarioContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); context.Attach(observer); @@ -129,7 +129,7 @@ new TestStochasticSoilModel() }; - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var context = new PipingCalculationScenarioContext(calculation, surfacelines, soilModels, pipingFailureMechanismMock, assessmentSectionMock); calculation.Attach(observer); // Attach to wrapped object Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs =================================================================== diff -u -rb1a215180352084c8f320439c1893c639917f338 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision b1a215180352084c8f320439c1893c639917f338) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingInputContextTest.cs (.../PipingInputContextTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -40,7 +40,7 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var surfaceLines = new[] { new RingtoetsPipingSurfaceLine() @@ -109,7 +109,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculation.InputParameters, calculation, @@ -135,7 +135,7 @@ var observer = mocks.StrictMock(); mocks.ReplayAll(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculation.InputParameters, calculation, @@ -164,7 +164,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var context = new PipingInputContext(calculationItem.InputParameters, calculationItem, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 5b8f476716cb75977616203318fa250f608fe7a5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -89,7 +89,7 @@ inputParameters.StochasticSoilModel = stochasticSoilModel; inputParameters.StochasticSoilProfile = (stochasticSoilProfile); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingInputContextProperties @@ -139,7 +139,7 @@ projectObserver.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -176,7 +176,7 @@ projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(numberProperties); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -283,7 +283,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -324,7 +324,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -362,7 +362,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -405,7 +405,7 @@ mocks.ReplayAll(); var surfaceLine = ValidSurfaceLine(0.0, 4.0); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -446,7 +446,7 @@ mocks.ReplayAll(); double assessmentLevel = new Random(21).NextDouble(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -493,7 +493,7 @@ projectObserver.Expect(o => o.UpdateObserver()).Repeat.Times(1); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); @@ -532,7 +532,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -580,7 +580,7 @@ var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()) @@ -624,7 +624,7 @@ }; var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); stochasticSoilModel.StochasticSoilProfiles.Add(testPipingSoilProfile); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -687,7 +687,7 @@ StochasticSoilModel = stochasticSoilModel1, StochasticSoilProfile = stochasticSoilProfile1 }; - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var properties = new PipingInputContextProperties @@ -717,7 +717,7 @@ var typeDescriptorContextMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rde6ffafc792b3f154436127cca3ccd922776df09 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision de6ffafc792b3f154436127cca3ccd922776df09) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -105,7 +105,7 @@ // Setup var calculationItem = mocks.StrictMock(); - var childCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var childCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var childGroup = new CalculationGroup(); @@ -149,7 +149,7 @@ var group = new CalculationGroup(); var parentGroup = new CalculationGroup(); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = new TestPipingOutput() }); @@ -267,7 +267,7 @@ var gui = mocks.StrictMock(); var group = new CalculationGroup(); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = new TestPipingOutput() }); @@ -602,7 +602,7 @@ pipingFailureMechanismMock, assessmentSectionMock); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Name = "Nieuwe berekening" }; @@ -1194,7 +1194,7 @@ var pipingFailureMechanism = GetFailureMechanism(); var surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rde6ffafc792b3f154436127cca3ccd922776df09 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision de6ffafc792b3f154436127cca3ccd922776df09) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -92,7 +92,7 @@ public void ChildNodeObjects_WithOutputData_ReturnOutputChildNode() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = new PipingOutput(0.0, 0.0, 0.0, 0.0, 0.0, 0.0) }; @@ -138,7 +138,7 @@ var assessmentSectionMock = mocks.StrictMock(); mocks.ReplayAll(); - var pipingCalculationContext = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()), + var pipingCalculationContext = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, @@ -171,7 +171,7 @@ // Setup var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationScenarioContext(calculation, @@ -203,7 +203,7 @@ // Setup var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = new TestPipingOutput() }; @@ -238,7 +238,7 @@ // Setup var gui = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var nodeData = new PipingCalculationScenarioContext(calculation, @@ -271,7 +271,7 @@ var treeViewControlMock = mocks.StrictMock(); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); - var nodeData = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()), + var nodeData = new PipingCalculationScenarioContext(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), Enumerable.Empty(), Enumerable.Empty(), pipingFailureMechanismMock, @@ -315,11 +315,11 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput())); + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())); group.Attach(observer); var pipingFailureMechanismMock = mocks.StrictMock(); @@ -363,7 +363,7 @@ var pipingFailureMechanism = GetFailureMechanism(); var surfaceLines = pipingFailureMechanism.SurfaceLines.ToArray(); - var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var elementToBeRemoved = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -373,7 +373,7 @@ var group = new CalculationGroup("", groupNameEditable); group.Children.Add(elementToBeRemoved); - group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput())); + group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput())); group.Attach(observer); var assessmentSectionMock = mocks.StrictMock(); @@ -417,7 +417,7 @@ var mainWindow = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, @@ -476,7 +476,7 @@ var gui = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, @@ -578,7 +578,7 @@ var gui = mocks.DynamicMock(); var observer = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var pipingFailureMechanismMock = mocks.StrictMock(); var assessmentSectionMock = mocks.StrictMock(); var pipingCalculationContext = new PipingCalculationScenarioContext(calculation, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rde6ffafc792b3f154436127cca3ccd922776df09 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision de6ffafc792b3f154436127cca3ccd922776df09) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -122,9 +122,9 @@ var pipingFailureMechanism = new PipingFailureMechanism(); var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters)); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters)); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); @@ -183,9 +183,9 @@ IsRelevant = false }; var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters)); - pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters)); + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); + pipingFailureMechanism.CalculationsGroup.Children.Add(new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput)); var pipingFailureMechanismContext = new PipingFailureMechanismContext(pipingFailureMechanism, assessmentSection); @@ -209,12 +209,12 @@ var treeViewControl = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); var generalInputParameters = new GeneralPipingInput(); - var semiProbabilisticInputParameters = new NormProbabilityPipingInput(); - var pipingCalculation1 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters) + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput(); + var pipingCalculation1 = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) { Output = new TestPipingOutput() }; - var pipingCalculation2 = new PipingCalculationScenario(generalInputParameters, semiProbabilisticInputParameters) + var pipingCalculation2 = new PipingCalculationScenario(generalInputParameters, pipingProbabilityAssessmentInput) { Output = new TestPipingOutput() }; @@ -378,7 +378,7 @@ // Setup var treeViewControl = mocks.StrictMock(); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Output = new TestPipingOutput() }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs =================================================================== diff -u -rec5eeafbbd987b02a9d9c07b7e920c03d567f3f7 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision ec5eeafbbd987b02a9d9c07b7e920c03d567f3f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -57,7 +57,7 @@ var assessmentSection = mocks.StrictMock(); var pipingInputContext = new PipingInputContext( new PipingInput(new GeneralPipingInput()), - new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()), + new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), Enumerable.Empty(), Enumerable.Empty(), new PipingFailureMechanism(), @@ -81,7 +81,7 @@ var assessmentSection = mocks.StrictMock(); var pipingInputContext = new PipingInputContext( new PipingInput(new GeneralPipingInput()), - new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()), + new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()), Enumerable.Empty(), Enumerable.Empty(), new PipingFailureMechanism(), Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -r5b8f476716cb75977616203318fa250f608fe7a5 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs (.../LogNormalDistributionDesignVariableTypeConverterTest.cs) (revision 5b8f476716cb75977616203318fa250f608fe7a5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LogNormalDistributionDesignVariableTypeConverterTest.cs (.../LogNormalDistributionDesignVariableTypeConverterTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -197,7 +197,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -rec5eeafbbd987b02a9d9c07b7e920c03d567f3f7 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision ec5eeafbbd987b02a9d9c07b7e920c03d567f3f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -193,7 +193,7 @@ var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var inputParameters = new PipingInput(new GeneralPipingInput()); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs =================================================================== diff -u -r4539b4546747c257739b1695b9ebc9c29e393ffe -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs (.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 4539b4546747c257739b1695b9ebc9c29e393ffe) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextHydraulicBoundaryLocationEditorTest.cs (.../PipingInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -56,7 +56,7 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); hydraulicBoundaryDatabase.Locations.Add(hydraulicBoundaryLocation); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -109,7 +109,7 @@ .Repeat.AtLeastOnce(); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -rec5eeafbbd987b02a9d9c07b7e920c03d567f3f7 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision ec5eeafbbd987b02a9d9c07b7e920c03d567f3f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilModelSelectionEditorTest.cs (.../PipingInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -51,7 +51,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -125,7 +125,7 @@ new Point3D(2, 3, 0) }); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -rec5eeafbbd987b02a9d9c07b7e920c03d567f3f7 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision ec5eeafbbd987b02a9d9c07b7e920c03d567f3f7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextStochasticSoilProfileSelectionEditorTest.cs (.../PipingInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -51,7 +51,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -128,7 +128,7 @@ new Point3D(2, 3, 0) }); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs =================================================================== diff -u -r4539b4546747c257739b1695b9ebc9c29e393ffe -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 4539b4546747c257739b1695b9ebc9c29e393ffe) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/UITypeEditors/PipingInputContextSurfaceLineSelectionEditorTest.cs (.../PipingInputContextSurfaceLineSelectionEditorTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -49,7 +49,7 @@ var context = mockRepository.DynamicMock(); var assessmentSectionMock = mockRepository.StrictMock(); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) @@ -106,7 +106,7 @@ new Point3D(0.0, 0.0, 0.0), new Point3D(1.0, 0.0, 1.0) }); - var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationItem = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var failureMechanism = new PipingFailureMechanism(); var pipingInput = new PipingInput(new GeneralPipingInput()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -rd48d2c62b4a2d2f177e1725e1b84e54a8d49327f -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision d48d2c62b4a2d2f177e1725e1b84e54a8d49327f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -1019,7 +1019,7 @@ { Children = { - new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Name = "Calculation 1", InputParameters = @@ -1039,7 +1039,7 @@ ExitPointL = (RoundedDouble) 4.4444 } }, - new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { Name = "Calculation 2", InputParameters = Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -rb1c2f3f896147de67d46fde3bce9098d94054037 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision b1c2f3f896147de67d46fde3bce9098d94054037) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -64,14 +64,14 @@ IntegrationTestHelper.ImportSurfaceLines(assessmentSection); // Setup some calculations - var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { SurfaceLine = assessmentSection.PipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001") } }; - var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -108,7 +108,7 @@ Assert.AreEqual(2, dataGridView.Rows.Count); // 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(), new NormProbabilityPipingInput()); + var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); Assert.AreEqual(2, dataGridView.Rows.Count); Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -r64d5609bb2912cd52dc74deffdd189222e240599 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision 64d5609bb2912cd52dc74deffdd189222e240599) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -66,14 +66,14 @@ IntegrationTestHelper.ImportSurfaceLines(assessmentSection); // Setup some calculations - var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var pipingCalculation1 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { SurfaceLine = assessmentSection.PipingFailureMechanism.SurfaceLines.First(sl => sl.Name == "PK001_0001") } }; - var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()) + var pipingCalculation2 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()) { InputParameters = { @@ -117,7 +117,7 @@ Assert.AreEqual(string.Empty, 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(), new NormProbabilityPipingInput()); + var pipingCalculation3 = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); nestedPipingCalculationGroup.Children.Add(pipingCalculation3); nestedPipingCalculationGroup.NotifyObservers(); assessmentSection.PipingFailureMechanism.CalculationsGroup.AddCalculationScenariosToFailureMechanismSectionResult(assessmentSection.PipingFailureMechanism); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -rc5f90c4f9b42d985f16f99ad8732576b9217267a -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision c5f90c4f9b42d985f16f99ad8732576b9217267a) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -19,7 +19,7 @@ public void ParameteredConstructor_ExpectedValues() { // Setup - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); // Call var activity = new PipingCalculationActivity(calculation); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs =================================================================== diff -u -r23a37b025a5d0358c1f30fb31de41a2c284519a5 -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs (.../PipingCalculationScenarioServiceTest.cs) (revision 23a37b025a5d0358c1f30fb31de41a2c284519a5) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationScenarioServiceTest.cs (.../PipingCalculationScenarioServiceTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -54,7 +54,7 @@ public void SyncCalculationScenarioWithNewSurfaceLine_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var pipingCalculationScenario = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var pipingCalculationScenario = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var surfaceLine = new RingtoetsPipingSurfaceLine(); // Call @@ -163,7 +163,7 @@ public void RemoveCalculationScenarioFromSectionResult_FailureMechanismNull_ThrowsArgumentNullException() { // Setup - var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); // Call TestDelegate call = () => PipingCalculationScenarioService.RemoveCalculationScenarioFromSectionResult(calculation, null); @@ -179,7 +179,7 @@ // Setup var failureMechanism = GetFailureMechanism(); - var calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); var sectionResults = failureMechanism.SectionResults.ToArray(); var sectionResultScenariosBeforeRemove = sectionResults[0].CalculationScenarios.ToArray(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -rc196992ccccf32ce0fd55b83a17e3f3574467a1e -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision c196992ccccf32ce0fd55b83a17e3f3574467a1e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -57,7 +57,7 @@ // Setup const string name = ""; - var calculation = new PipingCalculation(new GeneralPipingInput(), new NormProbabilityPipingInput()); + var calculation = new PipingCalculation(new GeneralPipingInput(), new PipingProbabilityAssessmentInput()); calculation.Name = name; // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -rc196992ccccf32ce0fd55b83a17e3f3574467a1e -r77d25c75ebe120c39ed7956a0aace093ed96e135 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision c196992ccccf32ce0fd55b83a17e3f3574467a1e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingSemiProbabilisticCalculationServiceTest.cs (.../PipingSemiProbabilisticCalculationServiceTest.cs) (revision 77d25c75ebe120c39ed7956a0aace093ed96e135) @@ -18,13 +18,13 @@ public void UpliftProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Norm = norm }; var calculatorResult = new PipingOutput(double.NaN, factorOfSafety, double.NaN, double.NaN, double.NaN, double.NaN); - var calculation = AsPipingCalculation(calculatorResult, pipingInput); + var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); PipingSemiProbabilisticCalculationService.Calculate(calculation); @@ -43,13 +43,13 @@ public void HeaveProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Norm = norm }; var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, factorOfSafety, double.NaN, double.NaN); - var calculation = AsPipingCalculation(calculatorResult, pipingInput); + var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); PipingSemiProbabilisticCalculationService.Calculate(calculation); @@ -68,13 +68,13 @@ public void SellmeijerProbability_DifferentInputs_ReturnsExpectedValue(int norm, double factorOfSafety, double expectedResult) { // Setup - var pipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Norm = norm }; var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, factorOfSafety); - var calculation = AsPipingCalculation(calculatorResult, pipingInput); + var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); PipingSemiProbabilisticCalculationService.Calculate(calculation); @@ -96,12 +96,12 @@ { // Setup var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); - var pipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Norm = norm }; - var calculation = AsPipingCalculation(calculatorResult, pipingInput); + var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); PipingSemiProbabilisticCalculationService.Calculate(calculation); @@ -120,14 +120,14 @@ { // Setup var calculatorResult = new PipingOutput(double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); - var pipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Norm = norm, SectionLength = assessmentSectionLength, Contribution = contribution }; - var calculation = AsPipingCalculation(calculatorResult, pipingInput); + var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); PipingSemiProbabilisticCalculationService.Calculate(calculation); @@ -151,14 +151,14 @@ double expectedResult = 1.134713444; var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); - var pipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Norm = norm, SectionLength = assessmentSectionLength, Contribution = contribution }; - var calculation = AsPipingCalculation(calculatorResult, pipingInput); + var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); PipingSemiProbabilisticCalculationService.Calculate(calculation); @@ -181,14 +181,14 @@ { // Setup var calculatorResult = new PipingOutput(double.NaN, fosUplift, double.NaN, fosHeave, double.NaN, fosSellmeijer); - var pipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { Norm = norm, SectionLength = assessmentSectionLength, Contribution = contribution }; - var calculation = AsPipingCalculation(calculatorResult, pipingInput); + var calculation = AsPipingCalculation(calculatorResult, pipingProbabilityAssessmentInput); PipingSemiProbabilisticCalculationService.Calculate(calculation); @@ -203,15 +203,14 @@ public void Calculate_CompleteInput_ReturnsPipingSemiProbabilisticOutputWithValues() { // Setup - - var semiProbabilisticPipingInput = new NormProbabilityPipingInput + var pipingProbabilityAssessmentInput = new PipingProbabilityAssessmentInput { SectionLength = 6000, Norm = 30000, Contribution = 24 }; var pipingOutput = new PipingOutput(double.NaN, 1.2, double.NaN, 0.6, double.NaN, 0.9); - var pipingCalculation = new PipingCalculation(new GeneralPipingInput(), semiProbabilisticPipingInput) + var pipingCalculation = new PipingCalculation(new GeneralPipingInput(), pipingProbabilityAssessmentInput) { Output = pipingOutput }; @@ -229,7 +228,7 @@ { // Setup var generalInput = new GeneralPipingInput(); - var pipingCalculation = new PipingCalculation(generalInput, new NormProbabilityPipingInput()); + var pipingCalculation = new PipingCalculation(generalInput, new PipingProbabilityAssessmentInput()); // Call TestDelegate test = () => PipingSemiProbabilisticCalculationService.Calculate(pipingCalculation); @@ -238,9 +237,9 @@ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, "Cannot perform a semi-probabilistic calculation without output from the piping kernel."); } - private PipingCalculation AsPipingCalculation(PipingOutput pipingOutput, NormProbabilityPipingInput normProbabilityPipingInput) + private PipingCalculation AsPipingCalculation(PipingOutput pipingOutput, PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput) { - return new PipingCalculation(new GeneralPipingInput(), normProbabilityPipingInput) + return new PipingCalculation(new GeneralPipingInput(), pipingProbabilityAssessmentInput) { Output = pipingOutput };