Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -ra4270560e68968cbe581663f87b5af27e8ebb717 -r7a542e685660df3866e8e1cf182dd3acbe2bf715 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision a4270560e68968cbe581663f87b5af27e8ebb717) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 7a542e685660df3866e8e1cf182dd3acbe2bf715) @@ -162,8 +162,8 @@ try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); - CalculationOutput output = kernel.DetailedAssessmentDirectFailureMechanisms( - FailureMechanismSectionAssemblyCalculatorInputCreator.CreateDetailedCalculationInputFromCategoryResults( + FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0G6( + FailureMechanismSectionAssemblyCalculatorInputCreator.CreateCategoryCompliancyResults( detailedAssessmentResultForFactorizedSignalingNorm, detailedAssessmentResultForSignalingNorm, detailedAssessmentResultForMechanismSpecificLowerLimitNorm, Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -ra4270560e68968cbe581663f87b5af27e8ebb717 -r7a542e685660df3866e8e1cf182dd3acbe2bf715 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision a4270560e68968cbe581663f87b5af27e8ebb717) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 7a542e685660df3866e8e1cf182dd3acbe2bf715) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.ComponentModel; using Assembly.Kernel.Model; using Assembly.Kernel.Model.AssessmentResultTypes; @@ -730,7 +731,6 @@ { // Setup var random = new Random(39); - using (new AssemblyToolKernelFactoryConfig()) { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; @@ -767,8 +767,6 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionAssemblyCategoryGroup = new CalculationOutput( - random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -780,16 +778,12 @@ detailedAssessmentResultForFactorizedLowerLimitNorm); // Assert - Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultItoII, - GetAssessmentResultTypeG1(detailedAssessmentResultForFactorizedSignalingNorm)); - Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultIItoIII, - GetAssessmentResultTypeG1(detailedAssessmentResultForSignalingNorm)); - Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultIIItoIV, - GetAssessmentResultTypeG1(detailedAssessmentResultForMechanismSpecificLowerLimitNorm)); - Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultIVtoV, - GetAssessmentResultTypeG1(detailedAssessmentResultForLowerLimitNorm)); - Assert.AreEqual(kernel.DetailedAssessmentFailureMechanismFromCategoriesInput.ResultVtoVI, - GetAssessmentResultTypeG1(detailedAssessmentResultForFactorizedLowerLimitNorm)); + Dictionary results = kernel.CategoryCompliancyResultsInput.GetCompliancyResults(); + Assert.AreEqual(results[EFmSectionCategory.Iv], GetAssessmentResultTypeG1(detailedAssessmentResultForFactorizedSignalingNorm)); + Assert.AreEqual(results[EFmSectionCategory.IIv], GetAssessmentResultTypeG1(detailedAssessmentResultForSignalingNorm)); + Assert.AreEqual(results[EFmSectionCategory.IIIv], GetAssessmentResultTypeG1(detailedAssessmentResultForMechanismSpecificLowerLimitNorm)); + Assert.AreEqual(results[EFmSectionCategory.IVv], GetAssessmentResultTypeG1(detailedAssessmentResultForLowerLimitNorm)); + Assert.AreEqual(results[EFmSectionCategory.Vv], GetAssessmentResultTypeG1(detailedAssessmentResultForFactorizedLowerLimitNorm)); } } @@ -808,8 +802,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionAssemblyCategoryGroup = new CalculationOutput( - (FailureMechanismSectionCategoryGroup) 99); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -834,13 +827,11 @@ { // Setup var random = new Random(39); - using (new AssemblyToolKernelFactoryConfig()) { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionAssemblyCategoryGroup = new CalculationOutput( - random.NextEnumValue()); + kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -853,7 +844,7 @@ random.NextEnumValue()); // Assert - Assert.AreEqual(GetGroup(kernel.FailureMechanismSectionAssemblyCategoryGroup.Result), assembly); + Assert.AreEqual(GetGroup(kernel.FailureMechanismSectionDirectResult.Result), assembly); } } @@ -862,7 +853,6 @@ { // Setup var random = new Random(39); - using (new AssemblyToolKernelFactoryConfig()) { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;