Index: Riskeer/Piping/src/Riskeer.Piping.Data/DerivedPipingInput.cs =================================================================== diff -u -r1250f75d43f878e4ad35f226cea3c68f556964c2 -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/src/Riskeer.Piping.Data/DerivedPipingInput.cs (.../DerivedPipingInput.cs) (revision 1250f75d43f878e4ad35f226cea3c68f556964c2) +++ Riskeer/Piping/src/Riskeer.Piping.Data/DerivedPipingInput.cs (.../DerivedPipingInput.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -259,7 +259,7 @@ var weightedMean = new RoundedDouble(GetNumberOfDecimals(effectiveThicknessCoverageLayerDistribution), InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + SemiProbabilisticPipingDesignVariableFactory.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 -r46a713c40ee453fff3441a9b4b4d8424abcb2d2c -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingInput.cs (.../DerivedSemiProbabilisticPipingInput.cs) (revision 46a713c40ee453fff3441a9b4b4d8424abcb2d2c) +++ Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/DerivedSemiProbabilisticPipingInput.cs (.../DerivedSemiProbabilisticPipingInput.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -45,8 +45,8 @@ throw new ArgumentNullException(nameof(input)); } - RoundedDouble dampingFactorExit = PipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(); - RoundedDouble phreaticLevelExit = PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); + RoundedDouble dampingFactorExit = SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(); + RoundedDouble phreaticLevelExit = SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); return new RoundedDouble(2, InputParameterCalculationService.CalculatePiezometricHeadAtExit(assessmentLevel, dampingFactorExit, Fisheye: Tag 46a713c40ee453fff3441a9b4b4d8424abcb2d2c refers to a dead (removed) revision in file `Riskeer/Piping/src/Riskeer.Piping.Data/SemiProbabilistic/SemiProbabilisticPipingDesignVariableFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs =================================================================== diff -u -re2b60a183f95fefe71686ac319c22bb7ad644bca -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision e2b60a183f95fefe71686ac319c22bb7ad644bca) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailureMechanismProperties.cs (.../PipingFailureMechanismProperties.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -109,7 +109,7 @@ get { return new LogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(data.GeneralInput)); + SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(data.GeneralInput)); } } @@ -418,7 +418,7 @@ get { return new LogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(data.GeneralInput)); + SemiProbabilisticPipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(data.GeneralInput)); } } @@ -433,7 +433,7 @@ get { return new LogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(data.GeneralInput)); + SemiProbabilisticPipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(data.GeneralInput)); } } Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs =================================================================== diff -u -re2b60a183f95fefe71686ac319c22bb7ad644bca -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs (.../SemiProbabilisticPipingInputContextProperties.cs) (revision e2b60a183f95fefe71686ac319c22bb7ad644bca) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/SemiProbabilistic/SemiProbabilisticPipingInputContextProperties.cs (.../SemiProbabilisticPipingInputContextProperties.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -252,7 +252,7 @@ get { return new LogNormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, - PipingDesignVariableFactory.GetDampingFactorExit(data.WrappedData), + SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(data.WrappedData), propertyChangeHandler); } } @@ -267,7 +267,7 @@ get { return new NormalDistributionDesignVariableProperties(DistributionReadOnlyProperties.None, - PipingDesignVariableFactory.GetPhreaticLevelExit(data.WrappedData), + SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(data.WrappedData), propertyChangeHandler); } } @@ -400,7 +400,7 @@ get { return new VariationCoefficientLogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetSeepageLength(data.WrappedData)); + SemiProbabilisticPipingDesignVariableFactory.GetSeepageLength(data.WrappedData)); } } @@ -414,7 +414,7 @@ get { return new LogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetThicknessCoverageLayer(data.WrappedData)); + SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(data.WrappedData)); } } @@ -428,7 +428,7 @@ get { return new LogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(data.WrappedData, + SemiProbabilisticPipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(data.WrappedData, data.FailureMechanism.GeneralInput)); } } @@ -443,7 +443,7 @@ get { return new LogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetThicknessAquiferLayer(data.WrappedData)); + SemiProbabilisticPipingDesignVariableFactory.GetThicknessAquiferLayer(data.WrappedData)); } } @@ -457,7 +457,7 @@ get { return new VariationCoefficientLogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetDarcyPermeability(data.WrappedData)); + SemiProbabilisticPipingDesignVariableFactory.GetDarcyPermeability(data.WrappedData)); } } @@ -471,7 +471,7 @@ get { return new VariationCoefficientLogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetDiameter70(data.WrappedData)); + SemiProbabilisticPipingDesignVariableFactory.GetDiameter70(data.WrappedData)); } } @@ -485,7 +485,7 @@ get { return new ShiftedLogNormalDistributionDesignVariableProperties( - PipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(data.WrappedData)); + SemiProbabilisticPipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(data.WrappedData)); } } Index: Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationService.cs =================================================================== diff -u -rfdde4adb6f049367d85940d7b471462954726253 -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationService.cs (.../SemiProbabilisticPipingCalculationService.cs) (revision fdde4adb6f049367d85940d7b471462954726253) +++ Riskeer/Piping/src/Riskeer.Piping.Service/SemiProbabilistic/SemiProbabilisticPipingCalculationService.cs (.../SemiProbabilisticPipingCalculationService.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -139,7 +139,7 @@ { CalculationServiceHelper.LogMessagesAsWarning(PipingCalculationValidationHelper.GetValidationWarnings(calculation.InputParameters).ToArray()); - RoundedDouble diameter70Value = PipingDesignVariableFactory.GetDiameter70(calculation.InputParameters).GetDesignValue(); + RoundedDouble diameter70Value = SemiProbabilisticPipingDesignVariableFactory.GetDiameter70(calculation.InputParameters).GetDesignValue(); if (!double.IsNaN(diameter70Value) && (diameter70Value < 6.3e-5 || diameter70Value > 0.5e-3)) { CalculationServiceHelper.LogMessagesAsWarning(new[] @@ -236,7 +236,7 @@ LogNormalDistribution thicknessCoverageLayer = DerivedPipingInput.GetThicknessCoverageLayer(input); if (!double.IsNaN(thicknessCoverageLayer.Mean)) { - RoundedDouble saturatedVolumicWeightOfCoverageLayer = PipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(input).GetDesignValue(); + RoundedDouble saturatedVolumicWeightOfCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(input).GetDesignValue(); if (!double.IsNaN(saturatedVolumicWeightOfCoverageLayer) && saturatedVolumicWeightOfCoverageLayer < generalInput.WaterVolumetricWeight) { yield return Resources.PipingCalculationService_ValidateInput_SaturatedVolumicWeightCoverageLayer_must_be_larger_than_WaterVolumetricWeight; @@ -255,25 +255,25 @@ new PipingCalculatorInput.ConstructionProperties { WaterVolumetricWeight = generalPipingInput.WaterVolumetricWeight, - SaturatedVolumicWeightOfCoverageLayer = PipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(input).GetDesignValue(), - UpliftModelFactor = PipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalPipingInput).GetDesignValue(), + SaturatedVolumicWeightOfCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(input).GetDesignValue(), + UpliftModelFactor = SemiProbabilisticPipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalPipingInput).GetDesignValue(), AssessmentLevel = effectiveAssessmentLevel, PiezometricHeadExit = DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(input, effectiveAssessmentLevel), - DampingFactorExit = PipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), - PhreaticLevelExit = PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), - CriticalHeaveGradient = PipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalPipingInput).GetDesignValue(), - ThicknessCoverageLayer = PipingDesignVariableFactory.GetThicknessCoverageLayer(input).GetDesignValue(), - EffectiveThicknessCoverageLayer = PipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(input, generalPipingInput).GetDesignValue(), - SellmeijerModelFactor = PipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalPipingInput).GetDesignValue(), + DampingFactorExit = SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), + PhreaticLevelExit = SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + CriticalHeaveGradient = SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalPipingInput).GetDesignValue(), + ThicknessCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(input).GetDesignValue(), + EffectiveThicknessCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(input, generalPipingInput).GetDesignValue(), + SellmeijerModelFactor = SemiProbabilisticPipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalPipingInput).GetDesignValue(), SellmeijerReductionFactor = generalPipingInput.SellmeijerReductionFactor, - SeepageLength = PipingDesignVariableFactory.GetSeepageLength(input).GetDesignValue(), + SeepageLength = SemiProbabilisticPipingDesignVariableFactory.GetSeepageLength(input).GetDesignValue(), SandParticlesVolumicWeight = generalPipingInput.SandParticlesVolumicWeight, WhitesDragCoefficient = generalPipingInput.WhitesDragCoefficient, - Diameter70 = PipingDesignVariableFactory.GetDiameter70(input).GetDesignValue(), - DarcyPermeability = PipingDesignVariableFactory.GetDarcyPermeability(input).GetDesignValue(), + Diameter70 = SemiProbabilisticPipingDesignVariableFactory.GetDiameter70(input).GetDesignValue(), + DarcyPermeability = SemiProbabilisticPipingDesignVariableFactory.GetDarcyPermeability(input).GetDesignValue(), WaterKinematicViscosity = generalPipingInput.WaterKinematicViscosity, Gravity = generalPipingInput.Gravity, - ThicknessAquiferLayer = PipingDesignVariableFactory.GetThicknessAquiferLayer(input).GetDesignValue(), + ThicknessAquiferLayer = SemiProbabilisticPipingDesignVariableFactory.GetThicknessAquiferLayer(input).GetDesignValue(), MeanDiameter70 = generalPipingInput.MeanDiameter70, BeddingAngle = generalPipingInput.BeddingAngle, ExitPointXCoordinate = input.ExitPointL, Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingDesignVariableFactoryTest.cs =================================================================== diff -u -r46a713c40ee453fff3441a9b4b4d8424abcb2d2c -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingDesignVariableFactoryTest.cs (.../PipingDesignVariableFactoryTest.cs) (revision 46a713c40ee453fff3441a9b4b4d8424abcb2d2c) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingDesignVariableFactoryTest.cs (.../PipingDesignVariableFactoryTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -52,7 +52,7 @@ public void GetUpliftModelFactorDesignVariable_GeneralPipingInputNull_ThrowsArgumentNullException() { // Call - void Call() => PipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(null); + void Call() => SemiProbabilisticPipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(null); // Assert var exception = Assert.Throws(Call); @@ -66,7 +66,7 @@ var generalPipingInput = new GeneralPipingInput(); // Call - DeterministicDesignVariable upliftModelFactor = PipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalPipingInput); + DeterministicDesignVariable upliftModelFactor = SemiProbabilisticPipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalPipingInput); // Assert DistributionAssert.AreEqual(generalPipingInput.UpliftModelFactor, upliftModelFactor.Distribution); @@ -77,7 +77,7 @@ public void GetCriticalHeaveGradientDesignVariable_GeneralPipingInputNull_ThrowsArgumentNullException() { // Call - void Call() => PipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(null); + void Call() => SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(null); // Assert var exception = Assert.Throws(Call); @@ -91,7 +91,7 @@ var generalPipingInput = new GeneralPipingInput(); // Call - DeterministicDesignVariable criticalHeaveGradient = PipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalPipingInput); + DeterministicDesignVariable criticalHeaveGradient = SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalPipingInput); // Assert DistributionAssert.AreEqual(generalPipingInput.CriticalHeaveGradient, criticalHeaveGradient.Distribution); @@ -102,7 +102,7 @@ public void GetSellmeijerModelFactorDesignVariable_GeneralPipingInputNull_ThrowsArgumentNullException() { // Call - void Call() => PipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(null); + void Call() => SemiProbabilisticPipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(null); // Assert var exception = Assert.Throws(Call); @@ -116,7 +116,7 @@ var generalPipingInput = new GeneralPipingInput(); // Call - DeterministicDesignVariable sellmeijerModelFactor = PipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalPipingInput); + DeterministicDesignVariable sellmeijerModelFactor = SemiProbabilisticPipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalPipingInput); // Assert DistributionAssert.AreEqual(generalPipingInput.SellmeijerModelFactor, sellmeijerModelFactor.Distribution); @@ -130,7 +130,7 @@ PipingInput pipingInput = PipingInputFactory.CreateInputWithAquiferAndCoverageLayer(); // Call - DesignVariable thicknessCoverageLayer = PipingDesignVariableFactory.GetThicknessCoverageLayer(pipingInput); + DesignVariable thicknessCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(pipingInput); // Assert Assert.IsInstanceOf>(thicknessCoverageLayer); @@ -145,7 +145,7 @@ var pipingInput = new TestPipingInput(); // Call - DesignVariable thicknessCoverageLayer = PipingDesignVariableFactory.GetThicknessCoverageLayer(pipingInput); + DesignVariable thicknessCoverageLayer = SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(pipingInput); // Assert Assert.IsInstanceOf>(thicknessCoverageLayer); @@ -162,7 +162,7 @@ // Call DesignVariable effectiveThicknessCoverageLayer = - PipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(pipingInput, generalPipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(pipingInput, generalPipingInput); // Assert Assert.IsInstanceOf>(effectiveThicknessCoverageLayer); @@ -179,7 +179,7 @@ // Call DesignVariable effectiveThicknessCoverageLayer = - PipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(pipingInput, generalPipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(pipingInput, generalPipingInput); // Assert Assert.IsInstanceOf>(effectiveThicknessCoverageLayer); @@ -191,7 +191,7 @@ public void GetPhreaticLevelExit_PipingInputNull_ThrowsArgumentNullException() { // Call - void Call() => PipingDesignVariableFactory.GetPhreaticLevelExit(null); + void Call() => SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(null); // Assert var exception = Assert.Throws(Call); @@ -206,7 +206,7 @@ // Call DesignVariable phreaticLevelExit = - PipingDesignVariableFactory.GetPhreaticLevelExit(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(pipingInput); // Assert Assert.AreSame(pipingInput.PhreaticLevelExit, phreaticLevelExit.Distribution); @@ -217,7 +217,7 @@ public void GetDampingFactorExit_PipingInputNull_ThrowsArgumentNullException() { // Call - void Call() => PipingDesignVariableFactory.GetDampingFactorExit(null); + void Call() => SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(null); // Assert var exception = Assert.Throws(Call); @@ -232,7 +232,7 @@ // Call DesignVariable dampingFactorExit = - PipingDesignVariableFactory.GetDampingFactorExit(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(pipingInput); // Assert Assert.AreSame(pipingInput.DampingFactorExit, dampingFactorExit.Distribution); @@ -251,7 +251,7 @@ // Call VariationCoefficientDesignVariable seepageLength = - PipingDesignVariableFactory.GetSeepageLength(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetSeepageLength(pipingInput); // Assert DistributionAssert.AreEqual(DerivedPipingInput.GetSeepageLength(pipingInput), seepageLength.Distribution); @@ -266,7 +266,7 @@ // Call VariationCoefficientDesignVariable d70 = - PipingDesignVariableFactory.GetDiameter70(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetDiameter70(pipingInput); // Assert DistributionAssert.AreEqual(DerivedPipingInput.GetDiameterD70(pipingInput), d70.Distribution); @@ -281,7 +281,7 @@ // Call VariationCoefficientDesignVariable darcyPermeability = - PipingDesignVariableFactory.GetDarcyPermeability(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetDarcyPermeability(pipingInput); // Assert DistributionAssert.AreEqual(DerivedPipingInput.GetDarcyPermeability(pipingInput), darcyPermeability.Distribution); @@ -300,7 +300,7 @@ // Call DesignVariable saturatedVolumicWeightOfCoverageLayer = - PipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(pipingInput); // Assert DistributionAssert.AreEqual(DerivedPipingInput.GetSaturatedVolumicWeightOfCoverageLayer(pipingInput), @@ -316,7 +316,7 @@ // Call DesignVariable saturatedVolumicWeightOfCoverageLayer = - PipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(pipingInput); // Assert Assert.IsInstanceOf>(saturatedVolumicWeightOfCoverageLayer); @@ -333,7 +333,7 @@ // Call DesignVariable thicknessAquiferLayer = - PipingDesignVariableFactory.GetThicknessAquiferLayer(pipingInput); + SemiProbabilisticPipingDesignVariableFactory.GetThicknessAquiferLayer(pipingInput); // Assert DistributionAssert.AreEqual(DerivedPipingInput.GetThicknessAquiferLayer(pipingInput), thicknessAquiferLayer.Distribution); Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs =================================================================== diff -u -rf3a22e965840f48f13164066b4d5999e97b464b9 -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs (.../DerivedSemiProbabilisticPipingInputTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) +++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/SemiProbabilistic/DerivedSemiProbabilisticPipingInputTest.cs (.../DerivedSemiProbabilisticPipingInputTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -66,9 +66,9 @@ PiezoHeadCalculatorStub piezometricHeadAtExitCalculator = factory.LastCreatedPiezometricHeadAtExitCalculator; Assert.AreEqual(assessmentLevel, piezometricHeadAtExitCalculator.HRiver, assessmentLevel.GetAccuracy()); - Assert.AreEqual(PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder, + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder, input.PhreaticLevelExit.GetAccuracy()); - Assert.AreEqual(PipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit, + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit, input.DampingFactorExit.GetAccuracy()); } } Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs =================================================================== diff -u -rf3a22e965840f48f13164066b4d5999e97b464b9 -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision f3a22e965840f48f13164066b4d5999e97b464b9) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PropertyClasses/PipingFailureMechanismPropertiesTest.cs (.../PipingFailureMechanismPropertiesTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -144,19 +144,19 @@ Assert.AreEqual(generalInput.UpliftModelFactor.Mean, properties.UpliftModelFactor.Mean); Assert.AreEqual(generalInput.UpliftModelFactor.StandardDeviation, properties.UpliftModelFactor.StandardDeviation); - Assert.AreEqual(PipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalInput).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalInput).GetDesignValue(), properties.UpliftModelFactor.DesignValue); Assert.AreEqual(generalInput.SellmeijerModelFactor.Mean, properties.SellmeijerModelFactor.Mean); Assert.AreEqual(generalInput.SellmeijerModelFactor.StandardDeviation, properties.SellmeijerModelFactor.StandardDeviation); - Assert.AreEqual(PipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalInput).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalInput).GetDesignValue(), properties.SellmeijerModelFactor.DesignValue); Assert.AreEqual(generalInput.WaterVolumetricWeight, properties.WaterVolumetricWeight); Assert.AreEqual(generalInput.CriticalHeaveGradient.Mean, properties.CriticalHeaveGradient.Mean); Assert.AreEqual(generalInput.CriticalHeaveGradient.StandardDeviation, properties.CriticalHeaveGradient.StandardDeviation); - Assert.AreEqual(PipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalInput).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalInput).GetDesignValue(), properties.CriticalHeaveGradient.DesignValue); Assert.AreEqual(generalInput.SandParticlesVolumicWeight, properties.SandParticlesVolumicWeight); Index: Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -reae69b123306053f63d3ea36e7d341aa10f693ce -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision eae69b123306053f63d3ea36e7d341aa10f693ce) +++ Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -71,7 +71,7 @@ PipingInput input = invalidPipingCalculation.InputParameters; double result = InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile); @@ -122,7 +122,7 @@ // Call double thickness = InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile); @@ -167,7 +167,7 @@ // Call double thickness = InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), input.ExitPointL, input.SurfaceLine, input.StochasticSoilProfile.SoilProfile); @@ -185,8 +185,8 @@ // Call double result = InputParameterCalculationService.CalculatePiezometricHeadAtExit( (RoundedDouble) 0.0, - PipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), - PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); + SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), + SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); // Assert Assert.IsFalse(double.IsNaN(result)); @@ -208,7 +208,7 @@ PipingInput inputParameters = validPipingCalculation.InputParameters; InputParameterCalculationService.CalculateEffectiveThicknessCoverageLayer( generalInput.WaterVolumetricWeight, - PipingDesignVariableFactory.GetPhreaticLevelExit(inputParameters).GetDesignValue(), + SemiProbabilisticPipingDesignVariableFactory.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(PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), effectiveThicknessCalculator.PhreaticLevel, input.PhreaticLevelExit.GetAccuracy()); AssertEqualSoilProfiles(input.StochasticSoilProfile.SoilProfile, effectiveThicknessCalculator.SoilProfile); @@ -242,18 +242,18 @@ // Call InputParameterCalculationService.CalculatePiezometricHeadAtExit( assessmentLevel, - PipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), - PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); + SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), + SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue()); // Assert var testFactory = (TestPipingSubCalculatorFactory) PipingSubCalculatorFactory.Instance; PiezoHeadCalculatorStub piezometricHeadAtExitCalculator = testFactory.LastCreatedPiezometricHeadAtExitCalculator; Assert.AreEqual(assessmentLevel.Value, piezometricHeadAtExitCalculator.HRiver); - Assert.AreEqual(PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.PhiPolder, input.PhreaticLevelExit.GetAccuracy()); - Assert.AreEqual(PipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(), piezometricHeadAtExitCalculator.RExit, input.DampingFactorExit.GetAccuracy()); } Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs =================================================================== diff -u -rff0f25c130d9f23881225bd6d8c3f8d09d8b1fd5 -r50fc44e69b51ad706efee43e50cd38796c4fc2ae --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision ff0f25c130d9f23881225bd6d8c3f8d09d8b1fd5) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision 50fc44e69b51ad706efee43e50cd38796c4fc2ae) @@ -63,53 +63,53 @@ UpliftCalculatorStub upliftCalculator = testFactory.LastCreatedUpliftCalculator; SellmeijerCalculatorStub sellmeijerCalculator = testFactory.LastCreatedSellmeijerCalculator; - RoundedDouble expectedThicknessCoverageLayerDesignValue = PipingDesignVariableFactory.GetThicknessCoverageLayer(input).GetDesignValue(); + RoundedDouble expectedThicknessCoverageLayerDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetThicknessCoverageLayer(input).GetDesignValue(); double thicknessCoverageLayerAccuracy = DerivedPipingInput.GetThicknessCoverageLayer(input).GetAccuracy(); - RoundedDouble expectedPhreaticLevelExitDesignValue = PipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); + RoundedDouble expectedPhreaticLevelExitDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetPhreaticLevelExit(input).GetDesignValue(); double phreaticLevelExitDesignAccuracy = input.PhreaticLevelExit.GetAccuracy(); double expectedPiezometricHeadExit = DerivedSemiProbabilisticPipingInput.GetPiezometricHeadExit(input, expectedAssessmentLevel).Value; - RoundedDouble expectedDampingFactorExitDesignValue = PipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(); + RoundedDouble expectedDampingFactorExitDesignValue = SemiProbabilisticPipingDesignVariableFactory.GetDampingFactorExit(input).GetDesignValue(); double dampingFactorExitAccuracy = input.DampingFactorExit.GetAccuracy(); Assert.AreEqual(expectedThicknessCoverageLayerDesignValue, heaveCalculator.DTotal, thicknessCoverageLayerAccuracy); Assert.AreEqual(expectedPhreaticLevelExitDesignValue, heaveCalculator.HExit, phreaticLevelExitDesignAccuracy); - Assert.AreEqual(PipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalPipingInput).GetDesignValue(), heaveCalculator.Ich); + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetCriticalHeaveGradientDesignVariable(generalPipingInput).GetDesignValue(), heaveCalculator.Ich); Assert.AreEqual(expectedPhreaticLevelExitDesignValue, heaveCalculator.PhiPolder, phreaticLevelExitDesignAccuracy); Assert.AreEqual(expectedPiezometricHeadExit, heaveCalculator.PhiExit); Assert.AreEqual(expectedDampingFactorExitDesignValue, heaveCalculator.RExit, dampingFactorExitAccuracy); Assert.AreEqual(expectedPhreaticLevelExitDesignValue, upliftCalculator.HExit, phreaticLevelExitDesignAccuracy); Assert.AreEqual(expectedAssessmentLevel, upliftCalculator.HRiver); - Assert.AreEqual(PipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalPipingInput).GetDesignValue(), upliftCalculator.ModelFactorUplift); + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetUpliftModelFactorDesignVariable(generalPipingInput).GetDesignValue(), upliftCalculator.ModelFactorUplift); Assert.AreEqual(expectedPiezometricHeadExit, upliftCalculator.PhiExit); Assert.AreEqual(expectedPhreaticLevelExitDesignValue, upliftCalculator.PhiPolder, phreaticLevelExitDesignAccuracy); Assert.AreEqual(expectedDampingFactorExitDesignValue, upliftCalculator.RExit, dampingFactorExitAccuracy); Assert.AreEqual(generalPipingInput.WaterVolumetricWeight, upliftCalculator.VolumetricWeightOfWater); - RoundedDouble effectiveThickness = PipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(input, generalPipingInput).GetDesignValue(); - RoundedDouble saturatedVolumicWeight = PipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(input).GetDesignValue(); + RoundedDouble effectiveThickness = SemiProbabilisticPipingDesignVariableFactory.GetEffectiveThicknessCoverageLayer(input, generalPipingInput).GetDesignValue(); + RoundedDouble saturatedVolumicWeight = SemiProbabilisticPipingDesignVariableFactory.GetSaturatedVolumicWeightOfCoverageLayer(input).GetDesignValue(); RoundedDouble expectedEffectiveStress = effectiveThickness * (saturatedVolumicWeight - generalPipingInput.WaterVolumetricWeight); Assert.AreEqual(expectedEffectiveStress, upliftCalculator.EffectiveStress, expectedEffectiveStress.GetAccuracy()); - Assert.AreEqual(PipingDesignVariableFactory.GetSeepageLength(input).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetSeepageLength(input).GetDesignValue(), sellmeijerCalculator.SeepageLength, DerivedPipingInput.GetSeepageLength(input).GetAccuracy()); Assert.AreEqual(expectedPhreaticLevelExitDesignValue, sellmeijerCalculator.HExit, phreaticLevelExitDesignAccuracy); Assert.AreEqual(expectedAssessmentLevel, sellmeijerCalculator.HRiver); Assert.AreEqual(generalPipingInput.WaterKinematicViscosity, sellmeijerCalculator.KinematicViscosityWater); - Assert.AreEqual(PipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalPipingInput).GetDesignValue(), sellmeijerCalculator.ModelFactorPiping); + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetSellmeijerModelFactorDesignVariable(generalPipingInput).GetDesignValue(), sellmeijerCalculator.ModelFactorPiping); Assert.AreEqual(generalPipingInput.SellmeijerReductionFactor, sellmeijerCalculator.Rc); Assert.AreEqual(generalPipingInput.WaterVolumetricWeight, sellmeijerCalculator.VolumetricWeightOfWater); Assert.AreEqual(generalPipingInput.WhitesDragCoefficient, sellmeijerCalculator.WhitesDragCoefficient); Assert.AreEqual(generalPipingInput.BeddingAngle, sellmeijerCalculator.BeddingAngle); Assert.AreEqual(expectedThicknessCoverageLayerDesignValue, sellmeijerCalculator.DTotal, thicknessCoverageLayerAccuracy); - Assert.AreEqual(PipingDesignVariableFactory.GetDiameter70(input).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetDiameter70(input).GetDesignValue(), sellmeijerCalculator.D70, DerivedPipingInput.GetDiameterD70(input).GetAccuracy()); Assert.AreEqual(generalPipingInput.MeanDiameter70, sellmeijerCalculator.D70Mean); - Assert.AreEqual(PipingDesignVariableFactory.GetThicknessAquiferLayer(input).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetThicknessAquiferLayer(input).GetDesignValue(), sellmeijerCalculator.DAquifer, DerivedPipingInput.GetThicknessAquiferLayer(input).GetAccuracy()); - Assert.AreEqual(PipingDesignVariableFactory.GetDarcyPermeability(input).GetDesignValue(), + Assert.AreEqual(SemiProbabilisticPipingDesignVariableFactory.GetDarcyPermeability(input).GetDesignValue(), sellmeijerCalculator.DarcyPermeability, DerivedPipingInput.GetDarcyPermeability(input).GetAccuracy()); Assert.AreEqual(generalPipingInput.SandParticlesVolumicWeight, sellmeijerCalculator.GammaSubParticles);