Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -rdcf5ea07273fabb6650f3836bffadbfeb5b4948a -r321e7c94bd5b80e05b943cbbd6e6b0461b96fafa --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision dcf5ea07273fabb6650f3836bffadbfeb5b4948a) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 321e7c94bd5b80e05b943cbbd6e6b0461b96fafa) @@ -147,7 +147,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -170,7 +170,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -179,7 +179,7 @@ FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(random.NextEnumValue()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -192,7 +192,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -285,7 +285,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -308,7 +308,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -317,7 +317,7 @@ FailureMechanismSectionAssembly assembly = calculator.AssembleSimpleAssessment(random.NextEnumValue()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -330,7 +330,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -583,7 +583,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -619,7 +619,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -649,7 +649,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -661,7 +661,7 @@ CreateAssemblyCategoriesInput()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -674,7 +674,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -790,7 +790,7 @@ CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -828,7 +828,7 @@ CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -858,7 +858,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -872,7 +872,7 @@ random.NextDouble()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -885,7 +885,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1005,7 +1005,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1043,7 +1043,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1074,7 +1074,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1087,7 +1087,7 @@ CreateAssemblyCategoriesInput()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -1100,7 +1100,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1771,7 +1771,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1803,7 +1803,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1831,7 +1831,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1843,7 +1843,7 @@ CreateAssemblyCategoriesInput()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -1856,7 +1856,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -1970,7 +1970,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2004,7 +2004,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2034,7 +2034,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2047,7 +2047,7 @@ CreateAssemblyCategoriesInput()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -2060,7 +2060,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2318,7 +2318,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2343,7 +2343,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2353,7 +2353,7 @@ new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue())); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -2367,7 +2367,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2473,7 +2473,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2498,7 +2498,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -2510,7 +2510,7 @@ new FailureMechanismSectionAssembly(random.NextDouble(), random.NextEnumValue())); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -2524,7 +2524,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3089,7 +3089,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3120,7 +3120,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3146,7 +3146,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3155,7 +3155,7 @@ FailureMechanismSectionAssembly assembly = calculator.AssembleManual(random.NextDouble(), CreateAssemblyCategoriesInput()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -3168,7 +3168,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3248,7 +3248,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3284,7 +3284,7 @@ categoriesKernel.FailureMechanismSectionCategoriesOutput = CategoriesListTestFactory.CreateFailureMechanismSectionCategories(); FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3311,7 +3311,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); @@ -3320,7 +3320,7 @@ FailureMechanismSectionAssembly assembly = calculator.AssembleManual(random.NextDouble(), random.NextDouble(), CreateAssemblyCategoriesInput()); // Assert - AssertCalculatorOutput(kernel.FailureMechanismAssemblyDirectResultWithProbability, assembly); + AssertCalculatorOutput(kernel.FailureMechanismSectionDirectResultWithProbability, assembly); } } @@ -3333,7 +3333,7 @@ { var factory = (TestAssemblyToolKernelFactory) AssemblyToolKernelFactory.Instance; FailureMechanismSectionAssemblyKernelStub kernel = factory.LastCreatedFailureMechanismSectionAssemblyKernel; - kernel.FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, + kernel.FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability((EFmSectionCategory) 99, random.NextDouble()); var calculator = new FailureMechanismSectionAssemblyCalculator(factory); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -rdcf5ea07273fabb6650f3836bffadbfeb5b4948a -r321e7c94bd5b80e05b943cbbd6e6b0461b96fafa --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision dcf5ea07273fabb6650f3836bffadbfeb5b4948a) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 321e7c94bd5b80e05b943cbbd6e6b0461b96fafa) @@ -60,7 +60,7 @@ Assert.IsNaN(kernel.LengthEffectFactorInput); Assert.IsNull(kernel.CategoryCompliancyResultsInput); Assert.IsNull(kernel.FailureMechanismSectionDirectResult); - Assert.IsNull(kernel.FailureMechanismAssemblyDirectResultWithProbability); + Assert.IsNull(kernel.FailureMechanismSectionDirectResultWithProbability); Assert.IsNull(kernel.FailureMechanismSectionCategories); } @@ -93,15 +93,15 @@ var random = new Random(39); var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()) }; // Call FmSectionAssemblyDirectResult result = kernel.TranslateAssessmentResultWbi0E1(0); // Assert - Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResultWithProbability, result); } [Test] @@ -187,15 +187,15 @@ var random = new Random(39); var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()) }; // Call FmSectionAssemblyDirectResult result = kernel.TranslateAssessmentResultWbi0E3(0); // Assert - Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResultWithProbability, result); } [Test] @@ -394,7 +394,7 @@ var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()) }; @@ -404,7 +404,7 @@ categories); // Assert - Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResultWithProbability, result); } [Test] @@ -515,7 +515,7 @@ var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()) }; @@ -526,7 +526,7 @@ categories); // Assert - Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResultWithProbability, result); } [Test] @@ -820,7 +820,7 @@ var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()) }; @@ -830,7 +830,7 @@ categories); // Assert - Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResultWithProbability, result); } [Test] @@ -1022,7 +1022,7 @@ var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()) }; @@ -1033,7 +1033,7 @@ categories); // Assert - Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResultWithProbability, result); } [Test] @@ -1337,7 +1337,7 @@ var kernel = new FailureMechanismSectionAssemblyKernelStub { - FailureMechanismAssemblyDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), + FailureMechanismSectionDirectResultWithProbability = new FmSectionAssemblyDirectResultWithProbability(random.NextEnumValue(), random.NextDouble()) }; @@ -1346,7 +1346,7 @@ simpleAssemblyResult, detailedAssemblyResult, tailorMadeAssemblyResult); // Assert - Assert.AreSame(kernel.FailureMechanismAssemblyDirectResultWithProbability, result); + Assert.AreSame(kernel.FailureMechanismSectionDirectResultWithProbability, result); } [Test] @@ -1373,7 +1373,7 @@ Assert.IsNull(kernel.DetailedAssessmentResultInputWithProbability); Assert.IsNull(kernel.TailorMadeAssessmentResultInputWithProbability); Assert.IsFalse(kernel.Calculated); - Assert.IsNull(kernel.FailureMechanismAssemblyDirectResultWithProbability); + Assert.IsNull(kernel.FailureMechanismSectionDirectResultWithProbability); } [Test] Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs =================================================================== diff -u -rdcf5ea07273fabb6650f3836bffadbfeb5b4948a -r321e7c94bd5b80e05b943cbbd6e6b0461b96fafa --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision dcf5ea07273fabb6650f3836bffadbfeb5b4948a) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStub.cs (.../FailureMechanismSectionAssemblyKernelStub.cs) (revision 321e7c94bd5b80e05b943cbbd6e6b0461b96fafa) @@ -153,7 +153,7 @@ /// /// Gets or sets the failure mechanism section assembly result with probability. /// - public FmSectionAssemblyDirectResultWithProbability FailureMechanismAssemblyDirectResultWithProbability { get; set; } + public FmSectionAssemblyDirectResultWithProbability FailureMechanismSectionDirectResultWithProbability { get; set; } /// /// Gets a value indicating whether a calculation was called or not. @@ -177,7 +177,7 @@ AssessmentResultTypeE1Input = assessment; Calculated = true; - return FailureMechanismAssemblyDirectResultWithProbability; + return FailureMechanismSectionDirectResultWithProbability; } public FmSectionAssemblyIndirectResult TranslateAssessmentResultWbi0E2(EAssessmentResultTypeE1 assessment) @@ -192,7 +192,7 @@ AssessmentResultTypeE2Input = assessment; Calculated = true; - return FailureMechanismAssemblyDirectResultWithProbability; + return FailureMechanismSectionDirectResultWithProbability; } public FmSectionAssemblyIndirectResult TranslateAssessmentResultWbi0E4(EAssessmentResultTypeE2 assessment) @@ -226,7 +226,7 @@ FailureMechanismSectionCategories = categories; Calculated = true; - return FailureMechanismAssemblyDirectResultWithProbability; + return FailureMechanismSectionDirectResultWithProbability; } public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0G4(EAssessmentResultTypeG2 assessment, EFmSectionCategory? category) @@ -247,7 +247,7 @@ FailureMechanismSectionCategories = categories; Calculated = true; - return FailureMechanismAssemblyDirectResultWithProbability; + return FailureMechanismSectionDirectResultWithProbability; } public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0G6(FmSectionCategoryCompliancyResults compliancyResults) @@ -286,7 +286,7 @@ FailureMechanismSectionCategories = categories; Calculated = true; - return FailureMechanismAssemblyDirectResultWithProbability; + return FailureMechanismSectionDirectResultWithProbability; } public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0T4(EAssessmentResultTypeT3 assessment, EFmSectionCategory? category) @@ -313,7 +313,7 @@ FailureMechanismSectionCategories = categories; Calculated = true; - return FailureMechanismAssemblyDirectResultWithProbability; + return FailureMechanismSectionDirectResultWithProbability; } public FmSectionAssemblyDirectResult TranslateAssessmentResultWbi0T6(FmSectionCategoryCompliancyResults compliancyResults, EAssessmentResultTypeT3 assessment) @@ -360,7 +360,7 @@ TailorMadeAssessmentResultInputWithProbability = customAssessmentResult; Calculated = true; - return FailureMechanismAssemblyDirectResultWithProbability; + return FailureMechanismSectionDirectResultWithProbability; } public FmSectionAssemblyIndirectResult TranslateAssessmentResultWbi0A1(FmSectionAssemblyIndirectResult simpleAssessmentResult,