Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs =================================================================== diff -u -r8a84e69fe9834dc4bb5e3dd84240fb1de3a4280e -r2e56eb67e5fd78a4bb66030897ae08d0de874af6 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs) (revision 8a84e69fe9834dc4bb5e3dd84240fb1de3a4280e) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverFailureMechanismAssemblyFactory.cs (.../StabilityStoneCoverFailureMechanismAssemblyFactory.cs) (revision 2e56eb67e5fd78a4bb66030897ae08d0de874af6) @@ -28,6 +28,7 @@ using Ringtoets.AssemblyTool.KernelWrapper.Kernels; using Ringtoets.Common.Data.AssemblyTool; using Ringtoets.Common.Data.Exceptions; +using Ringtoets.Common.Primitives; namespace Ringtoets.StabilityStoneCover.Data { @@ -154,17 +155,23 @@ throw new ArgumentNullException(nameof(failureMechanismSectionResult)); } - FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = AssembleSimpleAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup detailedAssembly = AssembleDetailedAssessment(failureMechanismSectionResult); - FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly = AssembleTailorMadeAssessment(failureMechanismSectionResult); - IAssemblyToolCalculatorFactory calculatorFactory = AssemblyToolCalculatorFactory.Instance; IFailureMechanismSectionAssemblyCalculator calculator = calculatorFactory.CreateFailureMechanismSectionAssemblyCalculator(AssemblyToolKernelFactory.Instance); try { - return calculator.AssembleCombined(simpleAssembly, detailedAssembly, tailorMadeAssembly); + FailureMechanismSectionAssemblyCategoryGroup simpleAssembly = AssembleSimpleAssessment(failureMechanismSectionResult); + + if (failureMechanismSectionResult.SimpleAssessmentResult == SimpleAssessmentValidityOnlyResultType.NotApplicable) + { + return calculator.AssembleCombined(simpleAssembly); + } + + return calculator.AssembleCombined( + simpleAssembly, + AssembleDetailedAssessment(failureMechanismSectionResult), + AssembleTailorMadeAssessment(failureMechanismSectionResult)); } catch (FailureMechanismSectionAssemblyCalculatorException e) {