Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs
===================================================================
diff -u -r8a817e4f882227425511d9e51a6a734542971a29 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision 8a817e4f882227425511d9e51a6a734542971a29)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/AssessmentSectionAssemblyCalculator.cs	(.../AssessmentSectionAssemblyCalculator.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -25,7 +25,6 @@
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Interfaces;
 using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentSection;
 using Assembly.Kernel.Model.Categories;
 using Assembly.Kernel.Model.FailureMechanismSections;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs
===================================================================
diff -u -r36bbd48b0510d2ab2d49bf91db559bd25a283ee7 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision 36bbd48b0510d2ab2d49bf91db559bd25a283ee7)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismAssemblyCalculator.cs	(.../FailureMechanismAssemblyCalculator.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -66,19 +66,20 @@
             {
                 IFailureMechanismResultAssembler kernel = factory.CreateFailureMechanismAssemblyKernel();
 
-                FailureMechanismAssemblyResult result;
+                Probability result;
                 if (applySectionLengthEffect)
                 {
-                    result = kernel.CalculateFailureMechanismFailureProbabilityWithLengthEffectBoi1A2(
-                        failureMechanismN, sectionAssemblyResults.Select(FailureMechanismAssemblyCalculatorInputCreator.CreateResultWithProfileAndSectionProbabilities),
+                    result = kernel.CalculateFailureMechanismFailureProbabilityBoi1A2(
+                        sectionAssemblyResults.Select(sr => AssemblyCalculatorInputCreator.CreateProbability(sr.SectionProbability)).ToArray(),
+                        failureMechanismN,
                         false);
-                    return new FailureMechanismAssemblyResultWrapper(result.Probability, AssemblyMethod.BOI1A2);
+                    return new FailureMechanismAssemblyResultWrapper(result, AssemblyMethod.BOI1A2);
                 }
 
                 result = kernel.CalculateFailureMechanismFailureProbabilityBoi1A1(
-                    failureMechanismN, sectionAssemblyResults.Select(sr => AssemblyCalculatorInputCreator.CreateProbability(sr.SectionProbability)),
-                    false);
-                return new FailureMechanismAssemblyResultWrapper(result.Probability, AssemblyMethod.BOI1A1);
+                    sectionAssemblyResults.Select(sr => AssemblyCalculatorInputCreator.CreateProbability(sr.SectionProbability)).ToArray()
+                    , false);
+                return new FailureMechanismAssemblyResultWrapper(result, AssemblyMethod.BOI1A1);
             }
             catch (AssemblyException e)
             {
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs
===================================================================
diff -u -r21e461622614905a0d26b26b095347983a0f1946 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision 21e461622614905a0d26b26b095347983a0f1946)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs	(.../FailureMechanismSectionAssemblyCalculator.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -23,7 +23,6 @@
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Interfaces;
 using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentSection;
 using Assembly.Kernel.Model.Categories;
 using Assembly.Kernel.Model.FailureMechanismSections;
 using Riskeer.AssemblyTool.Data;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/AssessmentSectionAssemblyGroupBoundariesCalculator.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/AssessmentSectionAssemblyGroupBoundariesCalculator.cs	(.../AssessmentSectionAssemblyGroupBoundariesCalculator.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/AssessmentSectionAssemblyGroupBoundariesCalculator.cs	(.../AssessmentSectionAssemblyGroupBoundariesCalculator.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model.AssessmentSection;
+using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.Categories;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -23,7 +23,7 @@
 using System.Collections.Generic;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model.AssessmentSection;
+using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.Categories;
 using Riskeer.AssemblyTool.Data;
 using Riskeer.AssemblyTool.KernelWrapper.Creators;
Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs
===================================================================
diff -u -r7cedaf1fb3b8a6c92189a74734f55bafa018ca55 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs	(.../AssemblyErrorMessageCreator.cs)	(revision 7cedaf1fb3b8a6c92189a74734f55bafa018ca55)
+++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyErrorMessageCreator.cs	(.../AssemblyErrorMessageCreator.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -88,8 +88,6 @@
                     return Resources.AssemblyErrorMessageCreator_SignalFloodingProbabilityAboveMaximumAllowableFloodingProbability;
                 case EAssemblyErrors.LowerLimitIsAboveUpperLimit:
                     return Resources.AssemblyErrorMessageCreator_LowerLimitIsAboveUpperLimit;
-                case EAssemblyErrors.ValueMayNotBeNull:
-                case EAssemblyErrors.NonMatchingProbabilityValues:
                 case EAssemblyErrors.UndefinedProbability:
                 case EAssemblyErrors.ProbabilitiesNotBothDefinedOrUndefined:
                     return Resources.AssemblyErrorMessageCreator_InvalidInput;
@@ -117,13 +115,11 @@
                     return Resources.AssemblyErrorMessageCreator_ProfileProbabilityGreaterThanSectionProbability;
                 case EAssemblyErrors.EncounteredOneOrMoreSectionsWithoutResult:
                     return Resources.AssemblyErrorMessageCreator_All_sections_must_have_a_result;
-                case EAssemblyErrors.ErrorConstructingErrorMessage:
                 case EAssemblyErrors.CommonFailureMechanismSectionsDoNotHaveEqualSections:
                 case EAssemblyErrors.InvalidCategoryValue:
                 case EAssemblyErrors.InvalidEnumValue:
                 case EAssemblyErrors.UnequalCommonFailureMechanismSectionLists:
                 case EAssemblyErrors.CommonSectionsWithoutCategoryValues:
-                case EAssemblyErrors.InvalidArgumentType:
                     return Resources.AssemblyErrorMessageCreator_ErrorConstructingErrorMessage;
                 default:
                     throw new NotSupportedException();
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs
===================================================================
diff -u -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismAssemblyCalculatorTest.cs	(.../FailureMechanismAssemblyCalculatorTest.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -23,7 +23,6 @@
 using System.Linq;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.FailureMechanismSections;
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -34,7 +33,6 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
-using KernelFailureMechanismSectionAssemblyResult = Assembly.Kernel.Model.FailureMechanismSections.FailureMechanismSectionAssemblyResult;
 using RiskeerFailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Test.Calculators.Assembly
@@ -106,7 +104,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 FailureMechanismAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismAssemblyKernel;
-                kernel.ProbabilityResult = new FailureMechanismAssemblyResult(new Probability(random.NextDouble()), EFailureMechanismAssemblyMethod.Correlated);
+                kernel.ProbabilityResult = new Probability(random.NextDouble());
 
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
@@ -120,9 +118,8 @@
                 for (var i = 0; i < sectionAssemblyResults.Length; i++)
                 {
                     RiskeerFailureMechanismSectionAssemblyResult expected = sectionAssemblyResults.ElementAt(i);
-                    ResultWithProfileAndSectionProbabilities actual = kernel.FailureMechanismSectionAssemblyResults.ElementAt(i);
-                    ProbabilityAssert.AreEqual(expected.ProfileProbability, actual.ProbabilityProfile);
-                    ProbabilityAssert.AreEqual(expected.SectionProbability, actual.ProbabilitySection);
+                    Probability actual = kernel.FailureMechanismSectionAssemblyResults.ElementAt(i);
+                    ProbabilityAssert.AreEqual(expected.SectionProbability, actual);
                 }
             }
         }
@@ -143,15 +140,15 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 FailureMechanismAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismAssemblyKernel;
-                kernel.ProbabilityResult = new FailureMechanismAssemblyResult(new Probability(random.NextDouble()), EFailureMechanismAssemblyMethod.Correlated);
+                kernel.ProbabilityResult = new Probability(random.NextDouble());
 
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
 
                 // Call
                 calculator.Assemble(failureMechanismN, sectionAssemblyResults, false);
 
                 // Assert
-                Assert.AreEqual(failureMechanismN, kernel.LenghtEffectFactor);
+                Assert.AreEqual(0, kernel.LenghtEffectFactor);
                 Assert.IsFalse(kernel.PartialAssembly);
 
                 CollectionAssert.AreEqual(sectionAssemblyResults.Select(r => new Probability(r.SectionProbability)), kernel.FailureMechanismSectionProbabilities);
@@ -170,7 +167,7 @@
             {
                 var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance;
                 FailureMechanismAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismAssemblyKernel;
-                var output = new FailureMechanismAssemblyResult(new Probability(random.NextDouble()), EFailureMechanismAssemblyMethod.Correlated);
+                var output = new Probability(random.NextDouble());
                 kernel.ProbabilityResult = output;
 
                 var calculator = new FailureMechanismAssemblyCalculator(factory);
@@ -181,7 +178,7 @@
 
                 // Assert
                 Assert.IsTrue(kernel.Calculated);
-                ProbabilityAssert.AreEqual(assemblyResultWrapper.AssemblyResult, output.Probability);
+                ProbabilityAssert.AreEqual(assemblyResultWrapper.AssemblyResult, output);
                 Assert.AreEqual(assemblyResultWrapper.AssemblyMethod, expectedAssemblyMethod);
             }
         }
@@ -191,7 +188,7 @@
         {
             // Setup
             var random = new Random(21);
-            double probability = random.NextDouble();
+            double probability = 15;
             var invalidInput = new RiskeerFailureMechanismSectionAssemblyResult(probability, probability, random.NextDouble(),
                                                                                 (FailureMechanismSectionAssemblyGroup) 99);
 
@@ -210,10 +207,9 @@
 
                 // Assert
                 Assert.IsFalse(kernel.Calculated);
-
                 var exception = Assert.Throws<FailureMechanismAssemblyCalculatorException>(Call);
                 Assert.IsInstanceOf<Exception>(exception.InnerException);
-                Assert.AreEqual(AssemblyErrorMessageCreator.CreateGenericErrorMessage(), exception.Message);
+                Assert.AreEqual("De gespecificeerde kans moet in het bereik [0,1] liggen.", exception.Message);
             }
         }
 
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs
===================================================================
diff -u -r21e461622614905a0d26b26b095347983a0f1946 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision 21e461622614905a0d26b26b095347983a0f1946)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs	(.../FailureMechanismSectionAssemblyCalculatorTest.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentSection;
 using Assembly.Kernel.Model.Categories;
 using Assembly.Kernel.Model.FailureMechanismSections;
 using Core.Common.TestUtil;
@@ -38,7 +37,6 @@
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly;
 using Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Groups;
 using Riskeer.Common.Primitives;
-using FailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.Test.Calculators.Assembly
 {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculatorTest.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculatorTest.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesCalculatorTest.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculatorTest.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesCalculatorTest.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -23,7 +23,6 @@
 using System.Collections.Generic;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Model;
-using Assembly.Kernel.Model.AssessmentSection;
 using Assembly.Kernel.Model.Categories;
 using Core.Common.TestUtil;
 using NUnit.Framework;
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs
===================================================================
diff -u -r7cedaf1fb3b8a6c92189a74734f55bafa018ca55 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs	(.../AssemblyErrorMessageCreatorTest.cs)	(revision 7cedaf1fb3b8a6c92189a74734f55bafa018ca55)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Creators/AssemblyErrorMessageCreatorTest.cs	(.../AssemblyErrorMessageCreatorTest.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -63,8 +63,6 @@
         [TestCase(EAssemblyErrors.SectionLengthOutOfRange, "De trajectlengte moet groter zijn dan 0 [m].")]
         [TestCase(EAssemblyErrors.SignalFloodingProbabilityAboveMaximumAllowableFloodingProbability, "De signaleringsparameter moet kleiner zijn dan de omgevingswaarde.")]
         [TestCase(EAssemblyErrors.LowerLimitIsAboveUpperLimit, "De categoriebovengrens moet boven de categorieondergrens liggen.")]
-        [TestCase(EAssemblyErrors.ValueMayNotBeNull, "Er is ongeldige invoer gedefinieerd voor de gebruikte methode.")]
-        [TestCase(EAssemblyErrors.NonMatchingProbabilityValues, "Er is ongeldige invoer gedefinieerd voor de gebruikte methode.")]
         [TestCase(EAssemblyErrors.UndefinedProbability, "Er is ongeldige invoer gedefinieerd voor de gebruikte methode.")]
         [TestCase(EAssemblyErrors.ProbabilitiesNotBothDefinedOrUndefined, "Er is ongeldige invoer gedefinieerd voor de gebruikte methode.")]
         [TestCase(EAssemblyErrors.FailureMechanismSectionLengthInvalid, "Gezamenlijke lengte van alle deelvakken moet gelijk zijn aan de trajectlengte.")]
@@ -79,13 +77,11 @@
         [TestCase(EAssemblyErrors.EmptyResultsList, "Er ontbreekt invoer voor de assemblage rekenmodule waardoor de assemblage niet uitgevoerd kan worden.")]
         [TestCase(EAssemblyErrors.ProfileProbabilityGreaterThanSectionProbability, "De faalkans per vak moet groter zijn dan of gelijk zijn aan de faalkans per doorsnede.")]
         [TestCase(EAssemblyErrors.EncounteredOneOrMoreSectionsWithoutResult, "Alle vakken moeten een resultaat hebben.")]
-        [TestCase(EAssemblyErrors.ErrorConstructingErrorMessage, "Er is een onverwachte fout opgetreden.")]
         [TestCase(EAssemblyErrors.CommonFailureMechanismSectionsDoNotHaveEqualSections, "Er is een onverwachte fout opgetreden.")]
         [TestCase(EAssemblyErrors.InvalidCategoryValue, "Er is een onverwachte fout opgetreden.")]
         [TestCase(EAssemblyErrors.InvalidEnumValue, "Er is een onverwachte fout opgetreden.")]
         [TestCase(EAssemblyErrors.UnequalCommonFailureMechanismSectionLists, "Er is een onverwachte fout opgetreden.")]
         [TestCase(EAssemblyErrors.CommonSectionsWithoutCategoryValues, "Er is een onverwachte fout opgetreden.")]
-        [TestCase(EAssemblyErrors.InvalidArgumentType, "Er is een onverwachte fout opgetreden.")]
         public void CreateErrorMessage_SingleAssemblyError_ReturnsExpectedErrorMessage(EAssemblyErrors assemblyError, string expectedErrorMessage)
         {
             // Call
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj
===================================================================
diff -u -r0d2ad61816de23c77e9b741b5301265d3752cea3 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision 0d2ad61816de23c77e9b741b5301265d3752cea3)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <Import Project="$(SolutionDir)build\Test.targets" />
   <ItemGroup>
-      <Reference Include="Assembly.Kernel, Version=22.1.1.0, Culture=neutral, PublicKeyToken=null">
+      <Reference Include="Assembly.Kernel, Version=22.2.1.0, Culture=neutral, PublicKeyToken=null">
         <HintPath>..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll</HintPath>
       </Reference>
       <Reference Include="System" />
@@ -14,6 +14,7 @@
   </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+        <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
         <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj" />
         <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj" />
         <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj" />
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentSectionAssemblyGroupBoundariesAssert.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentSectionAssemblyGroupBoundariesAssert.cs	(.../AssessmentSectionAssemblyGroupBoundariesAssert.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/AssessmentSectionAssemblyGroupBoundariesAssert.cs	(.../AssessmentSectionAssemblyGroupBoundariesAssert.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -44,7 +44,7 @@
         public static void AssertAssessmentSectionAssemblyGroupBoundaries(CategoriesList<AssessmentSectionCategory> original,
                                                                           IEnumerable<AssessmentSectionAssemblyGroupBoundaries> actual)
         {
-            Assert.AreEqual(original.Categories.Length, actual.Count());
+            Assert.AreEqual(original.Categories.Count(), actual.Count());
 
             CollectionAssert.AreEqual(original.Categories.Select(o => GetAssessmentSectionAssemblyGroup(o.Category)),
                                       actual.Select(r => r.AssessmentSectionAssemblyGroup));
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/FailureMechanismSectionAssemblyGroupBoundariesAssert.cs
===================================================================
diff -u -rfa6b386609815ae4b5c860d8e697e0d86777bd56 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/FailureMechanismSectionAssemblyGroupBoundariesAssert.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesAssert.cs)	(revision fa6b386609815ae4b5c860d8e697e0d86777bd56)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/FailureMechanismSectionAssemblyGroupBoundariesAssert.cs	(.../FailureMechanismSectionAssemblyGroupBoundariesAssert.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -44,7 +44,7 @@
         public static void AssertFailureMechanismSectionAssemblyGroupBoundaries(CategoriesList<InterpretationCategory> original,
                                                                                 IEnumerable<FailureMechanismSectionAssemblyGroupBoundaries> actual)
         {
-            int expectedNrOfCategories = original.Categories.Length;
+            int expectedNrOfCategories = original.Categories.Count();
             Assert.AreEqual(expectedNrOfCategories, actual.Count());
 
             for (int i = 0; i < expectedNrOfCategories; i++)
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs	(.../AssessmentSectionAssemblyKernelStub.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/AssessmentSectionAssemblyKernelStub.cs	(.../AssessmentSectionAssemblyKernelStub.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -94,6 +94,17 @@
             return AssemblyProbability;
         }
 
+        public Probability CalculateAssessmentSectionFailureProbabilityBoi2A2(IEnumerable<Probability> correlatedFailureMechanismProbabilities, IEnumerable<Probability> uncorrelatedFailureMechanismProbabilities, bool partialAssembly)
+        {
+            ThrowException();
+
+            ProbabilityCalculated = true;
+            FailureMechanismProbabilities = correlatedFailureMechanismProbabilities;
+            PartialAssembly = partialAssembly;
+
+            return AssemblyProbability;
+        }
+
         public EAssessmentGrade DetermineAssessmentGradeBoi2B1(Probability failureProbability, CategoriesList<AssessmentSectionCategory> categories)
         {
             ThrowException();
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs
===================================================================
diff -u -r5803ce0932a4a12266a4ac9befcda4a01a6a7840 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs	(.../CombinedFailureMechanismSectionAssemblyKernelStub.cs)	(revision 5803ce0932a4a12266a4ac9befcda4a01a6a7840)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStub.cs	(.../CombinedFailureMechanismSectionAssemblyKernelStub.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -103,12 +103,6 @@
         /// </summary>
         public IEnumerable<FailureMechanismSectionWithCategory> CombinedSectionResults { get; set; }
 
-        public GreatestCommonDenominatorAssemblyResult AssembleCommonFailureMechanismSections(IEnumerable<FailureMechanismSectionList> failureMechanismSectionLists,
-                                                                                              double assessmentSectionLength, bool partialAssembly)
-        {
-            throw new NotImplementedException();
-        }
-
         public FailureMechanismSectionList FindGreatestCommonDenominatorSectionsBoi3A1(
             IEnumerable<FailureMechanismSectionList> failureMechanismSectionLists, double assessmentSectionLength)
         {
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs	(.../FailureMechanismAssemblyKernelStub.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismAssemblyKernelStub.cs	(.../FailureMechanismAssemblyKernelStub.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -44,9 +44,9 @@
         public double LenghtEffectFactor { get; private set; }
 
         /// <summary>
-        /// Gets the collection of <see cref="ResultWithProfileAndSectionProbabilities"/>.
+        /// Gets the collection of <see cref="ResultWithProfileAndSectionProbabilities"/>. 
         /// </summary>
-        public IEnumerable<ResultWithProfileAndSectionProbabilities> FailureMechanismSectionAssemblyResults { get; private set; }
+        public IEnumerable<Probability> FailureMechanismSectionAssemblyResults { get; private set; }
 
         /// <summary>
         /// Gets the collection of <see cref="Probability"/>.
@@ -61,7 +61,7 @@
         /// <summary>
         /// Sets the resulting probability.
         /// </summary>
-        public FailureMechanismAssemblyResult ProbabilityResult { private get; set; }
+        public Probability ProbabilityResult { private get; set; }
 
         /// <summary>
         /// Sets an indicator whether an <see cref="Exception"/> must be thrown while performing a calculation.
@@ -73,36 +73,39 @@
         /// </summary>
         public bool ThrowAssemblyExceptionOnCalculate { private get; set; }
 
-        public FailureMechanismAssemblyResult CalculateFailureMechanismFailureProbabilityWithLengthEffectBoi1A2(
-            double lengthEffectFactor,
-            IEnumerable<ResultWithProfileAndSectionProbabilities> failureMechanismSectionAssemblyResults,
-            bool partialAssembly)
+        public Probability CalculateFailureMechanismFailureProbabilityBoi1A1(IEnumerable<Probability> failureMechanismSectionAssemblyResults, bool partialAssembly)
         {
             ThrowException();
 
             Calculated = true;
-            LenghtEffectFactor = lengthEffectFactor;
-            FailureMechanismSectionAssemblyResults = failureMechanismSectionAssemblyResults;
+            FailureMechanismSectionProbabilities = failureMechanismSectionAssemblyResults;
             PartialAssembly = partialAssembly;
 
             return ProbabilityResult;
         }
 
-        public FailureMechanismAssemblyResult CalculateFailureMechanismFailureProbabilityBoi1A1(
-            double lengthEffectFactor,
-            IEnumerable<Probability> failureMechanismSectionProbabilities,
-            bool partialAssembly)
+        public Probability CalculateFailureMechanismFailureProbabilityBoi1A2(IEnumerable<Probability> failureMechanismSectionAssemblyResults, double lengthEffectFactor, bool partialAssembly)
         {
             ThrowException();
 
             Calculated = true;
             LenghtEffectFactor = lengthEffectFactor;
-            FailureMechanismSectionProbabilities = failureMechanismSectionProbabilities;
+            FailureMechanismSectionAssemblyResults = failureMechanismSectionAssemblyResults;
             PartialAssembly = partialAssembly;
 
             return ProbabilityResult;
         }
 
+        public BoundaryLimits CalculateFailureMechanismBoundariesBoi1B1(IEnumerable<Probability> failureMechanismSectionAssemblyResults, bool partialAssembly)
+        {
+            throw new NotImplementedException();
+        }
+
+        public BoundaryLimits CalculateFailureMechanismBoundariesBoi1B2(IEnumerable<ResultWithProfileAndSectionProbabilities> failureMechanismSectionAssemblyResults, bool partialAssembly)
+        {
+            throw new NotImplementedException();
+        }
+
         private void ThrowException()
         {
             AssemblyKernelStubHelper.ThrowException(ThrowExceptionOnCalculate, ThrowAssemblyExceptionOnCalculate, EAssemblyErrors.InvalidCategoryLimits);
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs
===================================================================
diff -u -r9e9976818f1b446948c3bf815cafe2e023f98ac1 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision 9e9976818f1b446948c3bf815cafe2e023f98ac1)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs	(.../FailureMechanismSectionAssemblyKernelStub.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -25,6 +25,7 @@
 using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.Categories;
 using Assembly.Kernel.Model.FailureMechanismSections;
+using Riskeer.AssemblyTool.Data;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Assembly
 {
@@ -117,17 +118,6 @@
             throw new NotImplementedException();
         }
 
-        public FailureMechanismSectionAssemblyResultWithLengthEffect TranslateAssessmentResultWithLengthEffectAggregatedMethod(ESectionInitialMechanismProbabilitySpecification relevance,
-                                                                                                                               Probability probabilityInitialMechanismProfile,
-                                                                                                                               Probability probabilityInitialMechanismSection,
-                                                                                                                               ERefinementStatus refinementStatus,
-                                                                                                                               Probability refinedProbabilityProfile,
-                                                                                                                               Probability refinedProbabilitySection,
-                                                                                                                               CategoriesList<InterpretationCategory> categories)
-        {
-            throw new NotImplementedException();
-        }
-
         public Probability DetermineRepresentativeProbabilityBoi0A1(
             bool refinementNecessary, Probability probabilityInitialMechanismSection,
             Probability refinedProbabilitySection)
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Groups/AssemblyCategoryLimitsKernelStub.cs
===================================================================
diff -u -r6aed0e1e023131150fd68bf61c0b849b0e1a20b6 -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Groups/AssemblyCategoryLimitsKernelStub.cs	(.../AssemblyCategoryLimitsKernelStub.cs)	(revision 6aed0e1e023131150fd68bf61c0b849b0e1a20b6)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Groups/AssemblyCategoryLimitsKernelStub.cs	(.../AssemblyCategoryLimitsKernelStub.cs)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -22,7 +22,7 @@
 using System;
 using Assembly.Kernel.Exceptions;
 using Assembly.Kernel.Interfaces;
-using Assembly.Kernel.Model.AssessmentSection;
+using Assembly.Kernel.Model;
 using Assembly.Kernel.Model.Categories;
 
 namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil.Kernels.Groups
Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj
===================================================================
diff -u -rb12d39c1a0cce7810f54306e9f0771938e869b5b -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
--- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision b12d39c1a0cce7810f54306e9f0771938e869b5b)
+++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj	(.../Riskeer.AssemblyTool.KernelWrapper.TestUtil.csproj)	(revision ff4a4a18fa807bdb2395122e3d35e4e0b947f9b5)
@@ -14,6 +14,7 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\..\..\Core\Common\test\Core.Common.TestUtil\Core.Common.TestUtil.csproj" />
+        <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Data\Riskeer.Common.Data.csproj" />
         <ProjectReference Include="..\..\..\Common\src\Riskeer.Common.Primitives\Riskeer.Common.Primitives.csproj" />
         <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.Data\Riskeer.AssemblyTool.Data.csproj" />
         <ProjectReference Include="..\..\src\Riskeer.AssemblyTool.KernelWrapper\Riskeer.AssemblyTool.KernelWrapper.csproj" />
Index: lib/Plugins/AssemblyTool/Assembly.Kernel.dll
===================================================================
diff -u -rc02fd5305b292c030adac022c9b6758d9a2cd82a -rff4a4a18fa807bdb2395122e3d35e4e0b947f9b5
Binary files differ