Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs =================================================================== diff -u -r2903f7033d125ab724acc44f5d40610bc3f88765 -radc7ea257dbb54e7beea7b39e78687f09c65fb01 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs (.../FailureMechanismAssemblyCalculator.cs) (revision 2903f7033d125ab724acc44f5d40610bc3f88765) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs (.../FailureMechanismAssemblyCalculator.cs) (revision adc7ea257dbb54e7beea7b39e78687f09c65fb01) @@ -52,13 +52,13 @@ this.factory = factory; } - public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable sectionAssemblies) + public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable sectionCategories) { try { IFailureMechanismResultAssembler kernel = factory.CreateFailureMechanismAssemblyKernel(); EFailureMechanismCategory output = kernel.AssembleFailureMechanismWbi1A1( - sectionAssemblies.Select(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult).ToArray(), + sectionCategories.Select(FailureMechanismSectionAssemblyCalculatorInputCreator.CreateFailureMechanismSectionAssemblyDirectResult).ToArray(), false); return FailureMechanismAssemblyCreator.CreateFailureMechanismAssemblyCategoryGroup(output); Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs =================================================================== diff -u -re616c097d72257eccad5a5523ed640397ede458c -radc7ea257dbb54e7beea7b39e78687f09c65fb01 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs (.../IFailureMechanismAssemblyCalculator.cs) (revision e616c097d72257eccad5a5523ed640397ede458c) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismAssemblyCalculator.cs (.../IFailureMechanismAssemblyCalculator.cs) (revision adc7ea257dbb54e7beea7b39e78687f09c65fb01) @@ -30,13 +30,13 @@ public interface IFailureMechanismAssemblyCalculator { /// - /// Assembles the failure mechanism using the given . + /// Assembles the failure mechanism using the given . /// - /// The collection of to assemble for. + /// The collection of to assemble for. /// A . /// Thrown when /// an error occurs when performing the assembly. - FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable sectionAssemblies); + FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable sectionCategories); /// /// Assembles the failure mechanism with failure probabilities using the given parameters. Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs =================================================================== diff -u -r2903f7033d125ab724acc44f5d40610bc3f88765 -radc7ea257dbb54e7beea7b39e78687f09c65fb01 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs (.../FailureMechanismAssemblyCalculatorTest.cs) (revision 2903f7033d125ab724acc44f5d40610bc3f88765) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs (.../FailureMechanismAssemblyCalculatorTest.cs) (revision adc7ea257dbb54e7beea7b39e78687f09c65fb01) @@ -80,7 +80,7 @@ // Call TestDelegate test = () => calculator.AssembleFailureMechanism(new[] { - new FailureMechanismSectionAssembly(new Random(39).NextDouble(), (FailureMechanismSectionAssemblyCategoryGroup) 99) + (FailureMechanismSectionAssemblyCategoryGroup) 99 }); // Assert @@ -96,9 +96,9 @@ { // Setup var random = new Random(39); - var sectionResults = new [] + var categoryGroups = new [] { - new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue()) + random.NextEnumValue() }; using (new AssemblyToolKernelFactoryConfig()) @@ -110,10 +110,12 @@ var calculator = new FailureMechanismAssemblyCalculator(factory); // Call - calculator.AssembleFailureMechanism(sectionResults); + calculator.AssembleFailureMechanism(categoryGroups); // Assert - AssertCalculatorOutput(sectionResults.Single(), kernel.FmSectionAssemblyResultsInput.Single()); + Assert.AreEqual(categoryGroups.Single(), + FailureMechanismSectionAssemblyCreator.CreateFailureMechanismSectionAssemblyCategoryGroup( + kernel.FmSectionAssemblyResultsInput.Single().Result)); Assert.IsFalse(kernel.PartialAssembly); } } @@ -131,7 +133,8 @@ var calculator = new FailureMechanismAssemblyCalculator(factory); // Call - FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(new List()); + FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism( + new List()); // Assert Assert.AreEqual(FailureMechanismAssemblyCreator.CreateFailureMechanismAssemblyCategoryGroup(kernel.FailureMechanismCategoryResult), @@ -152,7 +155,7 @@ var calculator = new FailureMechanismAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleFailureMechanism(new List()); + TestDelegate test = () => calculator.AssembleFailureMechanism(new List()); // Assert var exception = Assert.Throws(test); @@ -175,7 +178,7 @@ var calculator = new FailureMechanismAssemblyCalculator(factory); // Call - TestDelegate test = () => calculator.AssembleFailureMechanism(new List()); + TestDelegate test = () => calculator.AssembleFailureMechanism(new List()); // Assert var exception = Assert.Throws(test); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs =================================================================== diff -u -re61166fd0f1b281e21acb457c7ec3b59904c219a -radc7ea257dbb54e7beea7b39e78687f09c65fb01 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs (.../FailureMechanismAssemblyCalculatorStubTest.cs) (revision e61166fd0f1b281e21acb457c7ec3b59904c219a) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorStubTest.cs (.../FailureMechanismAssemblyCalculatorStubTest.cs) (revision adc7ea257dbb54e7beea7b39e78687f09c65fb01) @@ -54,7 +54,7 @@ var calculator = new FailureMechanismAssemblyCalculatorStub(); // Call - FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(new List()); + FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(new List()); // Assert Assert.AreEqual(FailureMechanismAssemblyCategoryGroup.IIt, category); @@ -71,7 +71,7 @@ }; // Call - FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(new List()); + FailureMechanismAssemblyCategoryGroup category = calculator.AssembleFailureMechanism(new List()); // Assert Assert.AreEqual(calculator.FailureMechanismAssemblyCategoryGroupOutput, category); @@ -82,7 +82,7 @@ { // Setup var calculator = new FailureMechanismAssemblyCalculatorStub(); - var sectionResults = new List(); + var sectionResults = new List(); // Call calculator.AssembleFailureMechanism(sectionResults); @@ -101,7 +101,7 @@ }; // Call - TestDelegate test = () => calculator.AssembleFailureMechanism(new List()); + TestDelegate test = () => calculator.AssembleFailureMechanism(new List()); // Assert var exception = Assert.Throws(test); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs =================================================================== diff -u -re61166fd0f1b281e21acb457c7ec3b59904c219a -radc7ea257dbb54e7beea7b39e78687f09c65fb01 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs (.../FailureMechanismAssemblyCalculatorStub.cs) (revision e61166fd0f1b281e21acb457c7ec3b59904c219a) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismAssemblyCalculatorStub.cs (.../FailureMechanismAssemblyCalculatorStub.cs) (revision adc7ea257dbb54e7beea7b39e78687f09c65fb01) @@ -37,6 +37,11 @@ public IEnumerable FailureMechanismSectionAssemblies { get; private set; } /// + /// Gets the collection of . + /// + public IEnumerable FailureMechanismSectionCategories { get; private set; } + + /// /// Gets or sets the output of the failure mechanism assembly without probabilities. /// public FailureMechanismAssemblyCategoryGroup? FailureMechanismAssemblyCategoryGroupOutput { get; set; } @@ -56,14 +61,14 @@ /// public bool ThrowExceptionOnCalculate { private get; set; } - public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable sectionAssemblies) + public FailureMechanismAssemblyCategoryGroup AssembleFailureMechanism(IEnumerable sectionCategories) { if (ThrowExceptionOnCalculate) { throw new FailureMechanismAssemblyCalculatorException("Message", new Exception()); } - FailureMechanismSectionAssemblies = sectionAssemblies; + FailureMechanismSectionCategories = sectionCategories; if (FailureMechanismAssemblyCategoryGroupOutput == null) {