Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs =================================================================== diff -u -rd4cce2ae108af5d3fd689019d57793a440166f82 -r8c799e8ee97c6f3e700026f7280d55d17693f740 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision d4cce2ae108af5d3fd689019d57793a440166f82) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs (.../MacroStabilityInwardsFailureMechanismSectionResultAssemblyFactory.cs) (revision 8c799e8ee97c6f3e700026f7280d55d17693f740) @@ -29,7 +29,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Exceptions; using Ringtoets.Common.Data.Probability; -using Ringtoets.Common.Primitives; namespace Ringtoets.MacroStabilityInwards.Data { @@ -114,19 +113,15 @@ try { - IEnumerable categories = - AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories( - assessmentSection.FailureMechanismContribution.SignalingNorm, - assessmentSection.FailureMechanismContribution.LowerLimitNorm, - failureMechanism.Contribution, - failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN( - failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength)); - return calculator.AssembleDetailedAssessment( failureMechanismSectionResult.DetailedAssessmentResult, failureMechanismSectionResult.GetDetailedAssessmentProbability(calculationScenarios, failureMechanism, assessmentSection), - categories, - failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(failureMechanismSectionResult.Section.Length)); + failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(failureMechanismSectionResult.Section.Length), + new AssemblyCategoriesInput(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN( + failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength), + failureMechanism.Contribution, + assessmentSection.FailureMechanismContribution.SignalingNorm, + assessmentSection.FailureMechanismContribution.LowerLimitNorm)); } catch (FailureMechanismSectionAssemblyCalculatorException e) { @@ -171,18 +166,15 @@ try { - IEnumerable categories = - AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories( - assessmentSection.FailureMechanismContribution.SignalingNorm, - assessmentSection.FailureMechanismContribution.LowerLimitNorm, - failureMechanism.Contribution, - failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength)); - - return calculator.AssembleTailorMadeAssessment( + return calculator.AssembleTailorMadeAssessment( failureMechanismSectionResult.TailorMadeAssessmentResult, failureMechanismSectionResult.TailorMadeAssessmentProbability, - categories, - failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(failureMechanismSectionResult.Section.Length)); + failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN(failureMechanismSectionResult.Section.Length), + new AssemblyCategoriesInput(failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.GetN( + failureMechanism.MacroStabilityInwardsProbabilityAssessmentInput.SectionLength), + failureMechanism.Contribution, + assessmentSection.FailureMechanismContribution.SignalingNorm, + assessmentSection.FailureMechanismContribution.LowerLimitNorm)); } catch (FailureMechanismSectionAssemblyCalculatorException e) {