Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r3eb1b43c00e737cda3714c4ee8a32769eb0ef866 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 3eb1b43c00e737cda3714c4ee8a32769eb0ef866) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -1028,8 +1028,7 @@ StandardDeviation = (RoundedDouble) 15.15 } }, - Output = null, - SemiProbabilisticOutput = null + Output = null }); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs =================================================================== diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision 07f3d67fe9512b3c8303ff09398b0a234900d546) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -55,18 +55,13 @@ /// public PipingOutput Output { get; set; } - /// - /// Gets or sets the semi-probabilistic calculation result. - /// - public PipingSemiProbabilisticOutput SemiProbabilisticOutput { get; set; } - public string Name { get; set; } public bool HasOutput { get { - return Output != null || SemiProbabilisticOutput != null; + return Output != null; } } @@ -75,7 +70,6 @@ public void ClearOutput() { Output = null; - SemiProbabilisticOutput = null; } public override object Clone() @@ -90,11 +84,6 @@ clone.Output = (PipingOutput) Output.Clone(); } - if (SemiProbabilisticOutput != null) - { - clone.SemiProbabilisticOutput = (PipingSemiProbabilisticOutput) SemiProbabilisticOutput.Clone(); - } - return clone; } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs =================================================================== diff -u -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationTest.cs (.../PipingCalculationTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -60,7 +60,6 @@ Assert.IsFalse(calculation.HasOutput); Assert.IsNull(calculation.Comments.Body); Assert.IsNull(calculation.Output); - Assert.IsNull(calculation.SemiProbabilisticOutput); } [Test] @@ -166,31 +165,28 @@ } [Test] - public void ClearOutput_Always_SetsOutputAndSemiProbabilisticOutputToNull() + public void ClearOutput_Always_SetsOutputToNull() { // Setup var calculation = new PipingCalculation(new GeneralPipingInput()) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; // Call calculation.ClearOutput(); // Assert Assert.IsNull(calculation.Output); - Assert.IsNull(calculation.SemiProbabilisticOutput); } [Test] - public void HasOutput_OutputAndSemiProbabilisticOutputNull_ReturnsFalse() + public void HasOutput_OutputNull_ReturnsFalse() { // Setup var calculation = new PipingCalculation(new GeneralPipingInput()) { - Output = null, - SemiProbabilisticOutput = null + Output = null }; // Call @@ -217,29 +213,12 @@ } [Test] - public void HasOutput_SemiProbabilisticOutputSet_ReturnsTrue() - { - // Setup - var calculation = new PipingCalculation(new GeneralPipingInput()) - { - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() - }; - - // Call - bool calculationHasOutput = calculation.HasOutput; - - // Assert - Assert.IsTrue(calculationHasOutput); - } - - [Test] public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup PipingCalculation original = CreateRandomCalculationWithoutOutput(); original.Output = PipingTestDataGenerator.GetRandomPipingOutput(); - original.SemiProbabilisticOutput = PipingTestDataGenerator.GetRandomPipingSemiProbabilisticOutput(); // Call object clone = original.Clone(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCloneAssert.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCloneAssert.cs (.../PipingCloneAssert.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCloneAssert.cs (.../PipingCloneAssert.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -117,7 +117,6 @@ CoreCloneAssert.AreObjectClones(original.Comments, clone.Comments, CommonCloneAssert.AreClones); CoreCloneAssert.AreObjectClones(original.InputParameters, clone.InputParameters, AreClones); CoreCloneAssert.AreObjectClones(original.Output, clone.Output, AreClones); - CoreCloneAssert.AreObjectClones(original.SemiProbabilisticOutput, clone.SemiProbabilisticOutput, AreClones); } /// Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -381,22 +381,7 @@ }, EntryPointL = (RoundedDouble) 7.7777, ExitPointL = (RoundedDouble) 8.8888 - }, - SemiProbabilisticOutput = new PipingSemiProbabilisticOutput( - double.NaN, - double.NaN, - double.NaN, - double.NaN, - double.NaN, - 0.0005, - double.NaN, - double.NaN, - 1.5e-3, - double.NaN, - double.NaN, - 1.5e-3, - double.NaN, - double.NaN) + } } } }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r6b60edb4d7f04f83c74089d70a72c4f79ed413dd -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs (.../PipingSurfaceLineUpdateDataStrategyTest.cs) (revision 6b60edb4d7f04f83c74089d70a72c4f79ed413dd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineUpdateDataStrategyTest.cs (.../PipingSurfaceLineUpdateDataStrategyTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -451,8 +451,7 @@ { SurfaceLine = surfaceLine }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var failureMechanism = new PipingFailureMechanism(); @@ -499,8 +498,7 @@ { SurfaceLine = affectedSurfaceLine }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var unaffectedGeometry = new[] @@ -516,8 +514,7 @@ { SurfaceLine = unaffectedSurfaceLine }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var failureMechanism = new PipingFailureMechanism(); @@ -583,8 +580,7 @@ { SurfaceLine = removedSurfaceLine }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var unaffectedGeometry = new[] @@ -600,8 +596,7 @@ { SurfaceLine = unaffectedSurfaceLine }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var failureMechanism = new PipingFailureMechanism(); @@ -1062,8 +1057,7 @@ SurfaceLine = affectedSurfaceLine, EntryPointL = (RoundedDouble) 2 }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var failureMechanism = new PipingFailureMechanism(); @@ -1129,8 +1123,7 @@ EntryPointL = (RoundedDouble) 0, ExitPointL = (RoundedDouble) 3 }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var failureMechanism = new PipingFailureMechanism(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rf21ec839325d90ce1c5f0d08a8e743ebaf6912dd -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision f21ec839325d90ce1c5f0d08a8e743ebaf6912dd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -193,8 +193,7 @@ group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput()) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }); var pipingFailureMechanism = new TestPipingFailureMechanism(); @@ -327,8 +326,7 @@ group.Children.Add(new PipingCalculationScenario(new GeneralPipingInput()) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }); var pipingFailureMechanism = new TestPipingFailureMechanism(); @@ -1104,12 +1102,10 @@ PipingCalculationScenario calculation1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); calculation1.Name = "A"; calculation1.Output = new TestPipingOutput(); - calculation1.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(); calculation1.Attach(calculation1Observer); PipingCalculationScenario calculation2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); calculation2.Name = "B"; calculation2.Output = new TestPipingOutput(); - calculation2.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(); calculation2.Attach(calculation2Observer); var childGroup = new CalculationGroup(); @@ -1673,8 +1669,7 @@ EntryPointL = (RoundedDouble) 0, ExitPointL = (RoundedDouble) 1 }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; calculation1.Attach(calculation1Observer); calculation1.InputParameters.Attach(calculation1InputObserver); @@ -1687,8 +1682,7 @@ EntryPointL = (RoundedDouble) 0, ExitPointL = (RoundedDouble) 1 }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; calculation2.Attach(calculation2Observer); calculation2.InputParameters.Attach(calculation2InputObserver); @@ -1790,8 +1784,7 @@ EntryPointL = (RoundedDouble) 0, ExitPointL = (RoundedDouble) 1 }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; calculation1.Attach(calculation1Observer); calculation1.InputParameters.Attach(calculation1InputObserver); @@ -1804,8 +1797,7 @@ EntryPointL = (RoundedDouble) 0, ExitPointL = (RoundedDouble) 1 }, - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; calculation2.Attach(calculation2Observer); calculation2.InputParameters.Attach(calculation2InputObserver); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rf21ec839325d90ce1c5f0d08a8e743ebaf6912dd -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision f21ec839325d90ce1c5f0d08a8e743ebaf6912dd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -111,8 +111,7 @@ // Setup var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var pipingFailureMechanism = new PipingFailureMechanism(); @@ -225,8 +224,7 @@ { var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); @@ -647,7 +645,6 @@ PipingCalculationScenario calculation; CreateCalculationWithSurfaceLine(out calculation, out surfaceLine); calculation.Output = new TestPipingOutput(); - calculation.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(); var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); @@ -710,7 +707,6 @@ PipingCalculationScenario calculation; CreateCalculationWithSurfaceLine(out calculation, out surfaceLine); calculation.Output = new TestPipingOutput(); - calculation.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(); var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); @@ -925,7 +921,6 @@ Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is mislukt.", msgs[8]); }); Assert.IsNull(calculation.Output); - Assert.IsNull(calculation.SemiProbabilisticOutput); } } } @@ -1039,7 +1034,6 @@ } }); Assert.IsNotNull(calculation.Output); - Assert.IsNotNull(calculation.SemiProbabilisticOutput); } } } @@ -1077,7 +1071,6 @@ plugin.Gui = gui; calculation.Output = new TestPipingOutput(); - calculation.SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput(); calculation.Attach(observer); string messageBoxText = null, messageBoxTitle = null; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r6e4bf216d76f52ad3159a6cf1ab3ea38c2f17f28 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 6e4bf216d76f52ad3159a6cf1ab3ea38c2f17f28) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -236,13 +236,11 @@ var generalInputParameters = new GeneralPipingInput(); var pipingCalculation1 = new PipingCalculationScenario(generalInputParameters) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var pipingCalculation2 = new PipingCalculationScenario(generalInputParameters) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var observer = mocks.StrictMock(); @@ -313,8 +311,7 @@ var failureMechanism = new TestPipingFailureMechanism(); var pipingCalculation = new PipingCalculationScenario(failureMechanism.GeneralInput) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; failureMechanism.CalculationsGroup.Children.Add(pipingCalculation); @@ -448,8 +445,7 @@ { var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; var failureMechanism = new PipingFailureMechanism(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -r7371a70ed0751d341d41a7b951b780d286f83791 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 7371a70ed0751d341d41a7b951b780d286f83791) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -86,7 +86,6 @@ PipingCalculationScenario invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidPipingCalculation.Output = originalOutput; - invalidPipingCalculation.SemiProbabilisticOutput = originalSemiProbabilisticOutput; var activity = new PipingCalculationActivity(invalidPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); @@ -111,7 +110,6 @@ }); Assert.AreEqual(ActivityState.Failed, activity.State); Assert.AreSame(originalOutput, invalidPipingCalculation.Output); - Assert.AreSame(originalSemiProbabilisticOutput, invalidPipingCalculation.SemiProbabilisticOutput); } [Test] @@ -120,7 +118,6 @@ // Setup PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); validPipingCalculation.Output = null; - validPipingCalculation.SemiProbabilisticOutput = null; double norm = new Random(21).NextDouble(); var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), norm, double.NaN); @@ -142,7 +139,6 @@ }); Assert.AreEqual(ActivityState.Executed, activity.State); Assert.IsNotNull(validPipingCalculation.Output); - Assert.IsNotNull(validPipingCalculation.SemiProbabilisticOutput); } [Test] @@ -156,7 +152,6 @@ PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); validPipingCalculation.Output = null; - validPipingCalculation.SemiProbabilisticOutput = null; validPipingCalculation.Attach(observer); var activity = new PipingCalculationActivity(validPipingCalculation, new PipingProbabilityAssessmentInput(), int.MinValue, double.NaN); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs =================================================================== diff -u -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 -rebdc3a8f67e95c0f9b05a7950bc775a4af7b650b --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingDataSynchronizationServiceTest.cs (.../PipingDataSynchronizationServiceTest.cs) (revision ebdc3a8f67e95c0f9b05a7950bc775a4af7b650b) @@ -54,8 +54,7 @@ // Setup var calculation = new PipingCalculation(new GeneralPipingInput()) { - Output = new TestPipingOutput(), - SemiProbabilisticOutput = new TestPipingSemiProbabilisticOutput() + Output = new TestPipingOutput() }; // Call @@ -65,7 +64,6 @@ // Note: To make sure the clear is performed regardless of what is done with // the return result, no ToArray() should be called before these assertions: Assert.IsNull(calculation.Output); - Assert.IsNull(calculation.SemiProbabilisticOutput); CollectionAssert.AreEqual(new[] { @@ -79,8 +77,7 @@ // Setup var calculation = new PipingCalculation(new GeneralPipingInput()) { - Output = null, - SemiProbabilisticOutput = null + Output = null }; // Call