Index: Riskeer/Piping/src/Riskeer.Piping.Data/DerivedPipingInput.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/src/Riskeer.Piping.Data/DerivedPipingInput.cs (.../DerivedPipingInput.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/src/Riskeer.Piping.Data/DerivedPipingInput.cs (.../DerivedPipingInput.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -259,7 +259,7 @@ var weightedMean = new RoundedDouble(GetNumberOfDecimals(effectiveThicknessCoverageLayerDistribution), InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile)); Fisheye: Tag 50fc44e69b51ad706efee43e50cd38796c4fc2ae refers to a dead (removed) revision in file `Riskeer/Piping/src/Riskeer.Piping.Data/PipingDesignVariableFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingInput.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingInput.cs (.../DerivedSemiProbabilisticPipingInput.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingInput.cs (.../DerivedSemiProbabilisticPipingInput.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -46,7 +46,7 @@ } RoundedDouble dampingFactorExit = SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(); - RoundedDouble phreaticLevelExit = SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); + RoundedDouble phreaticLevelExit = PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); return new RoundedDouble(2, InputParameterCalculationService.CalculatePiezometricHeadAtExit(assessmentLevel, dampingFactorExit, Index: Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactory.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactory.cs (.../SemiProbabilisticPipingDesignVariableFactory.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactory.cs (.../SemiProbabilisticPipingDesignVariableFactory.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -22,7 +22,7 @@ using System; using Riskeer.Common.Data.Probabilistics; -namespace Riskeer.Piping.Data +namespace Riskeer.Piping.Data.SemiProbabilistic { /// /// Factory for creating design variables based on distributions for semi-probabilistic piping calculations. @@ -146,25 +146,6 @@ } /// - /// Creates the design variable for the phreatic level at the exit point. - /// - /// The piping input. - /// The created . - /// Thrown when is null. - public static DesignVariable GetPhreaticLevelExit(PipingInput pipingInput) - { - if (pipingInput == null) - { - throw new ArgumentNullException(nameof(pipingInput)); - } - - return new NormalDistributionDesignVariable(pipingInput.PhreaticLevelExit) - { - Percentile = 0.05 - }; - } - - /// /// Creates the design variable for the damping factor at the exit point. /// /// The piping input. Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -31,6 +31,7 @@ using Riskeer.Common.Data.Probability; using Riskeer.Common.Forms.PropertyClasses; using Riskeer.Piping.Data; +using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Forms.Properties; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs (.../SemiProbabilisticPipingInputContextProperties.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs (.../SemiProbabilisticPipingInputContextProperties.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -267,7 +267,7 @@ get { return new NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(data.WrappedData), + PipingDesignVariableFactory.GetPhreaticLevelExit(data.WrappedData), propertyChangeHandler); } } @@ -429,7 +429,7 @@ { return new LogNormalDistributionDesignVariableProperties( SemiProbabilisticPipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(data.WrappedData, - data.FailureMechanism.GeneralInput)); + data.FailureMechanism.GeneralInput)); } } Index: Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationService.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationService.cs (.../SemiProbabilisticPipingCalculationService.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationService.cs (.../SemiProbabilisticPipingCalculationService.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -260,7 +260,7 @@ AssessmentLevel = effectiveAssessmentLevel, PiezometricHeadExit = DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(input, effectiveAssessmentLevel), DampingFactorExit = SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), - PhreaticLevelExit = SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + PhreaticLevelExit = PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), CriticalHeaveGradient = SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalPipingInput).GetDesignValue(), ThicknessCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(input).GetDesignValue(), EffectiveThicknessCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(input, generalPipingInput).GetDesignValue(), Fisheye: Tag 7a90e9840261617c04cd83ca94b94d2fb855d60a refers to a dead (removed) revision in file `Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingDesignVariableFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs (.../DerivedSemiProbabilisticPipingInputTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs (.../DerivedSemiProbabilisticPipingInputTest.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -66,7 +66,7 @@ PiezoHeadCalculatorStub piezometricHeadAtExitCalculator = factory.LastCreatedPiezometricHeadAtExitCalculator; Assert.AreEqual(assessmentLevel, piezometricHeadAtExitCalculator.HRiver, assessmentLevel.GetAccuracy()); - Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder, + Assert.AreEqual(PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder, input.PhreaticLevelExit.GetAccuracy()); Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit, input.DampingFactorExit.GetAccuracy()); Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs =================================================================== diff -u -r7a90e9840261617c04cd83ca94b94d2fb855d60a -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs (.../SemiProbabilisticPipingDesignVariableFactoryTest.cs) (revision 7a90e9840261617c04cd83ca94b94d2fb855d60a) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactoryTest.cs (.../SemiProbabilisticPipingDesignVariableFactoryTest.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -25,6 +25,7 @@ using NUnit.Framework; using Riskeer.Common.Data.Probabilistics; using Riskeer.Common.Data.TestUtil; +using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Data.TestUtil; namespace Riskeer.Piping.Data.Test.SemiProbabilistic @@ -188,32 +189,6 @@ } [Test] - public void GetPhreaticLevelExit_PipingInputNull_ThrowsArgumentNullException() - { - // Call - void Call() => SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(null); - - // Assert - var exception = Assert.Throws(Call); - Assert.AreEqual("pipingInput", exception.ParamName); - } - - [Test] - public void GetPhreaticLevelExit_ValidPipingInput_CreateDesignVariableForPhreaticLevelExit() - { - // Setup - var pipingInput = new TestPipingInput(); - - // Call - DesignVariable phreaticLevelExit = - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(pipingInput); - - // Assert - Assert.AreSame(pipingInput.PhreaticLevelExit, phreaticLevelExit.Distribution); - AssertPercentile(0.05, phreaticLevelExit); - } - - [Test] public void GetDampingFactorExit_PipingInputNull_ThrowsArgumentNullException() { // Call Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -33,6 +33,7 @@ using Riskeer.Common.Forms.PropertyClasses; using Riskeer.Common.Forms.TestUtil; using Riskeer.Piping.Data; +using Riskeer.Piping.Data.SemiProbabilistic; using Riskeer.Piping.Forms.PropertyClasses; namespace Riskeer.Piping.Forms.Test.PropertyClasses Index: Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -71,7 +71,7 @@ PipingInput input = invalidPipingCalculation.InputParameters; double result = InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile); @@ -122,7 +122,7 @@ // Call double thickness = InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile); @@ -167,7 +167,7 @@ // Call double thickness = InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile); @@ -186,7 +186,7 @@ double result = InputParameterCalculationService.CalculatePiezometricHeadAtExit( (RoundedDouble) 0.0, SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); + PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); // Assert Assert.IsFalse(double.IsNaN(result)); @@ -208,7 +208,7 @@ PipingInput inputParameters = validPipingCalculation.InputParameters; InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(inputParameters).GetDesignValue(), + PipingDesignVariableFactory.GetPhreaticLevelExit(inputParameters).GetDesignValue(), inputParameters.ExitPointL, inputParameters.SurfaceLine, inputParameters.StochasticSoilProfile.SoilProfile); @@ -218,7 +218,7 @@ EffectiveThicknessCalculatorStub effectiveThicknessCalculator = testFactory.LastCreatedEffectiveThicknessCalculator; Assert.AreEqual(input.ExitPointL.Value, effectiveThicknessCalculator.ExitPointXCoordinate); - Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + Assert.AreEqual(PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), effectiveThicknessCalculator.PhreaticLevel, input.PhreaticLevelExit.GetAccuracy()); AssertEqualSoilProfiles(input.StochasticSoilProfile.SoilProfile, effectiveThicknessCalculator.SoilProfile); @@ -243,14 +243,14 @@ InputParameterCalculationService.CalculatePiezometricHeadAtExit( assessmentLevel, SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), - SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); + PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); // Assert var testFactory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance; PiezoHeadCalculatorStub piezometricHeadAtExitCalculator = testFactory.LastCreatedPiezometricHeadAtExitCalculator; Assert.AreEqual(assessmentLevel.Value, piezometricHeadAtExitCalculator.HRiver); - Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + Assert.AreEqual(PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder, input.PhreaticLevelExit.GetAccuracy()); Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs =================================================================== diff -u -r50fc44e69b51ad706efee43e50cd38796c4fc2ae -rda4400b6eb2326e3e04089607658b020f9be28f6 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision da4400b6eb2326e3e04089607658b020f9be28f6) @@ -65,7 +65,7 @@ RoundedDouble expectedThicknessCoverageLayerDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(input).GetDesignValue(); double thicknessCoverageLayerAccuracy = DerivedPipingInput.GetThicknessCoverageLayer(input).GetAccuracy(); - RoundedDouble expectedPhreaticLevelExitDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); + RoundedDouble expectedPhreaticLevelExitDesignValue = PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); double phreaticLevelExitDesignAccuracy = input.PhreaticLevelExit.GetAccuracy(); double expectedPiezometricHeadExit = DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(input, expectedAssessmentLevel).Value; RoundedDouble expectedDampingFactorExitDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue();