Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs =================================================================== diff -u -r618b76f6429ba110aae26879a227af8f4f3762f0 -r442f20a0b0fad631a079f542068483de27670a31 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs (.../AssemblyCategoriesInput.cs) (revision 618b76f6429ba110aae26879a227af8f4f3762f0) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Data/AssemblyCategoriesInput.cs (.../AssemblyCategoriesInput.cs) (revision 442f20a0b0fad631a079f542068483de27670a31) @@ -39,7 +39,7 @@ double lowerLimitNorm) { N = failureMechanismN; - FailureMechanismContribution = failureMechanismContribution / 100; + FailureMechanismContribution = failureMechanismContribution; SignalingNorm = signalingNorm; LowerLimitNorm = lowerLimitNorm; } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssemblyCategoriesInputTest.cs =================================================================== diff -u -r29699579b9d43f69085153d43bad299e5db079eb -r442f20a0b0fad631a079f542068483de27670a31 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssemblyCategoriesInputTest.cs (.../AssemblyCategoriesInputTest.cs) (revision 29699579b9d43f69085153d43bad299e5db079eb) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.Data.Test/AssemblyCategoriesInputTest.cs (.../AssemblyCategoriesInputTest.cs) (revision 442f20a0b0fad631a079f542068483de27670a31) @@ -41,7 +41,7 @@ // Assert Assert.AreEqual(n, input.N); - Assert.AreEqual(failureMechanismContribution / 100, input.FailureMechanismContribution, 1e-6); + Assert.AreEqual(failureMechanismContribution, input.FailureMechanismContribution, 1e-6); Assert.AreEqual(signalingNorm, input.SignalingNorm); Assert.AreEqual(lowerLimitNorm, input.LowerLimitNorm); } Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyCategoriesInputFactory.cs =================================================================== diff -u -r283def2fc4e1161789c176aa8f8e9e8bb4af3e4b -r442f20a0b0fad631a079f542068483de27670a31 --- Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyCategoriesInputFactory.cs (.../AssemblyCategoriesInputFactory.cs) (revision 283def2fc4e1161789c176aa8f8e9e8bb4af3e4b) +++ Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyCategoriesInputFactory.cs (.../AssemblyCategoriesInputFactory.cs) (revision 442f20a0b0fad631a079f542068483de27670a31) @@ -55,7 +55,7 @@ } return new AssemblyCategoriesInput(n, - failureMechanism.Contribution, + failureMechanism.Contribution / 100, assessmentSection.FailureMechanismContribution.SignalingNorm, assessmentSection.FailureMechanismContribution.LowerLimitNorm); } Index: Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs =================================================================== diff -u -reb46aeebff227256fcd468c15b8d7158308b291c -r442f20a0b0fad631a079f542068483de27670a31 --- Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs (.../AssemblyToolCategoriesFactory.cs) (revision eb46aeebff227256fcd468c15b8d7158308b291c) +++ Ringtoets/Common/src/Ringtoets.Common.Data/AssemblyTool/AssemblyToolCategoriesFactory.cs (.../AssemblyToolCategoriesFactory.cs) (revision 442f20a0b0fad631a079f542068483de27670a31) @@ -76,10 +76,9 @@ try { - return calculator.CalculateFailureMechanismCategories(new AssemblyCategoriesInput(n, - failureMechanismContribution, - signalingNorm, - lowerLimitNorm)); + return calculator.CalculateFailureMechanismCategories(new AssemblyCategoriesInput( + n, failureMechanismContribution / 100, + signalingNorm, lowerLimitNorm)); } catch (AssemblyCategoriesCalculatorException e) { @@ -108,10 +107,9 @@ try { - return calculator.CalculateFailureMechanismSectionCategories(new AssemblyCategoriesInput(n, - failureMechanismContribution, - signalingNorm, - lowerLimitNorm)); + return calculator.CalculateFailureMechanismSectionCategories(new AssemblyCategoriesInput( + n, failureMechanismContribution / 100, + signalingNorm, lowerLimitNorm)); } catch (AssemblyCategoriesCalculatorException e) { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyCategoriesInputFactoryTest.cs =================================================================== diff -u -r283def2fc4e1161789c176aa8f8e9e8bb4af3e4b -r442f20a0b0fad631a079f542068483de27670a31 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyCategoriesInputFactoryTest.cs (.../AssemblyCategoriesInputFactoryTest.cs) (revision 283def2fc4e1161789c176aa8f8e9e8bb4af3e4b) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/AssemblyTool/AssemblyCategoriesInputFactoryTest.cs (.../AssemblyCategoriesInputFactoryTest.cs) (revision 442f20a0b0fad631a079f542068483de27670a31) @@ -77,7 +77,10 @@ // Setup var random = new Random(39); double n = random.NextDouble(); - var failureMechanism = new TestFailureMechanism(); + var failureMechanism = new TestFailureMechanism + { + Contribution = random.Next(1, 100) + }; var assessmentSection = new AssessmentSectionStub(); // Call