Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs
===================================================================
diff -u -rdf1a90382c0fed0db059d0fd4d533ca3c8c8304b -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision df1a90382c0fed0db059d0fd4d533ca3c8c8304b)
+++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/AssessmentSectionTreeNodeInfoTest.cs (.../AssessmentSectionTreeNodeInfoTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -693,7 +693,7 @@
private static void AddPipingCalculationScenario(AssessmentSection assessmentSection,
HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
pipingCalculationScenario.InputParameters.UseAssessmentLevelManualInput = true;
pipingCalculationScenario.InputParameters.AssessmentLevel = new Random(39).NextRoundedDouble();
assessmentSection.Piping.CalculationsGroup.Children.Add(pipingCalculationScenario);
Index: Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs
===================================================================
diff -u -r0a471fe7dc7ab650097ee062f19961e8801d253c -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 0a471fe7dc7ab650097ee062f19961e8801d253c)
+++ Riskeer/Integration/test/Riskeer.Integration.Service.Test/AssessmentSectionCalculationActivityFactoryTest.cs (.../AssessmentSectionCalculationActivityFactoryTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -313,7 +313,7 @@
private static void AddSemiProbabilisticPipingCalculationScenario(AssessmentSection assessmentSection,
HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
- SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario pipingCalculationScenario = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
pipingCalculationScenario.InputParameters.UseAssessmentLevelManualInput = true;
pipingCalculationScenario.InputParameters.AssessmentLevel = new Random(39).NextRoundedDouble();
assessmentSection.Piping.CalculationsGroup.Children.Add(pipingCalculationScenario);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs
===================================================================
diff -u -ra9d9138b73c38022ecb110a4a5ca573c8dd6dc71 -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision a9d9138b73c38022ecb110a4a5ca573c8dd6dc71)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.Test/PipingFailureMechanismAssemblyFactoryTest.cs (.../PipingFailureMechanismAssemblyFactoryTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -286,7 +286,7 @@
sectionResult,
new[]
{
- SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
},
failureMechanism,
assessmentSection);
@@ -323,7 +323,7 @@
sectionResult,
new[]
{
- SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
},
failureMechanism,
assessmentSection);
Index: Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs
===================================================================
diff -u -r3882e557378ddb85e62cbcb91a7db28c86a6412b -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs (.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs) (revision 3882e557378ddb85e62cbcb91a7db28c86a6412b)
+++ Riskeer/Piping/test/Riskeer.Piping.Data.TestUtil/SemiProbabilisticPipingCalculationScenarioTestFactory.cs (.../SemiProbabilisticPipingCalculationScenarioTestFactory.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -26,6 +26,7 @@
using Riskeer.Common.Data.FailureMechanism;
using Riskeer.Common.Data.Hydraulics;
using Riskeer.Common.Data.Probabilistics;
+using Riskeer.Piping.Data.Probabilistic;
using Riskeer.Piping.Data.SemiProbabilistic;
using Riskeer.Piping.Data.SoilProfile;
using Riskeer.Piping.Primitives;
@@ -152,7 +153,7 @@
/// The caller is responsible for actually providing a valid hydraulic boundary location
/// (for instance when it comes to the presence of a normative assessment level).
/// Throw when is null.
- public static SemiProbabilisticPipingCalculationScenario CreatePipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+ public static SemiProbabilisticPipingCalculationScenario CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
if (hydraulicBoundaryLocation == null)
{
@@ -178,6 +179,40 @@
};
}
+ ///
+ /// Creates a probabilistic calculation scenario with valid input.
+ ///
+ /// The hydraulic boundary location to set to the input.
+ /// A new .
+ /// The caller is responsible for actually providing a valid hydraulic boundary location
+ /// (for instance when it comes to the presence of a normative assessment level).
+ /// Throw when is null.
+ public static ProbabilisticPipingCalculationScenario CreateProbabilisticPipingCalculationScenarioWithValidInput(HydraulicBoundaryLocation hydraulicBoundaryLocation)
+ {
+ if (hydraulicBoundaryLocation == null)
+ {
+ throw new ArgumentNullException(nameof(hydraulicBoundaryLocation));
+ }
+
+ return new ProbabilisticPipingCalculationScenario
+ {
+ InputParameters =
+ {
+ DampingFactorExit =
+ {
+ Mean = (RoundedDouble) 1.0
+ },
+ PhreaticLevelExit =
+ {
+ Mean = (RoundedDouble) 2.0
+ },
+ SurfaceLine = GetSurfaceLine(),
+ StochasticSoilProfile = GetStochasticSoilProfile(),
+ HydraulicBoundaryLocation = hydraulicBoundaryLocation
+ }
+ };
+ }
+
private static PipingSurfaceLine GetSurfaceLine()
{
var surfaceLine = new PipingSurfaceLine(string.Empty);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs
===================================================================
diff -u -r9d81fce2b4838979d13c48cf0adc054fb240625a -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision 9d81fce2b4838979d13c48cf0adc054fb240625a)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -173,8 +173,8 @@
public void CreateCalculationFeatures_GivenCalculations_ReturnsCalculationFeaturesCollection()
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 5.0, 4.0));
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8));
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 5.0, 4.0));
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new HydraulicBoundaryLocation(1, string.Empty, 2.2, 3.8));
calculationA.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 3.0);
calculationB.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 4.0);
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs
===================================================================
diff -u -r26de1bc54f52fb6497c5df5b4227fdf1ee72b76d -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision 26de1bc54f52fb6497c5df5b4227fdf1ee72b76d)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -291,7 +291,7 @@
public void EntryPointL_EntryPointNotBeforeExitPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue)
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
var entryPointL = (RoundedDouble) newValue;
// Call & Assert
@@ -305,7 +305,7 @@
public void EntryPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers()
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
var entryPointL = (RoundedDouble) (-3.0);
// Call & Assert
@@ -318,7 +318,7 @@
public void ExitPointL_OnValidChange_NotifyObserverAndCalculationPropertyChanged()
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
var exitPointL = (RoundedDouble) 0.3;
// Call & Assert
@@ -352,7 +352,7 @@
public void ExitPointL_ExitPointNotBeyondEntryPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue)
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
var exitPointL = (RoundedDouble) newValue;
// Call & Assert
@@ -366,7 +366,7 @@
public void ExitPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers()
{
// Setup
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
var exitPointL = (RoundedDouble) 3.0;
// Call & Assert
@@ -417,7 +417,7 @@
SemiProbabilisticPipingOutput assignedOutput = null;
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
if (hasOutput)
{
assignedOutput = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs
===================================================================
diff -u -ra9d9138b73c38022ecb110a4a5ca573c8dd6dc71 -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision a9d9138b73c38022ecb110a4a5ca573c8dd6dc71)
+++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -212,9 +212,9 @@
var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(1, "test", 1.0, 2.0);
var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(2, "test", 3.0, 4.0);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation1);
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation1);
calculationA.InputParameters.SurfaceLine = surfaceLineA;
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation2);
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation2);
calculationB.InputParameters.SurfaceLine = surfaceLineB;
failureMechanism.CalculationsGroup.Children.Add(calculationA);
failureMechanism.CalculationsGroup.Children.Add(calculationB);
@@ -619,10 +619,10 @@
surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3);
surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
calculationA.InputParameters.SurfaceLine = surfaceLineA;
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
calculationB.InputParameters.SurfaceLine = surfaceLineB;
failureMechanism.CalculationsGroup.Children.Add(calculationA);
@@ -668,7 +668,7 @@
surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3);
surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
calculationA.InputParameters.SurfaceLine = surfaceLineA;
var failureMechanism = new PipingFailureMechanism();
@@ -719,7 +719,7 @@
surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3);
surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
calculationA.InputParameters.SurfaceLine = surfaceLineA;
var failureMechanism = new PipingFailureMechanism();
@@ -841,7 +841,7 @@
surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3);
surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
calculationA.InputParameters.SurfaceLine = surfaceLineA;
var failureMechanism = new PipingFailureMechanism();
Index: Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs
===================================================================
diff -u -r46a713c40ee453fff3441a9b4b4d8424abcb2d2c -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 46a713c40ee453fff3441a9b4b4d8424abcb2d2c)
+++ Riskeer/Piping/test/Riskeer.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -46,7 +46,7 @@
public static void CalculateEffectiveThicknessCoverageLayer_InvalidPipingCalculationWithOutput_ReturnsNaN()
{
// Setup
- SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation invalidPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
// Make invalid by having surface line partially above soil profile:
double highestLevelSurfaceLine = invalidPipingCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
@@ -193,7 +193,7 @@
public static void CalculateEffectiveThicknessCoverageLayer_CompleteInput_InputSetOnSubCalculator()
{
// Setup
- SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
PipingInput input = validPipingCalculation.InputParameters;
var generalInput = new GeneralPipingInput();
@@ -227,7 +227,7 @@
{
// Setup
RoundedDouble assessmentLevel = new Random(21).NextRoundedDouble();
- SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
PipingInput input = validPipingCalculation.InputParameters;
using (new PipingSubCalculatorFactoryConfig())
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -ra25fe5a8b4c557ccc5c5aef62b9580dfe1503f8c -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision a25fe5a8b4c557ccc5c5aef62b9580dfe1503f8c)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -611,7 +611,7 @@
{
Children =
{
- SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
}
};
@@ -1128,7 +1128,7 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
validCalculation.Name = "A";
SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
invalidCalculation.Name = "B";
@@ -1201,9 +1201,9 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
calculationA.Name = "A";
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
calculationB.Name = "B";
var childGroup = new CalculationGroup();
@@ -1298,11 +1298,11 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculation1 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculation1 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
calculation1.Name = "A";
calculation1.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
calculation1.Attach(calculation1Observer);
- SemiProbabilisticPipingCalculationScenario calculation2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculation2 = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
calculation2.Name = "B";
calculation2.Output = PipingTestDataGenerator.GetRandomSemiProbabilisticPipingOutput();
calculation2.Attach(calculation2Observer);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rfbbcb30a2f475ee2a8f2055e741e91713f266720 -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision fbbcb30a2f475ee2a8f2055e741e91713f266720)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -495,7 +495,7 @@
{
Children =
{
- SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
+ SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation)
}
}
};
@@ -624,7 +624,7 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario validCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
validCalculation.Name = "A";
SemiProbabilisticPipingCalculationScenario invalidCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput();
invalidCalculation.Name = "B";
@@ -676,9 +676,9 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationA = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
calculationA.Name = "A";
- SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculationB = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
calculationB.Name = "B";
failureMechanism.CalculationsGroup.Children.Add(calculationA);
Index: Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r490929182a0591342757f3c949e99699cf810a5f -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 490929182a0591342757f3c949e99699cf810a5f)
+++ Riskeer/Piping/test/Riskeer.Piping.Plugin.Test/TreeNodeInfos/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs (.../SemiProbabilisticPipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -938,7 +938,7 @@
hydraulicBoundaryLocation
}, true);
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
var pipingCalculationScenarioContext = new SemiProbabilisticPipingCalculationScenarioContext(calculation,
new CalculationGroup(),
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs
===================================================================
diff -u -r30aa8c16347937a530c57c8248f8a68300b1dbc1 -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 30aa8c16347937a530c57c8248f8a68300b1dbc1)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/PipingCalculationActivityFactoryTest.cs (.../PipingCalculationActivityFactoryTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -322,7 +322,7 @@
private static SemiProbabilisticPipingCalculationScenario CreateValidCalculation(HydraulicBoundaryLocation hydraulicBoundaryLocation)
{
- SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
+ SemiProbabilisticPipingCalculationScenario calculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(hydraulicBoundaryLocation);
calculation.InputParameters.ExitPointL = new Random(39).NextRoundedDouble(0.5, 1.0);
return calculation;
}
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs
===================================================================
diff -u -r03caee62b9fd1898e21596d9c3f67593654bba24 -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs (.../SemiProbabilisticPipingCalculationActivityTest.cs) (revision 03caee62b9fd1898e21596d9c3f67593654bba24)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationActivityTest.cs (.../SemiProbabilisticPipingCalculationActivityTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -108,7 +108,7 @@
public void Run_ValidPipingCalculation_PerformPipingValidationAndCalculationAndLogStartAndEnd()
{
// Setup
- SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
var activity = new SemiProbabilisticPipingCalculationActivity(validPipingCalculation,
new GeneralPipingInput(),
@@ -141,7 +141,7 @@
observer.Expect(o => o.UpdateObserver());
mocks.ReplayAll();
- SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ SemiProbabilisticPipingCalculation validPipingCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
validPipingCalculation.Output = null;
validPipingCalculation.Attach(observer);
Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -r28d044cf5ca746ffb65a20c9c0d28145294ce012 -r6035fafb6e89b1e7fad8c40cdfb944565764f593
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision 28d044cf5ca746ffb65a20c9c0d28145294ce012)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/SemiProbabilistic/SemiProbabilisticPipingCalculationServiceTest.cs (.../SemiProbabilisticPipingCalculationServiceTest.cs) (revision 6035fafb6e89b1e7fad8c40cdfb944565764f593)
@@ -47,12 +47,12 @@
{
private const string averagingSoilLayerPropertiesMessage = "Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaardafwijkingen en verschuivingen voor alle lagen gelijk zijn.";
private double testSurfaceLineTopLevel;
- private SemiProbabilisticPipingCalculationScenario testCalculation;
+ private SemiProbabilisticPipingCalculation testCalculation;
[SetUp]
public void Setup()
{
- testCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
+ testCalculation = SemiProbabilisticPipingCalculationScenarioTestFactory.CreateSemiProbabilisticPipingCalculationScenarioWithValidInput(new TestHydraulicBoundaryLocation());
testSurfaceLineTopLevel = testCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z);
}
@@ -710,21 +710,21 @@
var random = new Random(21);
var incompletePipingSoilLayer = new PipingSoilLayer(testSurfaceLineTopLevel)
{
- IsAquifer = false
+ IsAquifer = false,
+ BelowPhreaticLevel = new LogNormalDistribution
+ {
+ Mean = meanSet
+ ? random.NextRoundedDouble(1, double.MaxValue)
+ : RoundedDouble.NaN,
+ StandardDeviation = deviationSet
+ ? random.NextRoundedDouble()
+ : RoundedDouble.NaN,
+ Shift = shiftSet
+ ? random.NextRoundedDouble()
+ : RoundedDouble.NaN
+ }
};
- incompletePipingSoilLayer.BelowPhreaticLevel = new LogNormalDistribution
- {
- Mean = meanSet
- ? random.NextRoundedDouble(1, double.MaxValue)
- : RoundedDouble.NaN,
- StandardDeviation = deviationSet
- ? random.NextRoundedDouble()
- : RoundedDouble.NaN,
- Shift = shiftSet
- ? random.NextRoundedDouble()
- : RoundedDouble.NaN
- };
var completeLayer = new PipingSoilLayer(5.0)
{