Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r85a350b8d0db7125255bdb82a207ec2f70d60ca2 -rf57667ae790c7ec25c771819e4efe75c2d221d9b --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 85a350b8d0db7125255bdb82a207ec2f70d60ca2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision f57667ae790c7ec25c771819e4efe75c2d221d9b) @@ -564,10 +564,7 @@ Gui.MainWindow, calculations .Select(pc => new PipingCalculationActivity(pc, - GetNormativeAssessmentLevel(assessmentSection, pc), - assessmentInput, - assessmentSection.FailureMechanismContribution.Norm, - contribution)) + GetNormativeAssessmentLevel(assessmentSection, pc))) .ToList()); } @@ -819,10 +816,7 @@ { ActivityProgressDialogRunner.Run(Gui.MainWindow, new PipingCalculationActivity(calculation, - GetNormativeAssessmentLevel(context.AssessmentSection, calculation), - context.FailureMechanism.PipingProbabilityAssessmentInput, - context.AssessmentSection.FailureMechanismContribution.Norm, - context.FailureMechanism.Contribution)); + GetNormativeAssessmentLevel(context.AssessmentSection, calculation))); } private StrictContextMenuItem CreateUpdateEntryAndExitPointItem(PipingCalculationScenarioContext context) Index: Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs =================================================================== diff -u -rc4a957f939912203096b6ba3e09f43950414389a -rf57667ae790c7ec25c771819e4efe75c2d221d9b --- Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision c4a957f939912203096b6ba3e09f43950414389a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Service/PipingCalculationActivity.cs (.../PipingCalculationActivity.cs) (revision f57667ae790c7ec25c771819e4efe75c2d221d9b) @@ -32,45 +32,25 @@ /// public class PipingCalculationActivity : Activity { - private readonly double norm; - private readonly double contribution; private readonly PipingCalculation calculation; private readonly RoundedDouble normativeAssessmentLevel; - private readonly PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput; /// /// Initializes a new instance of the class. /// /// The piping data used for the calculation. /// The normative assessment level to use in case no manual assessment level is provided. - /// General input that influences the probability estimate for a piping - /// assessment. - /// The norm to assess for. - /// The contribution of piping as a percentage (0-100) to the total of the failure probability - /// of the assessment section. - /// Thrown when any - /// or is null. + /// Thrown when is null. public PipingCalculationActivity(PipingCalculation calculation, - RoundedDouble normativeAssessmentLevel, - PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput, - double norm, - double contribution) + RoundedDouble normativeAssessmentLevel) { if (calculation == null) { throw new ArgumentNullException(nameof(calculation)); } - if (pipingProbabilityAssessmentInput == null) - { - throw new ArgumentNullException(nameof(pipingProbabilityAssessmentInput)); - } - this.calculation = calculation; this.normativeAssessmentLevel = normativeAssessmentLevel; - this.pipingProbabilityAssessmentInput = pipingProbabilityAssessmentInput; - this.norm = norm; - this.contribution = contribution; Description = string.Format(RingtoetsCommonServiceResources.Perform_calculation_with_name_0_, calculation.Name); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -rab1121dee05c5484181bb1b0470d49eb48d325fe -rf57667ae790c7ec25c771819e4efe75c2d221d9b --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision ab1121dee05c5484181bb1b0470d49eb48d325fe) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision f57667ae790c7ec25c771819e4efe75c2d221d9b) @@ -38,17 +38,14 @@ public class PipingCalculationActivityTest { [Test] - public void ParameteredConstructor_ExpectedValues() + public void Constructor_ExpectedValues() { // Setup var calculation = new PipingCalculation(new GeneralPipingInput()); // Call var activity = new PipingCalculationActivity(calculation, - RoundedDouble.NaN, - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + RoundedDouble.NaN); // Assert Assert.IsInstanceOf(activity); @@ -58,39 +55,18 @@ } [Test] - public void ParameteredConstructor_CalculationNull_ThrowsArgumentNullException() + public void Constructor_CalculationNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new PipingCalculationActivity(null, - RoundedDouble.NaN, - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + RoundedDouble.NaN); // Assert var exception = Assert.Throws(call); Assert.AreEqual("calculation", exception.ParamName); } [Test] - public void ParameteredConstructor_PipingProbabilityAssessmentInputNull_ThrowsArgumentNullException() - { - // Setup - var calculation = new PipingCalculation(new GeneralPipingInput()); - - // Call - TestDelegate call = () => new PipingCalculationActivity(calculation, - RoundedDouble.NaN, - null, - int.MinValue, - double.NaN); - - // Assert - var exception = Assert.Throws(call); - Assert.AreEqual("pipingProbabilityAssessmentInput", exception.ParamName); - } - - [Test] public void Run_InvalidPipingCalculationWithOutput_LogValidationStartAndEndWithErrors() { // Setup @@ -100,10 +76,7 @@ invalidPipingCalculation.Output = originalOutput; var activity = new PipingCalculationActivity(invalidPipingCalculation, - GetCalculatedTestAssessmentLevel(), - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + GetCalculatedTestAssessmentLevel()); // Call Action call = () => activity.Run(); @@ -135,12 +108,8 @@ PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); validPipingCalculation.Output = null; - double norm = new Random(21).NextDouble(); var activity = new PipingCalculationActivity(validPipingCalculation, - GetCalculatedTestAssessmentLevel(), - new PipingProbabilityAssessmentInput(), - norm, - double.NaN); + GetCalculatedTestAssessmentLevel()); activity.Run(); // Call @@ -175,10 +144,7 @@ validPipingCalculation.Attach(observer); var activity = new PipingCalculationActivity(validPipingCalculation, - GetCalculatedTestAssessmentLevel(), - new PipingProbabilityAssessmentInput(), - int.MinValue, - double.NaN); + GetCalculatedTestAssessmentLevel()); activity.Run();