Index: Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInput.cs =================================================================== diff -u -r9a1a700023ce9d02b5257434c45455f39ddd8bf2 -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInput.cs (.../ProbabilityAssessmentInput.cs) (revision 9a1a700023ce9d02b5257434c45455f39ddd8bf2) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Probability/ProbabilityAssessmentInput.cs (.../ProbabilityAssessmentInput.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -29,7 +29,6 @@ /// public class ProbabilityAssessmentInput { - private double contribution; private int n; /// @@ -38,7 +37,6 @@ public ProbabilityAssessmentInput() { N = 2; - Contribution = double.NaN; } /// @@ -61,27 +59,5 @@ n = value; } } - - /// - /// Gets or sets the contribution of the failure mechanism as a percentage (0-100) to the total of the - /// failure probability of the assessment section. - /// - /// Thrown when the is not - /// in interval [1-100]. - public double Contribution - { - get - { - return contribution; - } - set - { - if (value < 0 || value > 100) - { - throw new ArgumentOutOfRangeException("value", Resources.Contribution_Value_should_be_in_interval_0_100); - } - contribution = value; - } - } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputTest.cs =================================================================== diff -u -r9a1a700023ce9d02b5257434c45455f39ddd8bf2 -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputTest.cs (.../ProbabilityAssessmentInputTest.cs) (revision 9a1a700023ce9d02b5257434c45455f39ddd8bf2) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probability/ProbabilityAssessmentInputTest.cs (.../ProbabilityAssessmentInputTest.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -37,7 +37,6 @@ var probabilityAssessmentInput = new ProbabilityAssessmentInput(); // Assert - Assert.AreEqual(double.NaN, probabilityAssessmentInput.Contribution); Assert.AreEqual(2, probabilityAssessmentInput.N); } @@ -73,38 +72,5 @@ TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, Resources.N_Value_should_be_in_interval_1_20); } - - [Test] - [TestCase(0)] - [TestCase(50)] - [TestCase(100)] - public void Contribution_ValueInsideValidRegion_DoesNotThrow(int value) - { - // Setup - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - - // Call - TestDelegate test = () => probabilityAssessmentInput.Contribution = value; - - // Assert - Assert.DoesNotThrow(test); - Assert.AreEqual(value, probabilityAssessmentInput.Contribution); - } - - [Test] - [TestCase(-1)] - [TestCase(101)] - public void Contribution_ValueOutsideValidRegion_ThrowsArgumentOutOfRangeException(int value) - { - // Setup - var probabilityAssessmentInput = new ProbabilityAssessmentInput(); - - // Call - TestDelegate test = () => probabilityAssessmentInput.Contribution = value; - - // Assert - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, - Resources.Contribution_Value_should_be_in_interval_0_100); - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs =================================================================== diff -u -r3c1ed9049be26ab9460bf2192c55149c45fbba3c -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanism.cs (.../GrassCoverErosionInwardsFailureMechanism.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -56,18 +56,6 @@ } } - public override double Contribution - { - get - { - return ProbabilityAssessmentInput.Contribution; - } - set - { - ProbabilityAssessmentInput.Contribution = value; - } - } - /// /// Gets the general grass cover erosion inwards calculation input parameters that apply to each calculation. /// Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs =================================================================== diff -u -r9a1a700023ce9d02b5257434c45455f39ddd8bf2 -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 9a1a700023ce9d02b5257434c45455f39ddd8bf2) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -213,7 +213,7 @@ { if (output != null) { - calculation.Output = ProbabilityAssessmentService.Calculate(assessmentSection.FailureMechanismContribution.Norm, failureMechanism.ProbabilityAssessmentInput.Contribution, failureMechanism.ProbabilityAssessmentInput.N, output.Beta); + calculation.Output = ProbabilityAssessmentService.Calculate(assessmentSection.FailureMechanismContribution.Norm, failureMechanism.Contribution, failureMechanism.ProbabilityAssessmentInput.N, output.Beta); calculation.NotifyObservers(); } else Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs =================================================================== diff -u -r0e8590d1ba6edc87a2ac73240662bfcf45f20914 -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision 0e8590d1ba6edc87a2ac73240662bfcf45f20914) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismTest.cs (.../GrassCoverErosionInwardsFailureMechanismTest.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -124,20 +124,5 @@ Assert.IsTrue(calculations.All(c => c is GrassCoverErosionInwardsCalculation)); mocks.VerifyAll(); } - - [Test] - public void Contribution_Always_UpdatesProbabilityAssessmentInputContribution() - { - // Setup - var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - const double newContribution = 12; - - // Call - failureMechanism.Contribution = newContribution; - - // Assert - Assert.AreEqual(newContribution, failureMechanism.ProbabilityAssessmentInput.Contribution); - Assert.AreEqual(newContribution, failureMechanism.Contribution); - } } } \ No newline at end of file Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs =================================================================== diff -u -r3c1ed9049be26ab9460bf2192c55149c45fbba3c -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision 3c1ed9049be26ab9460bf2192c55149c45fbba3c) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresFailureMechanism.cs (.../HeightStructuresFailureMechanism.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -56,18 +56,6 @@ } } - public override double Contribution - { - get - { - return ProbabilityAssessmentInput.Contribution; - } - set - { - ProbabilityAssessmentInput.Contribution = value; - } - } - /// /// Gets the general probabilistic assessment input parameters that apply to each calculation /// in a probabilistic assessment. Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs =================================================================== diff -u -r9a1a700023ce9d02b5257434c45455f39ddd8bf2 -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 9a1a700023ce9d02b5257434c45455f39ddd8bf2) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs (.../HeightStructuresGuiPlugin.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -210,7 +210,7 @@ { if (output != null) { - calculation.Output = ProbabilityAssessmentService.Calculate(assessmentSection.FailureMechanismContribution.Norm, failureMechanism.ProbabilityAssessmentInput.Contribution, failureMechanism.ProbabilityAssessmentInput.N, output.Beta); + calculation.Output = ProbabilityAssessmentService.Calculate(assessmentSection.FailureMechanismContribution.Norm, failureMechanism.Contribution, failureMechanism.ProbabilityAssessmentInput.N, output.Beta); calculation.NotifyObservers(); } else Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs =================================================================== diff -u -rea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a -r06f95f8ac2bd80176a952183c0bb4e0154b1fc3e --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision ea180de6e9f5ba1108b4ff3cf7bb7e57de72a37a) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Data.Test/HeightStructuresFailureMechanismTest.cs (.../HeightStructuresFailureMechanismTest.cs) (revision 06f95f8ac2bd80176a952183c0bb4e0154b1fc3e) @@ -123,20 +123,5 @@ Assert.IsTrue(calculations.All(c => c is HeightStructuresCalculation)); mocks.VerifyAll(); } - - [Test] - public void Contribution_Always_UpdatesProbabilityAssessmentInputContribution() - { - // Setup - var failureMechanism = new HeightStructuresFailureMechanism(); - const double newContribution = 12; - - // Call - failureMechanism.Contribution = newContribution; - - // Assert - Assert.AreEqual(newContribution, failureMechanism.ProbabilityAssessmentInput.Contribution); - Assert.AreEqual(newContribution, failureMechanism.Contribution); - } } } \ No newline at end of file