Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Riskeer.AssemblyTool.Data.csproj =================================================================== diff -u -r08e8d26a0715f0f3db57c1d3e86256aa06934db4 -rea195062546c9510b475b468797bea8f20bb4cbe --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Riskeer.AssemblyTool.Data.csproj (.../Riskeer.AssemblyTool.Data.csproj) (revision 08e8d26a0715f0f3db57c1d3e86256aa06934db4) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Riskeer.AssemblyTool.Data.csproj (.../Riskeer.AssemblyTool.Data.csproj) (revision ea195062546c9510b475b468797bea8f20bb4cbe) @@ -1,8 +1,11 @@  - - + + ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll + + + Fisheye: Tag 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/FailureMechanismSectionAssemblyCalculator.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 7c5dbd4a87ca57f9120da8ee9bca54da24abc2fc refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj =================================================================== diff -u -r58ff9e025291ded923f4d56274d743e9ab47043d -rea195062546c9510b475b468797bea8f20bb4cbe --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj (.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj) (revision 58ff9e025291ded923f4d56274d743e9ab47043d) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.Test/Riskeer.AssemblyTool.KernelWrapper.Test.csproj (.../Riskeer.AssemblyTool.KernelWrapper.Test.csproj) (revision ea195062546c9510b475b468797bea8f20bb4cbe) @@ -1,8 +1,7 @@  - - ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll + ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs =================================================================== diff -u -r618306c59a74197ea5ea8889cb23b0f5f2aa1c46 -rea195062546c9510b475b468797bea8f20bb4cbe --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision 618306c59a74197ea5ea8889cb23b0f5f2aa1c46) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision ea195062546c9510b475b468797bea8f20bb4cbe) @@ -46,12 +46,12 @@ /// /// Gets the initial probability of the profile for the failure path section. /// - public Probability InitialProbabilityProfile { get; private set; } + public Probability InitialProfileProbability { get; private set; } /// /// Gets the initial probability of the section for the failure path section. /// - public Probability InitialProbabilitySection { get; private set; } + public Probability InitialSectionProbability { get; private set; } /// /// Gets an indicator whether the section needs refinement or not. @@ -61,12 +61,12 @@ /// /// Gets the initial probability of the profile for the failure path section. /// - public Probability RefinedProbabilityProfile { get; private set; } + public Probability RefinedProfileProbability { get; private set; } /// /// Gets the initial probability of the section for the failure path section. /// - public Probability RefinedProbabilitySection { get; private set; } + public Probability RefinedSectionProbability { get; private set; } /// /// Gets the collection of categories. @@ -100,12 +100,12 @@ Calculated = true; IsRelevant = isRelevant; - InitialProbabilityProfile = probabilityInitialMechanismProfile; - InitialProbabilitySection = probabilityInitialMechanismSection; + InitialProfileProbability = probabilityInitialMechanismProfile; + InitialSectionProbability = probabilityInitialMechanismSection; NeedsRefinement = needsRefinement; - RefinedProbabilityProfile = refinedProbabilityProfile; - RefinedProbabilitySection = refinedProbabilitySection; + RefinedProfileProbability = refinedProbabilityProfile; + RefinedSectionProbability = refinedProbabilitySection; Categories = categories; Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs =================================================================== diff -u -ra3d8aaefe9b9e132878818a39f8a77469a851d41 -rea195062546c9510b475b468797bea8f20bb4cbe --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs (.../AssemblyToolKernelFactoryConfig.cs) (revision a3d8aaefe9b9e132878818a39f8a77469a851d41) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/Kernels/AssemblyToolKernelFactoryConfig.cs (.../AssemblyToolKernelFactoryConfig.cs) (revision ea195062546c9510b475b468797bea8f20bb4cbe) @@ -34,7 +34,7 @@ /// /// using(new AssemblyToolKernelFactoryConfig()) /// { - /// var testFactory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactoryOld.Instance; + /// var testFactory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; /// /// // Perform tests with testFactory /// } Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/ProbabilityAssert.cs =================================================================== diff -u --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/ProbabilityAssert.cs (revision 0) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.KernelWrapper.TestUtil/ProbabilityAssert.cs (revision ea195062546c9510b475b468797bea8f20bb4cbe) @@ -0,0 +1,21 @@ +using Assembly.Kernel.Model; +using NUnit.Framework; + +namespace Riskeer.AssemblyTool.KernelWrapper.TestUtil +{ + /// + /// Class for asserting probabilities + /// + public static class ProbabilityAssert + { + /// + /// Asserts whether represents the same probability as . + /// + /// The expected probability. + /// The actual probability + public static void AreEqual(double expected, Probability actual) + { + Assert.AreEqual(expected, actual.Value); + } + } +} \ No newline at end of file