Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailurePathAssemblyCalculatorInputCreator.cs =================================================================== diff -u -r368312895bc9b673831dd308d041c8ed6a9340c7 -r2a77d9d24be100a30ec8e2ed8a173d92232bf361 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailurePathAssemblyCalculatorInputCreator.cs (.../FailurePathAssemblyCalculatorInputCreator.cs) (revision 368312895bc9b673831dd308d041c8ed6a9340c7) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/FailurePathAssemblyCalculatorInputCreator.cs (.../FailurePathAssemblyCalculatorInputCreator.cs) (revision 2a77d9d24be100a30ec8e2ed8a173d92232bf361) @@ -23,8 +23,9 @@ using System.ComponentModel; using Assembly.Kernel.Model; using Assembly.Kernel.Model.Categories; -using Assembly.Kernel.Model.FailurePathSections; using Riskeer.AssemblyTool.Data; +using AssemblyFailureMechanismSectionAssemblyResult = Assembly.Kernel.Model.FailureMechanismSections.FailureMechanismSectionAssemblyResult; +using RiskeerFailureMechanismSectionAssemblyResult = Riskeer.AssemblyTool.Data.FailureMechanismSectionAssemblyResult; namespace Riskeer.AssemblyTool.KernelWrapper.Creators { @@ -34,26 +35,26 @@ internal static class FailurePathAssemblyCalculatorInputCreator { /// - /// Creates a based on . + /// Creates an based on . /// - /// The to create the - /// with. - /// A . + /// The to create the + /// with. + /// An . /// Thrown when is null. /// Thrown when /// is an invalid value. /// Thrown when /// is a valid value, but unsupported. - public static FailurePathSectionAssemblyResult CreateFailurePathSectionAssemblyResult(FailureMechanismSectionAssemblyResult result) + public static AssemblyFailureMechanismSectionAssemblyResult CreateFailurePathSectionAssemblyResult(RiskeerFailureMechanismSectionAssemblyResult result) { if (result == null) { throw new ArgumentNullException(nameof(result)); } - return new FailurePathSectionAssemblyResult(new Probability(result.ProfileProbability), - new Probability(result.SectionProbability), - CreateInterpretationCategory(result.AssemblyGroup)); + return new AssemblyFailureMechanismSectionAssemblyResult(new Probability(result.ProfileProbability), + new Probability(result.SectionProbability), + CreateInterpretationCategory(result.AssemblyGroup)); } /// @@ -77,15 +78,13 @@ switch (assemblyGroup) { case FailureMechanismSectionAssemblyGroup.ND: - return EInterpretationCategory.ND; + return EInterpretationCategory.NotDominant; case FailureMechanismSectionAssemblyGroup.III: return EInterpretationCategory.III; case FailureMechanismSectionAssemblyGroup.II: return EInterpretationCategory.II; case FailureMechanismSectionAssemblyGroup.I: return EInterpretationCategory.I; - case FailureMechanismSectionAssemblyGroup.ZeroPlus: - return EInterpretationCategory.ZeroPlus; case FailureMechanismSectionAssemblyGroup.Zero: return EInterpretationCategory.Zero; case FailureMechanismSectionAssemblyGroup.IMin: @@ -95,7 +94,7 @@ case FailureMechanismSectionAssemblyGroup.IIIMin: return EInterpretationCategory.IIIMin; case FailureMechanismSectionAssemblyGroup.D: - return EInterpretationCategory.D; + return EInterpretationCategory.Dominant; case FailureMechanismSectionAssemblyGroup.Gr: return EInterpretationCategory.Gr; default: Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs =================================================================== diff -u -rb00f90b641c3c2975346118800c76fd95b738703 -r2a77d9d24be100a30ec8e2ed8a173d92232bf361 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs (.../AssemblyToolKernelFactory.cs) (revision b00f90b641c3c2975346118800c76fd95b738703) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/AssemblyToolKernelFactory.cs (.../AssemblyToolKernelFactory.cs) (revision 2a77d9d24be100a30ec8e2ed8a173d92232bf361) @@ -52,9 +52,9 @@ return new AssessmentResultsTranslator(); } - public IFailurePathResultAssembler CreateFailurePathAssemblyKernel() + public IFailureMechanismResultAssembler CreateFailurePathAssemblyKernel() { - return new FailurePathResultAssembler(); + return new FailureMechanismResultAssembler(); } } } \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs =================================================================== diff -u -rb00f90b641c3c2975346118800c76fd95b738703 -r2a77d9d24be100a30ec8e2ed8a173d92232bf361 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs (.../IAssemblyToolKernelFactory.cs) (revision b00f90b641c3c2975346118800c76fd95b738703) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Kernels/IAssemblyToolKernelFactory.cs (.../IAssemblyToolKernelFactory.cs) (revision 2a77d9d24be100a30ec8e2ed8a173d92232bf361) @@ -44,6 +44,6 @@ /// Creates a failure path assembly kernel. /// /// A new . - IFailurePathResultAssembler CreateFailurePathAssemblyKernel(); + IFailureMechanismResultAssembler CreateFailurePathAssemblyKernel(); } } \ No newline at end of file