Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PipingCalculationConfigurationHelper.cs =================================================================== diff -u -rdf188723f1fabd472a239cf1681b8682a654bc0a -r0cd788f660b6cea84656a2b98279b9d728b81e5d --- Riskeer/Piping/src/Riskeer.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision df188723f1fabd472a239cf1681b8682a654bc0a) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PipingCalculationConfigurationHelper.cs (.../PipingCalculationConfigurationHelper.cs) (revision 0cd788f660b6cea84656a2b98279b9d728b81e5d) @@ -142,7 +142,7 @@ if (generateProbabilistic) { calculationGroup.Children.Add( - CreateProbabilisticPipingCalculation( + CreateProbabilisticPipingCalculationScenario( surfaceLine, stochasticSoilModel, soilProfile, calculationGroup.Children.OfType())); } @@ -172,22 +172,23 @@ }; } - private static ProbabilisticPipingCalculation CreateProbabilisticPipingCalculation( + private static ProbabilisticPipingCalculationScenario CreateProbabilisticPipingCalculationScenario( PipingSurfaceLine surfaceLine, PipingStochasticSoilModel stochasticSoilModel, PipingStochasticSoilProfile stochasticSoilProfile, IEnumerable calculations) { var nameBase = $"{surfaceLine.Name} {stochasticSoilProfile}"; string name = NamingHelper.GetUniqueName(calculations, nameBase, c => c.Name); - return new ProbabilisticPipingCalculation + return new ProbabilisticPipingCalculationScenario { Name = name, InputParameters = { SurfaceLine = surfaceLine, StochasticSoilModel = stochasticSoilModel, StochasticSoilProfile = stochasticSoilProfile - } + }, + Contribution = (RoundedDouble) stochasticSoilProfile.Probability }; } } Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r8c4d35d0b96951a340d4ba22d2671284918188b9 -r0cd788f660b6cea84656a2b98279b9d728b81e5d --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 8c4d35d0b96951a340d4ba22d2671284918188b9) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 0cd788f660b6cea84656a2b98279b9d728b81e5d) @@ -925,7 +925,7 @@ Resources.CalculationGroup_Add_ProbabilisticCalculation, Resources.CalculationGroup_Add_ProbabilisticCalculation_ToolTip, RiskeerCommonFormsResources.ProbabilisticCalculationIcon, - (sender, args) => AddCalculation(() => new ProbabilisticPipingCalculation(), context.WrappedData)); + (sender, args) => AddCalculation(() => new ProbabilisticPipingCalculationScenario(), context.WrappedData)); } private static void AddCalculation(Func> createCalculationFunc, CalculationGroup parentGroup) Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -rdf188723f1fabd472a239cf1681b8682a654bc0a -r0cd788f660b6cea84656a2b98279b9d728b81e5d --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision df188723f1fabd472a239cf1681b8682a654bc0a) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 0cd788f660b6cea84656a2b98279b9d728b81e5d) @@ -464,7 +464,7 @@ if (generateProbabilistic) { - ProbabilisticPipingCalculation[] probabilisticCalculations = calculationGroup.Children.OfType().ToArray(); + ProbabilisticPipingCalculationScenario[] probabilisticCalculations = calculationGroup.Children.OfType().ToArray(); Assert.AreEqual(2, probabilisticCalculations.Length); AssertCalculationScenario(probabilisticCalculations[0], soilProfile1, surfaceLine); @@ -613,7 +613,7 @@ if (generateProbabilistic) { - ProbabilisticPipingCalculation[] probabilisticCalculations = calculationGroup.Children.OfType().ToArray(); + ProbabilisticPipingCalculationScenario[] probabilisticCalculations = calculationGroup.Children.OfType().ToArray(); Assert.AreEqual(2, probabilisticCalculations.Length); AssertCalculationScenario(probabilisticCalculations[0], soilProfile1, surfaceLine); @@ -713,12 +713,12 @@ if (generateProbabilistic) { - ProbabilisticPipingCalculation[] probabilisticCalculationsGroup1 = calculationGroup1.Children.OfType().ToArray(); + ProbabilisticPipingCalculationScenario[] probabilisticCalculationsGroup1 = calculationGroup1.Children.OfType().ToArray(); Assert.AreEqual(2, probabilisticCalculationsGroup1.Length); AssertCalculationScenario(probabilisticCalculationsGroup1[0], soilProfile1, surfaceLine1); AssertCalculationScenario(probabilisticCalculationsGroup1[1], soilProfile2, surfaceLine1); - ProbabilisticPipingCalculation[] probabilisticCalculationsGroup2 = calculationGroup2.Children.OfType().ToArray(); + ProbabilisticPipingCalculationScenario[] probabilisticCalculationsGroup2 = calculationGroup2.Children.OfType().ToArray(); Assert.AreEqual(1, probabilisticCalculationsGroup2.Length); AssertCalculationScenario(probabilisticCalculationsGroup2[0], soilProfile2, surfaceLine2); } @@ -813,9 +813,9 @@ CollectionAssert.AllItemsAreInstancesOfType(calculationGroup1.Children, typeof(IPipingCalculation)); AssertCalculationScenario((SemiProbabilisticPipingCalculationScenario) calculationGroup1.Children[0], soilProfile1, surfaceLine1); - AssertCalculationScenario((ProbabilisticPipingCalculation) calculationGroup1.Children[1], soilProfile1, surfaceLine1); + AssertCalculationScenario((ProbabilisticPipingCalculationScenario) calculationGroup1.Children[1], soilProfile1, surfaceLine1); AssertCalculationScenario((SemiProbabilisticPipingCalculationScenario) calculationGroup1.Children[2], soilProfile2, surfaceLine1); - AssertCalculationScenario((ProbabilisticPipingCalculation) calculationGroup1.Children[3], soilProfile2, surfaceLine1); + AssertCalculationScenario((ProbabilisticPipingCalculationScenario) calculationGroup1.Children[3], soilProfile2, surfaceLine1); } [Test] @@ -872,9 +872,9 @@ var group = (CalculationGroup) result.First(sl => sl.Name == surfaceLine.Name); var semiProbabilisticCalculationScenario1 = (SemiProbabilisticPipingCalculationScenario) group.Children[0]; - var probabilisticCalculation1 = (ProbabilisticPipingCalculation) group.Children[1]; + var probabilisticCalculation1 = (ProbabilisticPipingCalculationScenario) group.Children[1]; var semiProbabilisticCalculationScenario2 = (SemiProbabilisticPipingCalculationScenario) group.Children[2]; - var probabilisticCalculation2 = (ProbabilisticPipingCalculation) group.Children[3]; + var probabilisticCalculation2 = (ProbabilisticPipingCalculationScenario) group.Children[3]; Assert.AreEqual($"{surfaceLine.Name} {soilProfile1.Name}", semiProbabilisticCalculationScenario1.Name); Assert.AreEqual($"{surfaceLine.Name} {soilProfile1.Name}", probabilisticCalculation1.Name); @@ -942,11 +942,11 @@ var group = (CalculationGroup) result.First(sl => sl.Name == surfaceLine.Name); var semiProbabilisticPipingCalculationScenario1 = (SemiProbabilisticPipingCalculationScenario) group.Children[0]; - var probabilisticPipingCalculation1 = (ProbabilisticPipingCalculation) group.Children[1]; + var probabilisticPipingCalculation1 = (ProbabilisticPipingCalculationScenario) group.Children[1]; var semiProbabilisticPipingCalculationScenario2 = (SemiProbabilisticPipingCalculationScenario) group.Children[2]; - var probabilisticPipingCalculation2 = (ProbabilisticPipingCalculation) group.Children[3]; + var probabilisticPipingCalculation2 = (ProbabilisticPipingCalculationScenario) group.Children[3]; var semiProbabilisticPipingCalculationScenario3 = (SemiProbabilisticPipingCalculationScenario) group.Children[4]; - var probabilisticPipingCalculation3 = (ProbabilisticPipingCalculation) group.Children[5]; + var probabilisticPipingCalculation3 = (ProbabilisticPipingCalculationScenario) group.Children[5]; Assert.AreEqual($"{surfaceLine.Name} {soilProfile1.Name}", semiProbabilisticPipingCalculationScenario1.Name); Assert.AreEqual($"{surfaceLine.Name} {soilProfile1.Name}", probabilisticPipingCalculation1.Name); @@ -972,7 +972,7 @@ Assert.AreSame(stochasticSoilProfile, input.StochasticSoilProfile); Assert.AreSame(surfaceLine, input.SurfaceLine); - if (calculationScenario is SemiProbabilisticPipingCalculationScenario semiProbabilisticPipingCalculationScenario) + if (calculationScenario is ICalculationScenario semiProbabilisticPipingCalculationScenario) { Assert.AreEqual((RoundedDouble) stochasticSoilProfile.Probability, semiProbabilisticPipingCalculationScenario.Contribution); }