Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql =================================================================== diff -u -rd1f8355cc00c35f21fe9ad916db4ac54a46d9ccf -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision d1f8355cc00c35f21fe9ad916db4ac54a46d9ccf) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.1_17.2.sql (.../Migration_17.1_17.2.sql) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -1345,7 +1345,7 @@ JOIN [SOURCEPROJECT].PipingSectionResultEntity AS source ON psr.[rowid] = source.[rowid] JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = psr.[FailureMechanismSectionEntityId] JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] - WHERE source.[LayerThree] IS NOT psr.[LayerThree]; + WHERE source.[LayerThree] IS NOT NULL AND psr.[LayerThree] IS NULL; INSERT INTO TempChanges SELECT @@ -1358,7 +1358,7 @@ JOIN [SOURCEPROJECT].GrassCoverErosionInwardsSectionResultEntity AS source ON gceisr.[rowid] = source.[rowid] JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = gceisr.[FailureMechanismSectionEntityId] JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] - WHERE source.[LayerThree] IS NOT gceisr.[LayerThree]; + WHERE source.[LayerThree] IS NOT NULL AND gceisr.[LayerThree] IS NULL; INSERT INTO TempChanges SELECT @@ -1371,7 +1371,7 @@ JOIN [SOURCEPROJECT].ClosingStructuresSectionResultEntity AS source ON cssr.[rowid] = source.[rowid] JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = cssr.[FailureMechanismSectionEntityId] JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] - WHERE source.[LayerThree] IS NOT cssr.[LayerThree]; + WHERE source.[LayerThree] IS NOT NULL AND cssr.[LayerThree] IS NULL; INSERT INTO TempChanges SELECT @@ -1384,7 +1384,7 @@ JOIN [SOURCEPROJECT].HeightStructuresSectionResultEntity AS source ON hssr.[rowid] = source.[rowid] JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = hssr.[FailureMechanismSectionEntityId] JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] - WHERE source.[LayerThree] IS NOT hssr.[LayerThree]; + WHERE source.[LayerThree] IS NOT NULL AND hssr.[LayerThree] IS NULL; INSERT INTO TempChanges SELECT @@ -1397,7 +1397,7 @@ JOIN [SOURCEPROJECT].StabilityPointStructuresSectionResultEntity AS source ON spssr.[rowid] = source.[rowid] JOIN FailureMechanismSectionEntity as fms ON fms.[FailureMechanismSectionEntityId] = spssr.[FailureMechanismSectionEntityId] JOIN TempAssessmentSectionFailureMechanism AS asfm ON asfm.[FailureMechanismId] = fms.[FailureMechanismEntityId] - WHERE source.[LayerThree] IS NOT spssr.[LayerThree]; + WHERE source.[LayerThree] IS NOT NULL AND spssr.[LayerThree] IS NULL; INSERT INTO [LOGDATABASE].MigrationLogEntity ( [FromVersion], Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs =================================================================== diff -u -rb6e0f8d41d92ed18c902138dd49cce6e703ee883 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision b6e0f8d41d92ed18c902138dd49cce6e703ee883) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultCreateExtensionsTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -40,12 +40,12 @@ // Setup var random = new Random(); var assessmentLayerOneResult = random.NextEnumValue(); - const double assessmentLayerThreeResult = 0.2; + double assessmentLayerThreeResult = random.NextDouble(); var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(new TestFailureMechanismSection()) { AssessmentLayerOne = assessmentLayerOneResult, - AssessmentLayerThree = (RoundedDouble) assessmentLayerThreeResult + AssessmentLayerThree = assessmentLayerThreeResult }; // Call Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -re003fd6aa0759f680c6a33dba07f7b58c6ac52d5 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision e003fd6aa0759f680c6a33dba07f7b58c6ac52d5) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Views/ClosingStructuresFailureMechanismSectionResultRow.cs (.../ClosingStructuresFailureMechanismSectionResultRow.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -21,7 +21,6 @@ using System; using System.ComponentModel; -using Core.Common.Base.Data; using Ringtoets.ClosingStructures.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.TypeConverters; @@ -54,8 +53,7 @@ } set { - int nrOfDecimals = SectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - SectionResult.AssessmentLayerThree = new RoundedDouble(nrOfDecimals, value); + SectionResult.AssessmentLayerThree = value; } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismSectionResultRowTest.cs (.../ClosingStructuresFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -51,8 +50,7 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree, - result.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( nameof(ClosingStructuresFailureMechanismSectionResultRow.AssessmentLayerTwoA)); @@ -181,16 +179,11 @@ var sectionResult = new ClosingStructuresFailureMechanismSectionResult(CreateSection()); var row = new ClosingStructuresFailureMechanismSectionResultRow(sectionResult); - int nrOfExpectedDecimals = sectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - // Call row.AssessmentLayerThree = assessmentLayerThree; // Assert - RoundedDouble actualAssessmentLayerThreeValue = sectionResult.AssessmentLayerThree; - Assert.AreEqual(assessmentLayerThree, actualAssessmentLayerThreeValue, - actualAssessmentLayerThreeValue.GetAccuracy()); - Assert.AreEqual(nrOfExpectedDecimals, actualAssessmentLayerThreeValue.NumberOfDecimalPlaces); + Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs (.../StructuresFailureMechanismSectionResult.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresFailureMechanismSectionResult.cs (.../StructuresFailureMechanismSectionResult.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -34,7 +34,7 @@ /// for the whole section. public class StructuresFailureMechanismSectionResult : FailureMechanismSectionResult where T : IStructuresCalculationInput, new() { - private RoundedDouble assessmentLayerThree; + private double assessmentLayerThree; /// /// Initializes a new instance of . @@ -43,7 +43,7 @@ /// Thrown when is null. protected StructuresFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - AssessmentLayerThree = RoundedDouble.NaN; + AssessmentLayerThree = double.NaN; } /// @@ -57,7 +57,7 @@ /// /// Thrown when /// is outside of the valid ranges. - public RoundedDouble AssessmentLayerThree + public double AssessmentLayerThree { get { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs (.../StructuresFailureMechanismSectionResultTest.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresFailureMechanismSectionResultTest.cs (.../StructuresFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,13 +20,11 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Structures; -using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Common.Data.Test.Structures { @@ -78,12 +76,11 @@ var sectionResult = new TestStructuresFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble) invalidValue; + TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; // Assert const string expectedMessage = "Kans moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, - expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } [Test] @@ -97,11 +94,10 @@ var sectionResult = new TestStructuresFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble) validValue; + sectionResult.AssessmentLayerThree = validValue; // Assert - Assert.DoesNotThrow(call); - Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree, sectionResult.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionSectionResultRowTest.cs (.../DuneErosionSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -40,8 +40,7 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - FailureMechanismSection section = CreateSection(); - var result = new DuneErosionFailureMechanismSectionResult(section); + var result = new DuneErosionFailureMechanismSectionResult(CreateSection()); // Call var row = new DuneErosionSectionResultRow(result); Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsFailureMechanismSectionResult.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResult.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -32,7 +32,7 @@ /// public class GrassCoverErosionInwardsFailureMechanismSectionResult : FailureMechanismSectionResult { - private RoundedDouble assessmentLayerThreeValue; + private double assessmentLayerThreeValue; /// /// Creates a new instance of . @@ -41,7 +41,7 @@ /// Thrown when is null. public GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - assessmentLayerThreeValue = RoundedDouble.NaN; + assessmentLayerThreeValue = double.NaN; } /// @@ -70,7 +70,7 @@ /// /// Thrown when /// is outside of the valid ranges. - public RoundedDouble AssessmentLayerThree + public double AssessmentLayerThree { get { Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -re003fd6aa0759f680c6a33dba07f7b58c6ac52d5 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision e003fd6aa0759f680c6a33dba07f7b58c6ac52d5) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRow.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -21,7 +21,6 @@ using System; using System.ComponentModel; -using Core.Common.Base.Data; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.GrassCoverErosionInwards.Data; @@ -55,8 +54,7 @@ } set { - int nrOfDecimals = SectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - SectionResult.AssessmentLayerThree = new RoundedDouble(nrOfDecimals, value); + SectionResult.AssessmentLayerThree = value; } } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r2cd2b6b5b050b005019185c1c2a4dd28ae0e2ad2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision 2cd2b6b5b050b005019185c1c2a4dd28ae0e2ad2) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Data.Test/GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,12 +20,10 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data.TestUtil; namespace Ringtoets.GrassCoverErosionInwards.Data.Test @@ -143,12 +141,11 @@ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble)invalidValue; + TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; // Assert const string expectedMessage = "Kans moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, - expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } [Test] @@ -162,11 +159,10 @@ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble)validValue; + sectionResult.AssessmentLayerThree = validValue; // Assert - Assert.DoesNotThrow(call); - Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree, sectionResult.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,13 +20,11 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.GrassCoverErosionInwards.Data; @@ -51,8 +49,7 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree, - result.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( nameof(GrassCoverErosionInwardsFailureMechanismSectionResultRow.AssessmentLayerTwoA)); @@ -185,16 +182,11 @@ var sectionResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(CreateSection()); var row = new GrassCoverErosionInwardsFailureMechanismSectionResultRow(sectionResult); - int nrOfExpectedDecimals = sectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - // Call row.AssessmentLayerThree = assessmentLayerThree; // Assert - RoundedDouble actualAssessmentLayerThreeValue = sectionResult.AssessmentLayerThree; - Assert.AreEqual(assessmentLayerThree, actualAssessmentLayerThreeValue, - actualAssessmentLayerThreeValue.GetAccuracy()); - Assert.AreEqual(nrOfExpectedDecimals, sectionResult.AssessmentLayerThree.NumberOfDecimalPlaces); + Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -re003fd6aa0759f680c6a33dba07f7b58c6ac52d5 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision e003fd6aa0759f680c6a33dba07f7b58c6ac52d5) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Views/HeightStructuresFailureMechanismSectionResultRow.cs (.../HeightStructuresFailureMechanismSectionResultRow.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -21,7 +21,6 @@ using System; using System.ComponentModel; -using Core.Common.Base.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; @@ -53,8 +52,7 @@ } set { - int nrOfDecimals = SectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - SectionResult.AssessmentLayerThree = new RoundedDouble(nrOfDecimals, value); + SectionResult.AssessmentLayerThree = value; } } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismSectionResultRowTest.cs (.../HeightStructuresFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -51,8 +50,7 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree, - result.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( nameof(HeightStructuresFailureMechanismSectionResultRow.AssessmentLayerTwoA)); @@ -181,16 +179,11 @@ var sectionResult = new HeightStructuresFailureMechanismSectionResult(CreateSection()); var row = new HeightStructuresFailureMechanismSectionResultRow(sectionResult); - int nrOfExpectedDecimals = sectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - // Call row.AssessmentLayerThree = assessmentLayerThree; // Assert - RoundedDouble actualAssessmentLayerThreeValue = sectionResult.AssessmentLayerThree; - Assert.AreEqual(assessmentLayerThree, actualAssessmentLayerThreeValue, - actualAssessmentLayerThreeValue.GetAccuracy()); - Assert.AreEqual(nrOfExpectedDecimals, actualAssessmentLayerThreeValue.NumberOfDecimalPlaces); + Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResult.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResult.cs (.../MacroStabilityInwardsFailureMechanismSectionResult.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSectionResult.cs (.../MacroStabilityInwardsFailureMechanismSectionResult.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Probability; @@ -32,7 +31,7 @@ /// public class MacroStabilityInwardsFailureMechanismSectionResult : FailureMechanismSectionResult { - private RoundedDouble assessmentLayerThree; + private double assessmentLayerThree; /// /// Creates a new instance of . @@ -41,15 +40,15 @@ /// Thrown when is null. public MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - AssessmentLayerThree = RoundedDouble.NaN; + AssessmentLayerThree = double.NaN; } /// /// Gets or sets the value of the tailored assessment of safety. /// /// Thrown when /// is outside of the valid ranges. - public RoundedDouble AssessmentLayerThree + public double AssessmentLayerThree { get { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs =================================================================== diff -u -re003fd6aa0759f680c6a33dba07f7b58c6ac52d5 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRow.cs) (revision e003fd6aa0759f680c6a33dba07f7b58c6ac52d5) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Views/MacroStabilityInwardsFailureMechanismSectionResultRow.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRow.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -68,8 +68,7 @@ } set { - int nrOfDecimals = SectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - SectionResult.AssessmentLayerThree = new RoundedDouble(nrOfDecimals, value); + SectionResult.AssessmentLayerThree = value; } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -r2cd2b6b5b050b005019185c1c2a4dd28ae0e2ad2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision 2cd2b6b5b050b005019185c1c2a4dd28ae0e2ad2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,12 +20,10 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.MacroStabilityInwards.Data.Test { @@ -60,7 +58,7 @@ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble) invalidValue; + TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; // Assert const string expectedMessage = "Kans moet in het bereik [0,0, 1,0] liggen."; @@ -79,11 +77,10 @@ var sectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble) validValue; + sectionResult.AssessmentLayerThree = validValue; // Assert - Assert.DoesNotThrow(call); - Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree, sectionResult.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -27,7 +27,6 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.MacroStabilityInwards.Data; @@ -52,8 +51,7 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.GetAssessmentLayerTwoA(Enumerable.Empty()), row.AssessmentLayerTwoA); - Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree, - result.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( nameof(MacroStabilityInwardsFailureMechanismSectionResultRow.AssessmentLayerTwoA)); @@ -181,16 +179,11 @@ var row = new MacroStabilityInwardsFailureMechanismSectionResultRow(sectionResult, Enumerable.Empty()); - int nrOfExpectedDecimals = sectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - // Call row.AssessmentLayerThree = assessmentLayerThree; // Assert - RoundedDouble actualAssessmentLayerThreeValue = sectionResult.AssessmentLayerThree; - Assert.AreEqual(assessmentLayerThree, actualAssessmentLayerThreeValue, - actualAssessmentLayerThreeValue.GetAccuracy()); - Assert.AreEqual(nrOfExpectedDecimals, actualAssessmentLayerThreeValue.NumberOfDecimalPlaces); + Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs =================================================================== diff -u -rb5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision b5a3ccef1cfc5e4cbfea0a97a8a9ee8ae5a199e2) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSectionResult.cs (.../PipingFailureMechanismSectionResult.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -32,7 +32,7 @@ /// public class PipingFailureMechanismSectionResult : FailureMechanismSectionResult { - private RoundedDouble assessmentLayerThree; + private double assessmentLayerThree; /// /// Creates a new instance of . @@ -41,15 +41,15 @@ /// Thrown when is null. public PipingFailureMechanismSectionResult(FailureMechanismSection section) : base(section) { - AssessmentLayerThree = RoundedDouble.NaN; + AssessmentLayerThree = double.NaN; } /// /// Gets or sets the value of the tailored assessment of safety. /// /// Thrown when /// is outside of the valid ranges. - public RoundedDouble AssessmentLayerThree + public double AssessmentLayerThree { get { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs =================================================================== diff -u -re003fd6aa0759f680c6a33dba07f7b58c6ac52d5 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision e003fd6aa0759f680c6a33dba07f7b58c6ac52d5) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismSectionResultRow.cs (.../PipingFailureMechanismSectionResultRow.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -23,7 +23,6 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; -using Core.Common.Base.Data; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; @@ -68,8 +67,7 @@ } set { - int nrOfDecimals = SectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - SectionResult.AssessmentLayerThree = new RoundedDouble(nrOfDecimals, value); + SectionResult.AssessmentLayerThree = value; } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -r2cd2b6b5b050b005019185c1c2a4dd28ae0e2ad2 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 2cd2b6b5b050b005019185c1c2a4dd28ae0e2ad2) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,12 +20,10 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Piping.Data.Test { @@ -60,12 +58,11 @@ var sectionResult = new PipingFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble) invalidValue; + TestDelegate call = () => sectionResult.AssessmentLayerThree = invalidValue; // Assert const string expectedMessage = "Kans moet in het bereik [0,0, 1,0] liggen."; - TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, - expectedMessage); + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } [Test] @@ -79,11 +76,10 @@ var sectionResult = new PipingFailureMechanismSectionResult(CreateSection()); // Call - TestDelegate call = () => sectionResult.AssessmentLayerThree = (RoundedDouble) validValue; + sectionResult.AssessmentLayerThree = validValue; // Assert - Assert.DoesNotThrow(call); - Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree, sectionResult.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(validValue, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -27,7 +27,6 @@ using NUnit.Framework; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.Piping.Data; @@ -52,8 +51,7 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.GetAssessmentLayerTwoA(Enumerable.Empty()), row.AssessmentLayerTwoA); - Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree, - result.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( nameof(PipingFailureMechanismSectionResultRow.AssessmentLayerTwoA)); @@ -181,16 +179,11 @@ var row = new PipingFailureMechanismSectionResultRow(sectionResult, Enumerable.Empty()); - int nrOfExpectedDecimals = sectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - // Call row.AssessmentLayerThree = assessmentLayerThree; // Assert - RoundedDouble actualAssessmentLayerThreeValue = sectionResult.AssessmentLayerThree; - Assert.AreEqual(assessmentLayerThree, actualAssessmentLayerThreeValue, - actualAssessmentLayerThreeValue.GetAccuracy()); - Assert.AreEqual(nrOfExpectedDecimals, actualAssessmentLayerThreeValue.NumberOfDecimalPlaces); + Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection() Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs =================================================================== diff -u -re003fd6aa0759f680c6a33dba07f7b58c6ac52d5 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision e003fd6aa0759f680c6a33dba07f7b58c6ac52d5) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/Views/StabilityPointStructuresFailureMechanismSectionResultRow.cs (.../StabilityPointStructuresFailureMechanismSectionResultRow.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -21,7 +21,6 @@ using System; using System.ComponentModel; -using Core.Common.Base.Data; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; @@ -66,8 +65,7 @@ } set { - int nrOfDecimals = SectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - SectionResult.AssessmentLayerThree = new RoundedDouble(nrOfDecimals, value); + SectionResult.AssessmentLayerThree = value; } } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r4dd22071543e74b1895bec2048c9816df5b25d06 -ra04c3ef2f95c7bac6e29306413c76e9f481e2aa0 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision 4dd22071543e74b1895bec2048c9816df5b25d06) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismSectionResultRowTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultRowTest.cs) (revision a04c3ef2f95c7bac6e29306413c76e9f481e2aa0) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -51,8 +50,7 @@ // Assert Assert.IsInstanceOf>(row); Assert.AreEqual(result.AssessmentLayerTwoA, row.AssessmentLayerTwoA); - Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree, - result.AssessmentLayerThree.GetAccuracy()); + Assert.AreEqual(row.AssessmentLayerThree, result.AssessmentLayerThree); TestHelper.AssertTypeConverter( nameof(StabilityPointStructuresFailureMechanismSectionResultRow.AssessmentLayerTwoA)); @@ -181,16 +179,11 @@ var sectionResult = new StabilityPointStructuresFailureMechanismSectionResult(CreateSection()); var row = new StabilityPointStructuresFailureMechanismSectionResultRow(sectionResult); - int expectedNrOfDecimals = sectionResult.AssessmentLayerThree.NumberOfDecimalPlaces; - // Call row.AssessmentLayerThree = assessmentLayerThree; // Assert - RoundedDouble actualAssessmentLayerThreeValue = sectionResult.AssessmentLayerThree; - Assert.AreEqual(assessmentLayerThree, actualAssessmentLayerThreeValue, - actualAssessmentLayerThreeValue.GetAccuracy()); - Assert.AreEqual(expectedNrOfDecimals, actualAssessmentLayerThreeValue.NumberOfDecimalPlaces); + Assert.AreEqual(assessmentLayerThree, sectionResult.AssessmentLayerThree); } private static FailureMechanismSection CreateSection()