Index: Ringtoets/Common/src/Ringtoets.Common.IO/AssessmentSectionSettings.cs
===================================================================
diff -u -r849b3b49bf8ccc18b170e2356461d882417f19fe -r707e86ed42f964fde0eaeba837272f8e62521ba9
--- Ringtoets/Common/src/Ringtoets.Common.IO/AssessmentSectionSettings.cs (.../AssessmentSectionSettings.cs) (revision 849b3b49bf8ccc18b170e2356461d882417f19fe)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/AssessmentSectionSettings.cs (.../AssessmentSectionSettings.cs) (revision 707e86ed42f964fde0eaeba837272f8e62521ba9)
@@ -19,7 +19,6 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-using Core.Common.Base.Data;
using Ringtoets.Common.Data.AssessmentSection;
namespace Ringtoets.Common.IO
@@ -30,17 +29,17 @@
///
public class AssessmentSectionSettings
{
- private AssessmentSectionSettings(string id, double n, bool isDune)
+ private AssessmentSectionSettings(string id, int n, bool isDune)
{
AssessmentSectionId = id;
- N = new RoundedDouble(2, n);
+ N = n;
IsDune = isDune;
}
///
/// Gets the 'N' parameter used to factor in the 'length effect'.
///
- public RoundedDouble N { get; }
+ public int N { get; }
///
/// Gets a value indicating whether this instance is a dune assessment section or not.
@@ -58,7 +57,7 @@
/// The identifier of the assessment section.
/// The 'N' parameter used to factor in the 'length effect'.
/// A fully configured .
- public static AssessmentSectionSettings CreateDikeAssessmentSectionSettings(string id, double n)
+ public static AssessmentSectionSettings CreateDikeAssessmentSectionSettings(string id, int n)
{
return new AssessmentSectionSettings(id, n, false);
}
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/AssessmentSectionSettingsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -r707e86ed42f964fde0eaeba837272f8e62521ba9
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/AssessmentSectionSettingsTest.cs (.../AssessmentSectionSettingsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/AssessmentSectionSettingsTest.cs (.../AssessmentSectionSettingsTest.cs) (revision 707e86ed42f964fde0eaeba837272f8e62521ba9)
@@ -20,7 +20,6 @@
// All rights reserved.
using NUnit.Framework;
-using Ringtoets.Common.Data.TestUtil;
namespace Ringtoets.Common.IO.Test
{
@@ -32,15 +31,14 @@
{
// Setup
const string id = "test";
- const double n = 1.0;
+ const int n = 1;
// Call
AssessmentSectionSettings result = AssessmentSectionSettings.CreateDikeAssessmentSectionSettings(id, n);
// Assert
Assert.AreEqual(id, result.AssessmentSectionId);
- Assert.AreEqual(2, result.N.NumberOfDecimalPlaces);
- Assert.AreEqual(n, result.N, result.N.GetAccuracy());
+ Assert.AreEqual(n, result.N);
Assert.IsFalse(result.IsDune);
}
@@ -55,8 +53,7 @@
// Assert
Assert.AreEqual(id, result.AssessmentSectionId);
- Assert.AreEqual(2, result.N.NumberOfDecimalPlaces);
- Assert.AreEqual(3.0, result.N, result.N.GetAccuracy());
+ Assert.AreEqual(3, result.N);
Assert.IsTrue(result.IsDune);
}
}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs
===================================================================
diff -u -r849b3b49bf8ccc18b170e2356461d882417f19fe -r707e86ed42f964fde0eaeba837272f8e62521ba9
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision 849b3b49bf8ccc18b170e2356461d882417f19fe)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Commands/AssessmentSectionFromFileCommandHandler.cs (.../AssessmentSectionFromFileCommandHandler.cs) (revision 707e86ed42f964fde0eaeba837272f8e62521ba9)
@@ -134,11 +134,12 @@
#region Set AssessmentSection to Project
- private static void SetFailureMechanismsValueN(AssessmentSection assessmentSection, RoundedDouble n)
+ private static void SetFailureMechanismsValueN(AssessmentSection assessmentSection, int n)
{
- assessmentSection.GrassCoverErosionInwards.GeneralInput.N = n;
- assessmentSection.GrassCoverErosionOutwards.GeneralInput.N = n;
- assessmentSection.HeightStructures.GeneralInput.N = n;
+ var roundedN = (RoundedDouble) n;
+ assessmentSection.GrassCoverErosionInwards.GeneralInput.N = roundedN;
+ assessmentSection.GrassCoverErosionOutwards.GeneralInput.N = roundedN;
+ assessmentSection.HeightStructures.GeneralInput.N = roundedN;
}
private void SetAssessmentSectionToProject(RingtoetsProject ringtoetsProject, AssessmentSection assessmentSection)
@@ -193,7 +194,7 @@
/// - The is larger than .
///
///
- private static AssessmentSection CreateDikeAssessmentSection(double lowerLimitNorm, double signalingNorm, RoundedDouble n)
+ private static AssessmentSection CreateDikeAssessmentSection(double lowerLimitNorm, double signalingNorm, int n)
{
AssessmentSection assessmentSection = CreateDikeAssessmentSection(lowerLimitNorm, signalingNorm);
SetFailureMechanismsValueN(assessmentSection, n);
@@ -215,7 +216,7 @@
/// - The is larger than .
///
///
- private static AssessmentSection CreateDuneAssessmentSection(double lowerLimitNorm, double signalingNorm, RoundedDouble n)
+ private static AssessmentSection CreateDuneAssessmentSection(double lowerLimitNorm, double signalingNorm, int n)
{
var duneAssessmentSection = new AssessmentSection(AssessmentSectionComposition.Dune,
lowerLimitNorm,