Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Forms/SelectableFailureMechanismSectionAssemblyCategoryGroup.cs =================================================================== diff -u -rd7149e4c2d72271eec59cbd126554557b28a6eb8 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Forms/SelectableFailureMechanismSectionAssemblyCategoryGroup.cs (.../SelectableFailureMechanismSectionAssemblyCategoryGroup.cs) (revision d7149e4c2d72271eec59cbd126554557b28a6eb8) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.Forms/SelectableFailureMechanismSectionAssemblyCategoryGroup.cs (.../SelectableFailureMechanismSectionAssemblyCategoryGroup.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -20,7 +20,6 @@ // All rights reserved. using Core.Common.Util.Attributes; -using Ringtoets.AssemblyTool.Forms.Properties; using RingtoetsCommonPrimitivesResources = Ringtoets.Common.Primitives.Properties.Resources; namespace Ringtoets.AssemblyTool.Forms Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/Enums/SerializableFailureMechanismSectionType.cs =================================================================== diff -u -rfb23c7e9b2fde4f4439e758e56ae5ed957385a71 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/Enums/SerializableFailureMechanismSectionType.cs (.../SerializableFailureMechanismSectionType.cs) (revision fb23c7e9b2fde4f4439e758e56ae5ed957385a71) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/Enums/SerializableFailureMechanismSectionType.cs (.../SerializableFailureMechanismSectionType.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -38,6 +38,6 @@ /// Represents a combined failure mechanism section. /// [XmlEnum(AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeCombined)] - Combined = 2, + Combined = 2 } } \ No newline at end of file Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs =================================================================== diff -u -r1f88ea122db66685810334df995c5ce69f164752 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs (.../SerializableFailureMechanismSection.cs) (revision 1f88ea122db66685810334df995c5ce69f164752) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSection.cs (.../SerializableFailureMechanismSection.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -25,7 +25,6 @@ using Core.Common.Base.Geometry; using Ringtoets.AssemblyTool.IO.Model.DataTypes; using Ringtoets.AssemblyTool.IO.Model.Enums; -using Ringtoets.AssemblyTool.IO.Properties; namespace Ringtoets.AssemblyTool.IO.Model { Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs =================================================================== diff -u -r027ddff0c64524c262be1c3cbd01c44ecb4d352a -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision 027ddff0c64524c262be1c3cbd01c44ecb4d352a) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.KernelWrapper/Calculators/Assembly/IFailureMechanismSectionAssemblyCalculator.cs (.../IFailureMechanismSectionAssemblyCalculator.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -103,7 +103,7 @@ /// an error occurs while assembling. FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, double probability, - double normativeNorm, + double normativeNorm, double failureMechanismN, double failureMechanismContribution); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs =================================================================== diff -u -r1f88ea122db66685810334df995c5ce69f164752 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision 1f88ea122db66685810334df995c5ce69f164752) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/AssemblyXmlIdentifiersTest.cs (.../AssemblyXmlIdentifiersTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -105,7 +105,6 @@ Assert.AreEqual("uom", AssemblyXmlIdentifiers.UnitOfMeasure); Assert.AreEqual("upperCorner", AssemblyXmlIdentifiers.UpperCorner); - } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs =================================================================== diff -u -rfb23c7e9b2fde4f4439e758e56ae5ed957385a71 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs (.../AssemblyXmlEnumIdentifiersTest.cs) (revision fb23c7e9b2fde4f4439e758e56ae5ed957385a71) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/Enums/AssemblyXmlEnumIdentifiersTest.cs (.../AssemblyXmlEnumIdentifiersTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -106,7 +106,7 @@ Assert.AreEqual("TOETSOPMT", AssemblyXmlEnumIdentifiers.SerializableAssessmentLevelTailorMadeAssessment); Assert.AreEqual("GECBNTR", AssemblyXmlEnumIdentifiers.SerializableAssessmentLevelCombinedAssessment); Assert.AreEqual("GECBNTRDV", AssemblyXmlEnumIdentifiers.SerializableAssessmentLevelCombinedSectionAssessment); - + Assert.AreEqual("TOETSSSTE", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeFailureMechanism); Assert.AreEqual("GECBNETSSTE", AssemblyXmlEnumIdentifiers.SerializableFailureMechanismSectionTypeCombined); } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs =================================================================== diff -u -rfb23c7e9b2fde4f4439e758e56ae5ed957385a71 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs (.../SerializableFailureMechanismSectionTest.cs) (revision fb23c7e9b2fde4f4439e758e56ae5ed957385a71) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionTest.cs (.../SerializableFailureMechanismSectionTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -82,7 +82,7 @@ random.NextDouble(), random.NextDouble(), Enumerable.Empty(), - random.NextEnumValue()); + random.NextEnumValue()); // Assert var exception = Assert.Throws(call); Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs =================================================================== diff -u -r027a320bc8caa145acdbf284d3d9c54f61c2d07b -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 027a320bc8caa145acdbf284d3d9c54f61c2d07b) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.Test/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorTest.cs (.../FailureMechanismSectionAssemblyCalculatorTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -25,7 +25,6 @@ using Assembly.Kernel.Exceptions; using Assembly.Kernel.Model; using Assembly.Kernel.Model.AssessmentResultTypes; -using Assembly.Kernel.Model.CategoryLimits; using Assembly.Kernel.Model.FmSectionTypes; using Core.Common.TestUtil; using NUnit.Framework; @@ -800,8 +799,8 @@ calculator.AssembleDetailedAssessment( detailedAssessment, probability, - normativeNorm, - n, + normativeNorm, + n, failureMechanismContribution); // Assert @@ -3106,7 +3105,6 @@ AssertAssemblyCategoriesInput(assemblyCategoriesInput, categoriesKernel, kernel); - } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -r26526273b41c27da77879f295a5ade4d4a9a84bb -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs (.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs) (revision 26526273b41c27da77879f295a5ade4d4a9a84bb) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/CombinedFailureMechanismSectionAssemblyKernelStubTest.cs (.../CombinedFailureMechanismSectionAssemblyKernelStubTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -190,7 +190,7 @@ { return new FailureMechanismSectionList(string.Empty, new[] { - new FailureMechanismSection(0, 1) + new FailureMechanismSection(0, 1) }); } } Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs =================================================================== diff -u -r03a42f53227ba94fae59ac8a103861e201138398 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 03a42f53227ba94fae59ac8a103861e201138398) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Test/Kernels/Assembly/FailureMechanismSectionAssemblyKernelStubTest.cs (.../FailureMechanismSectionAssemblyKernelStubTest.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -23,7 +23,6 @@ using System.Linq; using Assembly.Kernel.Exceptions; using Assembly.Kernel.Interfaces; -using Assembly.Kernel.Model; using Assembly.Kernel.Model.AssessmentResultTypes; using Assembly.Kernel.Model.CategoryLimits; using Assembly.Kernel.Model.FmSectionTypes; Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs =================================================================== diff -u -rad0a887b4d21048cc434fe2e867e903e9e0628b2 -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision ad0a887b4d21048cc434fe2e867e903e9e0628b2) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/Calculators/Assembly/FailureMechanismSectionAssemblyCalculatorStub.cs (.../FailureMechanismSectionAssemblyCalculatorStub.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -321,9 +321,9 @@ } public FailureMechanismSectionAssembly AssembleDetailedAssessment(DetailedAssessmentProbabilityOnlyResultType detailedAssessmentResult, - double probability, - double normativeNorm, - double failureMechanismN, + double probability, + double normativeNorm, + double failureMechanismN, double failureMechanismContribution) { if (ThrowExceptionOnCalculate) @@ -386,7 +386,7 @@ public FailureMechanismSectionAssembly AssembleTailorMadeAssessment(TailorMadeAssessmentProbabilityAndDetailedCalculationResultType tailorMadeAssessmentResult, double probability, - double normativeNorm, + double normativeNorm, double failureMechanismN, double failureMechanismContribution) { @@ -503,7 +503,7 @@ return CombinedAssemblyCategoryOutput.Value; } - public FailureMechanismSectionAssemblyCategoryGroup AssembleCombined(FailureMechanismSectionAssemblyCategoryGroup simpleAssembly, + public FailureMechanismSectionAssemblyCategoryGroup AssembleCombined(FailureMechanismSectionAssemblyCategoryGroup simpleAssembly, FailureMechanismSectionAssemblyCategoryGroup tailorMadeAssembly) { if (ThrowExceptionOnCalculateCombinedAssembly) Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs =================================================================== diff -u -r4c78adc6aba8a1a80c45f01515d97c84224ba56d -r2b79eaf2cbbdff4211eade27fde9febe76029d29 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs (.../CategoriesListTestFactory.cs) (revision 4c78adc6aba8a1a80c45f01515d97c84224ba56d) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.KernelWrapper.TestUtil/CategoriesListTestFactory.cs (.../CategoriesListTestFactory.cs) (revision 2b79eaf2cbbdff4211eade27fde9febe76029d29) @@ -22,7 +22,7 @@ /// containing . public static CategoriesList CreateFailureMechanismSectionCategories() { - return new CategoriesList(new [] + return new CategoriesList(new[] { new FmSectionCategory(random.NextEnumValue(), 0, 0.25), new FmSectionCategory(random.NextEnumValue(), 0.25, 0.5),