Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -r7c20988fe416b2cbc8931f92ca0ce6d93774a8e4 -r91d66db422d7e513388b11fc9b590e88be7eec79 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 7c20988fe416b2cbc8931f92ca0ce6d93774a8e4) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 91d66db422d7e513388b11fc9b590e88be7eec79) @@ -61,7 +61,7 @@ try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); - FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0E1( + FmSectionAssemblyDirectResultWithProbability output = kernel.TranslateAssessmentResultWbi0E1( FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE1(input)); return FailureMechanismSectionAssemblyCreator.Create(output); @@ -81,7 +81,7 @@ try { IFailureMechanismSectionAssemblyCalculatorKernel kernel = factory.CreateFailureMechanismSectionAssemblyKernel(); - FmSectionAssemblyDirectResult output = kernel.TranslateAssessmentResultWbi0E3( + FmSectionAssemblyDirectResultWithProbability output = kernel.TranslateAssessmentResultWbi0E3( FailureMechanismSectionAssemblyCalculatorInputCreator.CreateAssessmentResultTypeE2(input)); return FailureMechanismSectionAssemblyCreator.Create(output); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -rd3ed011cd5b51ca857bd009072f0ce7c8e73dc01 -r91d66db422d7e513388b11fc9b590e88be7eec79 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision d3ed011cd5b51ca857bd009072f0ce7c8e73dc01) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 91d66db422d7e513388b11fc9b590e88be7eec79) @@ -37,6 +37,7 @@ using Ringtoets.AssemblyTool.KernelWrapper.TestUtil; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels; using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly; +using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Kernels.Categories; using Ringtoets.Common.Primitives; namespace Ringtoets.AssemblyTool.KernelWrapper.Test.Calculators.Assembly @@ -74,7 +75,12 @@ private static void AssertCalculatorOutput(FmSectionAssemblyDirectResult original, FailureMechanismSectionAssembly actual) { Assert.AreEqual(AssemblyCategoryAssert.GetFailureMechanismSectionCategoryGroup(original.Result), actual.Group); + } + + private static void AssertCalculatorOutput(FmSectionAssemblyDirectResultWithProbability original, FailureMechanismSectionAssembly actual) + { Assert.AreEqual(original.FailureProbability, actual.Probability); + AssertCalculatorOutput(original, actual); } private static void AssertAssemblyCategoriesInput(AssemblyCategoriesInput assemblyCategoriesInput, FailureMechanismSectionAssemblyKernelStub kernel) @@ -126,8 +132,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -149,16 +155,16 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(random.NextEnumValue()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResult, assembly); + AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); } } @@ -171,8 +177,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99, - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -264,8 +270,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -287,16 +293,16 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult(random.NextEnumValue(), - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); // Call FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(random.NextEnumValue()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResult, assembly); + AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); } } @@ -309,8 +315,8 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismSectionDirectResult = new FmSectionAssemblyDirectResult((EFmSectionCategory) 99, - random.NextDouble()); + kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory);