Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -r13b60c813781532e9ca47af46e2b1cbc03f4c776 -r0d2ad61816de23c77e9b741b5301265d3752cea3 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 13b60c813781532e9ca47af46e2b1cbc03f4c776) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs (.../FailureMechanismSectionAssemblyCalculator.cs) (revision 0d2ad61816de23c77e9b741b5301265d3752cea3) @@ -25,6 +25,7 @@ using Assembly.Kernel.Model; using Assembly.Kernel.Model.AssessmentSection; using Assembly.Kernel.Model.Categories; +using Assembly.Kernel.Model.FailureMechanismSections; using Riskeer.AssemblyTool.Data; using Riskeer.AssemblyTool.KernelWrapper.Creators; using Riskeer.AssemblyTool.KernelWrapper.Kernels; @@ -64,7 +65,7 @@ KernelFailureMechanismSectionAssemblyResult GetAssemblyResultFunc( IAssessmentResultsTranslator kernel, CategoriesList interpretationCategories) => - kernel.DetermineRepresentativeProbabilitiesBoi0A2( + kernel.TranslateAssessmentResultAggregatedMethod( GetInitialMechanismProbabilitySpecification(input), AssemblyCalculatorInputCreator.CreateProbability(input.InitialSectionProbability), FailureMechanismSectionAssemblyCalculatorInputCreator.ConvertFailureMechanismSectionResultFurtherAnalysisType(input.FurtherAnalysisType), @@ -81,9 +82,9 @@ throw new ArgumentNullException(nameof(input)); } - KernelFailureMechanismSectionAssemblyResult GetAssemblyResultFunc( + FailureMechanismSectionAssemblyResultWithLengthEffect GetAssemblyResultFunc( IAssessmentResultsTranslator kernel, CategoriesList interpretationCategories) => - kernel.TranslateAssessmentResultWbi0A2( + kernel.TranslateAssessmentResultWithLengthEffectAggregatedMethod( GetInitialMechanismProbabilitySpecification(input), AssemblyCalculatorInputCreator.CreateProbability(input.InitialProfileProbability), AssemblyCalculatorInputCreator.CreateProbability(input.InitialSectionProbability), @@ -95,18 +96,18 @@ return AssembleFailureMechanismSection(GetAssemblyResultFunc, input.SignalFloodingProbability, input.MaximumAllowableFloodingProbability); } - private RiskeerFailureMechanismSectionAssemblyResult AssembleFailureMechanismSection( - Func, KernelFailureMechanismSectionAssemblyResult> getAssemblyResultFunc, + private RiskeerFailureMechanismSectionAssemblyResult AssembleFailureMechanismSection( + Func, TAssemblyResult> getAssemblyResultFunc, double signalFloodingProbability, double maximumAllowableFloodingProbability) { try { ICategoryLimitsCalculator assemblyGroupsKernel = factory.CreateAssemblyGroupsKernel(); - CategoriesList interpretationCategories = assemblyGroupsKernel.CalculateInterpretationCategoryLimitsWbi03( + CategoriesList interpretationCategories = assemblyGroupsKernel.CalculateInterpretationCategoryLimitsBoi01( new AssessmentSection(AssemblyCalculatorInputCreator.CreateProbability(signalFloodingProbability), AssemblyCalculatorInputCreator.CreateProbability(maximumAllowableFloodingProbability))); - KernelFailureMechanismSectionAssemblyResult output = getAssemblyResultFunc(factory.CreateFailureMechanismSectionAssemblyKernel(), interpretationCategories); + TAssemblyResult output = getAssemblyResultFunc(factory.CreateFailureMechanismSectionAssemblyKernel(), interpretationCategories); return FailureMechanismSectionAssemblyResultCreator.CreateFailureMechanismSectionAssemblyResult(output); } Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/AssessmentSectionAssemblyGroupBoundariesCalculator.cs =================================================================== diff -u -rec1498df715811275418ab822d8c9334adae3a69 -r0d2ad61816de23c77e9b741b5301265d3752cea3 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/AssessmentSectionAssemblyGroupBoundariesCalculator.cs (.../AssessmentSectionAssemblyGroupBoundariesCalculator.cs) (revision ec1498df715811275418ab822d8c9334adae3a69) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/AssessmentSectionAssemblyGroupBoundariesCalculator.cs (.../AssessmentSectionAssemblyGroupBoundariesCalculator.cs) (revision 0d2ad61816de23c77e9b741b5301265d3752cea3) @@ -58,7 +58,7 @@ try { ICategoryLimitsCalculator kernel = factory.CreateAssemblyGroupsKernel(); - CategoriesList assessmentSectionCategories = kernel.CalculateAssessmentSectionCategoryLimitsWbi21( + CategoriesList assessmentSectionCategories = kernel.CalculateAssessmentSectionCategoryLimitsBoi21( new AssessmentSection(AssemblyCalculatorInputCreator.CreateProbability(signalFloodingProbability), AssemblyCalculatorInputCreator.CreateProbability(maximumAllowableFloodingProbability))); Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs =================================================================== diff -u -rfc7ea4e6dd24e0417f8a81b834933f0c88af113d -r0d2ad61816de23c77e9b741b5301265d3752cea3 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs (.../FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs) (revision fc7ea4e6dd24e0417f8a81b834933f0c88af113d) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Groups/FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs (.../FailureMechanismSectionAssemblyGroupBoundariesCalculator.cs) (revision 0d2ad61816de23c77e9b741b5301265d3752cea3) @@ -59,7 +59,7 @@ try { ICategoryLimitsCalculator kernel = factory.CreateAssemblyGroupsKernel(); - CategoriesList interpretationCategories = kernel.CalculateInterpretationCategoryLimitsWbi03( + CategoriesList interpretationCategories = kernel.CalculateInterpretationCategoryLimitsBoi01( new AssessmentSection(AssemblyCalculatorInputCreator.CreateProbability(signalFloodingProbability), AssemblyCalculatorInputCreator.CreateProbability(maximumAllowableFloodingProbability))); Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs =================================================================== diff -u -re0e4a5e7fcca8955597e55bbb4c624cd54d0c1dd -r0d2ad61816de23c77e9b741b5301265d3752cea3 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs (.../FailureMechanismSectionAssemblyGroupConverter.cs) (revision e0e4a5e7fcca8955597e55bbb4c624cd54d0c1dd) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyGroupConverter.cs (.../FailureMechanismSectionAssemblyGroupConverter.cs) (revision 0d2ad61816de23c77e9b741b5301265d3752cea3) @@ -70,7 +70,7 @@ return FailureMechanismSectionAssemblyGroup.IIIMin; case EInterpretationCategory.Dominant: return FailureMechanismSectionAssemblyGroup.Dominant; - case EInterpretationCategory.Gr: + case EInterpretationCategory.NoResult: return FailureMechanismSectionAssemblyGroup.Gr; case EInterpretationCategory.NotRelevant: return FailureMechanismSectionAssemblyGroup.NotRelevant; @@ -118,7 +118,7 @@ case FailureMechanismSectionAssemblyGroup.Dominant: return EInterpretationCategory.Dominant; case FailureMechanismSectionAssemblyGroup.Gr: - return EInterpretationCategory.Gr; + return EInterpretationCategory.NoResult; case FailureMechanismSectionAssemblyGroup.NotRelevant: return EInterpretationCategory.NotRelevant; default: Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyResultCreator.cs =================================================================== diff -u -r7d2ff0f5928ee2cd9173914e8399ac0b13530c7c -r0d2ad61816de23c77e9b741b5301265d3752cea3 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyResultCreator.cs (.../FailureMechanismSectionAssemblyResultCreator.cs) (revision 7d2ff0f5928ee2cd9173914e8399ac0b13530c7c) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailureMechanismSectionAssemblyResultCreator.cs (.../FailureMechanismSectionAssemblyResultCreator.cs) (revision 0d2ad61816de23c77e9b741b5301265d3752cea3) @@ -42,7 +42,8 @@ /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - public static RiskeerFailureMechanismSectionAssemblyResult CreateFailureMechanismSectionAssemblyResult(KernelFailureMechanismSectionAssemblyResult result) + public static RiskeerFailureMechanismSectionAssemblyResult CreateFailureMechanismSectionAssemblyResult( + KernelFailureMechanismSectionAssemblyResult result) { if (result == null) { Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r13b60c813781532e9ca47af46e2b1cbc03f4c776 -r0d2ad61816de23c77e9b741b5301265d3752cea3 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 13b60c813781532e9ca47af46e2b1cbc03f4c776) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/AssessmentSectionAssemblyCalculatorTest.cs (.../AssessmentSectionAssemblyCalculatorTest.cs) (revision 0d2ad61816de23c77e9b741b5301265d3752cea3) @@ -25,7 +25,6 @@ using System.Linq; 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; @@ -141,6 +140,7 @@ ProbabilityAssert.AreEqual(failureMechanismProbabilities.ElementAt(i), actualProbabilitiesInput.ElementAt(i)); } + Assert.AreEqual(assemblyProbability, assessmentSectionAssemblyKernel.AssemblyProbabilityInput); } } @@ -161,7 +161,7 @@ var assemblyGroup = random.NextEnumValue(); kernel.AssemblyProbability = assemblyProbability; kernel.AssemblyGroup = assemblyGroup; - + var calculator = new AssessmentSectionAssemblyCalculator(factory); // Call @@ -251,7 +251,7 @@ Assert.IsInstanceOf(exception.InnerException); Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { - new AssemblyErrorMessage(string.Empty, EAssemblyErrors.InvalidCategoryLimits) + CreateAssemblyErrorMessage(string.Empty, EAssemblyErrors.InvalidCategoryLimits) }), exception.Message); } } @@ -319,7 +319,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - kernel.AssemblyResult = new AssemblyResult(new[] + kernel.AssemblyResult = new GreatestCommonDenominatorAssemblyResult(new[] { new FailureMechanismSectionList(new[] { @@ -353,7 +353,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - kernel.AssemblyResult = new AssemblyResult(new[] + kernel.AssemblyResult = new GreatestCommonDenominatorAssemblyResult(new[] { new FailureMechanismSectionList(new[] { @@ -390,7 +390,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; CombinedFailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedCombinedFailureMechanismSectionAssemblyKernel; - kernel.AssemblyResult = new AssemblyResult(new[] + kernel.AssemblyResult = new GreatestCommonDenominatorAssemblyResult(new[] { new FailureMechanismSectionList(new[] { @@ -482,9 +482,14 @@ Assert.IsInstanceOf(exception.InnerException); Assert.AreEqual(AssemblyErrorMessageCreator.CreateErrorMessage(new[] { - new AssemblyErrorMessage(string.Empty, EAssemblyErrors.EmptyResultsList) + CreateAssemblyErrorMessage(string.Empty, EAssemblyErrors.EmptyResultsList) }), exception.Message); } } + + private static AssemblyErrorMessage CreateAssemblyErrorMessage(string entityId, EAssemblyErrors errorCode) + { + return (AssemblyErrorMessage) Activator.CreateInstance(typeof(AssemblyErrorMessage), entityId, errorCode); + } } } \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj =================================================================== diff -u -r05c46d8599ab0ae77535a1b634508c3b5a0dfa8d -r0d2ad61816de23c77e9b741b5301265d3752cea3 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj (.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj) (revision 05c46d8599ab0ae77535a1b634508c3b5a0dfa8d) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj (.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj) (revision 0d2ad61816de23c77e9b741b5301265d3752cea3) @@ -1,8 +1,8 @@  - - ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll + + ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll