Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs =================================================================== diff -u -r5d0dfa9a8b6e98ede2791a93ed50d48ce6ada072 -r9e2f7186181853ea7cce697f737eeca21f82551f --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 5d0dfa9a8b6e98ede2791a93ed50d48ce6ada072) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsFailureMechanismExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensions.cs) (revision 9e2f7186181853ea7cce697f737eeca21f82551f) @@ -24,11 +24,10 @@ using System.ComponentModel; using System.Linq; using Core.Common.Base.Data; -using Ringtoets.AssemblyTool.Data; -using Ringtoets.Common.Data.AssemblyTool; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Util; namespace Ringtoets.GrassCoverErosionOutwards.Data { @@ -128,44 +127,17 @@ throw new ArgumentNullException(nameof(failureMechanism)); } - if (assessmentSection == null) - { - throw new ArgumentNullException(nameof(assessmentSection)); - } - if (!Enum.IsDefined(typeof(FailureMechanismCategoryType), categoryType)) { throw new InvalidEnumArgumentException(nameof(categoryType), (int) categoryType, typeof(FailureMechanismCategoryType)); } - IEnumerable categories = AssemblyToolCategoriesFactory.CreateFailureMechanismSectionAssemblyCategories( - assessmentSection.FailureMechanismContribution.SignalingNorm, - assessmentSection.FailureMechanismContribution.LowerLimitNorm, - failureMechanism.Contribution, - failureMechanism.GeneralInput.N); - - switch (categoryType) - { - case FailureMechanismCategoryType.MechanismSpecificFactorizedSignalingNorm: - return categories.First(c => c.Group == FailureMechanismSectionAssemblyCategoryGroup.IIv) - .LowerBoundary; - case FailureMechanismCategoryType.MechanismSpecificSignalingNorm: - return categories.First(c => c.Group == FailureMechanismSectionAssemblyCategoryGroup.IIIv) - .LowerBoundary; - case FailureMechanismCategoryType.MechanismSpecificLowerLimitNorm: - return categories.First(c => c.Group == FailureMechanismSectionAssemblyCategoryGroup.IVv) - .LowerBoundary; - case FailureMechanismCategoryType.LowerLimitNorm: - return categories.First(c => c.Group == FailureMechanismSectionAssemblyCategoryGroup.Vv) - .LowerBoundary; - case FailureMechanismCategoryType.FactorizedLowerLimitNorm: - return categories.First(c => c.Group == FailureMechanismSectionAssemblyCategoryGroup.VIv) - .LowerBoundary; - default: - throw new NotSupportedException(); - } + return FailureMechanismNormHelper.GetNorm(assessmentSection, + categoryType, + failureMechanism.Contribution, + failureMechanism.GeneralInput.N); } private static RoundedDouble GetAssessmentLevelFromCalculations(HydraulicBoundaryLocation hydraulicBoundaryLocation, Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Ringtoets.GrassCoverErosionOutwards.Data.csproj =================================================================== diff -u -rbbbfacd9e38cf43c98dba73e39694850fb932a66 -r9e2f7186181853ea7cce697f737eeca21f82551f --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Ringtoets.GrassCoverErosionOutwards.Data.csproj (.../Ringtoets.GrassCoverErosionOutwards.Data.csproj) (revision bbbfacd9e38cf43c98dba73e39694850fb932a66) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Ringtoets.GrassCoverErosionOutwards.Data.csproj (.../Ringtoets.GrassCoverErosionOutwards.Data.csproj) (revision 9e2f7186181853ea7cce697f737eeca21f82551f) @@ -61,6 +61,11 @@ Ringtoets.Common.Primitives False + + {6a074d65-a81c-4c1c-8e24-f36c916e4ed7} + Ringtoets.Common.Util + False + {87c2c553-c0bc-40bf-b1ea-b83bff357f27} Ringtoets.Revetment.Data Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs =================================================================== diff -u -r7be3118c6dd22f2420d4b9f8eb4fa1c492cf44ea -r9e2f7186181853ea7cce697f737eeca21f82551f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 7be3118c6dd22f2420d4b9f8eb4fa1c492cf44ea) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismExtensionsTest.cs) (revision 9e2f7186181853ea7cce697f737eeca21f82551f) @@ -20,7 +20,7 @@ // All rights reserved. using System; -using System.Collections; +using System.Collections.Generic; using System.ComponentModel; using Core.Common.Base.Data; using Core.Common.TestUtil; @@ -224,7 +224,7 @@ Assert.AreEqual(expectedNorm, norm); } - private static IEnumerable GetNormConfigurationPerFailureMechanismCategoryType() + private static IEnumerable GetNormConfigurationPerFailureMechanismCategoryType() { const double signalingNorm = 0.002; const double lowerLimitNorm = 0.005;