Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r5074f618d0207c1a9cb63d2c8a4a1b92a944dc73 -rf1d9e7cfbfff37c23c610fdc3430607d936d5e91 --- Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs) (revision 5074f618d0207c1a9cb63d2c8a4a1b92a944dc73) +++ Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactory.cs) (revision f1d9e7cfbfff37c23c610fdc3430607d936d5e91) @@ -158,10 +158,15 @@ try { + double n = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( + failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength); + return calculator.AssembleTailorMadeAssessment( failureMechanismSectionResult.TailorMadeAssessmentResult, failureMechanismSectionResult.TailorMadeAssessmentProbability, - CreateAssemblyCategoriesInput(failureMechanism, assessmentSection)).Group; + assessmentSection.FailureMechanismContribution.Norm, + n, + failureMechanism.Contribution).Group; } catch (FailureMechanismSectionAssemblyCalculatorException e) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs =================================================================== diff -u -r5074f618d0207c1a9cb63d2c8a4a1b92a944dc73 -rf1d9e7cfbfff37c23c610fdc3430607d936d5e91 --- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision 5074f618d0207c1a9cb63d2c8a4a1b92a944dc73) +++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/AssemblyFactories/MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs (.../MacroStabilityOutwardsFailureMechanismAssemblyFactoryTest.cs) (revision f1d9e7cfbfff37c23c610fdc3430607d936d5e91) @@ -376,7 +376,11 @@ // Assert Assert.AreEqual(sectionResult.TailorMadeAssessmentProbability, calculator.TailorMadeAssessmentProbabilityInput); Assert.AreEqual(sectionResult.TailorMadeAssessmentResult, calculator.TailorMadeAssessmentProbabilityAndDetailedCalculationResultInput); - AssertAssemblyCategoriesInput(assessmentSection, failureMechanism, calculator.AssemblyCategoriesInput); + Assert.AreEqual(assessmentSection.FailureMechanismContribution.Norm, calculator.TailorMadeNormativeNormInput); + double expectedN = failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.GetN( + failureMechanism.MacroStabilityOutwardsProbabilityAssessmentInput.SectionLength); + Assert.AreEqual(expectedN, calculator.TailorMadeFailureMechanismNInput); + Assert.AreEqual(failureMechanism.Contribution, calculator.TailorMadeFailureMechanismContributionInput); mocks.VerifyAll(); } } @@ -1023,7 +1027,7 @@ using (new AssemblyToolCalculatorFactoryConfig()) { - var calculatorfactory = (TestAssemblyToolCalculatorFactory)AssemblyToolCalculatorFactory.Instance; + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; FailureMechanismSectionAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismSectionAssemblyCalculator; calculator.ThrowExceptionOnCalculate = true;