Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 24-jan-2018 15:52:34 */
+/* Created On : 25-jan-2018 16:07:42 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -508,7 +508,7 @@
(
'StabilityPointStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'ForeshoreProfileCollectionSourcePath' TEXT,
'StabilityPointStructureCollectionSourcePath' TEXT,
CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -33,31 +33,11 @@
INSERT INTO GeneralResultSubMechanismIllustrationPointStochastEntity SELECT * FROM [SOURCEPROJECT].GeneralResultSubMechanismIllustrationPointStochastEntity;
INSERT INTO GrassCoverErosionInwardsCalculationEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsCalculationEntity;
INSERT INTO GrassCoverErosionInwardsDikeHeightOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsDikeHeightOutputEntity;
-INSERT INTO GrassCoverErosionInwardsFailureMechanismMetaEntity(
- [GrassCoverErosionInwardsFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [N],
- [DikeProfileCollectionSourcePath])
-SELECT
- [GrassCoverErosionInwardsFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [N] AS REAL,
- [DikeProfileCollectionSourcePath]
-FROM [SOURCEPROJECT].GrassCoverErosionInwardsFailureMechanismMetaEntity;
+INSERT INTO GrassCoverErosionInwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsFailureMechanismMetaEntity;
INSERT INTO GrassCoverErosionInwardsOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsOutputEntity;
INSERT INTO GrassCoverErosionInwardsOvertoppingRateOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsOvertoppingRateOutputEntity;
INSERT INTO GrassCoverErosionInwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsSectionResultEntity;
-INSERT INTO GrassCoverErosionOutwardsFailureMechanismMetaEntity(
- [GrassCoverErosionOutwardsFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [N],
- [ForeshoreProfileCollectionSourcePath])
-SELECT
- [GrassCoverErosionOutwardsFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [N] AS REAL,
- [ForeshoreProfileCollectionSourcePath]
-FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity;
+INSERT INTO GrassCoverErosionOutwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity;
INSERT INTO GrassCoverErosionOutwardsHydraulicLocationEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity;
INSERT INTO GrassCoverErosionOutwardsHydraulicLocationOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity;
INSERT INTO GrassCoverErosionOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsSectionResultEntity;
@@ -67,19 +47,7 @@
INSERT INTO GrassCoverSlipOffOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverSlipOffOutwardsSectionResultEntity;
INSERT INTO HeightStructureEntity SELECT * FROM [SOURCEPROJECT].HeightStructureEntity;
INSERT INTO HeightStructuresCalculationEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresCalculationEntity;
-INSERT INTO HeightStructuresFailureMechanismMetaEntity(
- [HeightStructuresFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [N],
- [HeightStructureCollectionSourcePath],
- [ForeshoreProfileCollectionSourcePath])
-SELECT
- [HeightStructuresFailureMechanismMetaEntityId],
- [FailureMechanismEntityId],
- [N] AS REAL,
- [HeightStructureCollectionSourcePath],
- [ForeshoreProfileCollectionSourcePath]
-FROM [SOURCEPROJECT].HeightStructuresFailureMechanismMetaEntity;
+INSERT INTO HeightStructuresFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresFailureMechanismMetaEntity;
INSERT INTO HeightStructuresOutputEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresOutputEntity;
INSERT INTO HeightStructuresSectionResultEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresSectionResultEntity;
INSERT INTO HydraRingPreprocessorEntity SELECT * FROM [SOURCEPROJECT].HydraRingPreprocessorEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -1236,7 +1236,7 @@
-
+
@@ -5758,7 +5758,7 @@
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -6,97 +6,97 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs
===================================================================
diff -u -rafec64f46fa0be3500d2d7b357ad7ce589b5dc66 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (.../StabilityPointStructuresFailureMechanismMetaEntity.cs) (revision afec64f46fa0be3500d2d7b357ad7ce589b5dc66)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityPointStructuresFailureMechanismMetaEntity.cs (.../StabilityPointStructuresFailureMechanismMetaEntity.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -34,7 +34,7 @@
{
public long StabilityPointStructuresFailureMechanismMetaEntityId { get; set; }
public long FailureMechanismEntityId { get; set; }
- public int N { get; set; }
+ public double N { get; set; }
public string ForeshoreProfileCollectionSourcePath { get; set; }
public string StabilityPointStructureCollectionSourcePath { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs (.../StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs (.../StabilityPointStructureFailureMechanismMetaEntityReadExtensions.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -20,6 +20,7 @@
// All rights reserved.
using Application.Ringtoets.Storage.DbContext;
+using Core.Common.Base.Data;
using Ringtoets.StabilityPointStructures.Data;
namespace Application.Ringtoets.Storage.Read.StabilityPointStructures
@@ -41,7 +42,7 @@
{
return new GeneralStabilityPointStructuresInput
{
- N = entity.N
+ N = (RoundedDouble) entity.N
};
}
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityPointStructures/StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs (.../StabilityPointStructuresFailureMechanismCreateExtensionsTest.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -25,6 +25,7 @@
using Application.Ringtoets.Storage.Create.StabilityPointStructures;
using Application.Ringtoets.Storage.DbContext;
using Application.Ringtoets.Storage.TestUtil;
+using Core.Common.Base.Data;
using NUnit.Framework;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.DikeProfiles;
@@ -75,7 +76,7 @@
},
GeneralInput =
{
- N = 4
+ N = (RoundedDouble) 4
}
};
var registry = new PersistenceRegistry();
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -63,9 +63,6 @@
AssertPipingSoilLayers(reader);
AssertHydraRingPreprocessor(reader);
AssertStabilityStoneCoverFailureMechanism(reader);
- AssertHeightStructuresFailureMechanism(reader, sourceFilePath);
- AssertGrassCoverErosionInwardsFailureMechanism(reader, sourceFilePath);
- AssertGrassCoverErosionOutwardsFailureMechanism(reader, sourceFilePath);
}
AssertLogDatabase(logFilePath);
@@ -283,44 +280,5 @@
"WHERE [N] IS NOT 4;";
reader.AssertReturnedDataIsValid(validateStabilityStoneCoverFailureMechanism);
}
-
- private static void AssertHeightStructuresFailureMechanism(MigratedDatabaseReader reader, string sourceFilePath)
- {
- string validateHeightStructuresFailureMechanism =
- $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
- "SELECT COUNT() = 0 " +
- "FROM [SOURCEPROJECT].HeightStructuresFailureMechanismMetaEntity AS sourceMetaEntity " +
- "INNER JOIN [HeightStructuresFailureMechanismMetaEntity] AS newMetaEntity " +
- "ON sourceMetaEntity.HeightStructuresFailureMechanismMetaEntityId = newMetaEntity.HeightStructuresFailureMechanismMetaEntityId " +
- "AND sourceMetaEntity.N IS NOT newMetaEntity.N;" +
- "DETACH DATABASE SOURCEPROJECT;";
- reader.AssertReturnedDataIsValid(validateHeightStructuresFailureMechanism);
- }
-
- private static void AssertGrassCoverErosionInwardsFailureMechanism(MigratedDatabaseReader reader, string sourceFilePath)
- {
- string validateGrassCoverErosionInwardsFailureMechanism =
- $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
- "SELECT COUNT() = 0 " +
- "FROM [SOURCEPROJECT].GrassCoverErosionInwardsFailureMechanismMetaEntity AS sourceMetaEntity " +
- "INNER JOIN [GrassCoverErosionInwardsFailureMechanismMetaEntity] AS newMetaEntity " +
- "ON sourceMetaEntity.GrassCoverErosionInwardsFailureMechanismMetaEntityId = newMetaEntity.GrassCoverErosionInwardsFailureMechanismMetaEntityId " +
- "AND sourceMetaEntity.N IS NOT newMetaEntity.N;" +
- "DETACH DATABASE SOURCEPROJECT;";
- reader.AssertReturnedDataIsValid(validateGrassCoverErosionInwardsFailureMechanism);
- }
-
- private static void AssertGrassCoverErosionOutwardsFailureMechanism(MigratedDatabaseReader reader, string sourceFilePath)
- {
- string validateGrassCoverErosionOutwardsFailureMechanism =
- $"ATTACH DATABASE \"{sourceFilePath}\" AS SOURCEPROJECT; " +
- "SELECT COUNT() = 0 " +
- "FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity AS sourceMetaEntity " +
- "INNER JOIN [GrassCoverErosionOutwardsFailureMechanismMetaEntity] AS newMetaEntity " +
- "ON sourceMetaEntity.GrassCoverErosionOutwardsFailureMechanismMetaEntityId = newMetaEntity.GrassCoverErosionOutwardsFailureMechanismMetaEntityId " +
- "AND sourceMetaEntity.N IS NOT newMetaEntity.N;" +
- "DETACH DATABASE SOURCEPROJECT;";
- reader.AssertReturnedDataIsValid(validateGrassCoverErosionOutwardsFailureMechanism);
- }
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -2255,7 +2255,7 @@
public void ReadAsStabilityPointStructuresFailureMechanism_WithForeshoreProfiles_ReturnFailureMechanismWithForeshoreProfilesSet()
{
// Setup
- const int generalInputN = 5;
+ const double generalInputN = 5.0;
const string fileLocation = "some/location/to/foreshoreprofiles";
var entity = new FailureMechanismEntity
@@ -2302,7 +2302,7 @@
ForeshoreProfile child2 = foreshoreProfiles[1];
Assert.AreEqual("Child1", child2.Id);
- Assert.AreEqual(generalInputN, failureMechanism.GeneralInput.N);
+ Assert.AreEqual(generalInputN, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N);
}
[Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r6306f61e82936c6bb6db70c4a185243cb07f00af -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 6306f61e82936c6bb6db70c4a185243cb07f00af)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -466,7 +466,7 @@
private static void ConfigureStabilityPointStructuresFailureMechanism(StabilityPointStructuresFailureMechanism failureMechanism,
IAssessmentSection assessmentSection)
{
- failureMechanism.GeneralInput.N = 8;
+ failureMechanism.GeneralInput.N = (RoundedDouble) 8;
StabilityPointStructure stabilityPointStructure = new TestStabilityPointStructure("id structure1");
failureMechanism.StabilityPointStructures.AddRange(new[]
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs
===================================================================
diff -u -r5ca67bdbaab0f6a9fb7682c06140b93bb0f5b5bb -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs (.../GeneralStabilityPointStructuresInput.cs) (revision 5ca67bdbaab0f6a9fb7682c06140b93bb0f5b5bb)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/GeneralStabilityPointStructuresInput.cs (.../GeneralStabilityPointStructuresInput.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -31,15 +31,15 @@
///
public class GeneralStabilityPointStructuresInput
{
- private static readonly Range validityRangeN = new Range(1, 20);
- private int n;
+ private static readonly Range validityRangeN = new Range(1.0, 20.0);
+ private RoundedDouble n;
///
/// Initializes a new instance of the class.
///
public GeneralStabilityPointStructuresInput()
{
- n = 3;
+ n = new RoundedDouble(2, 3.0);
GravitationalAcceleration = new RoundedDouble(2, 9.81);
@@ -88,7 +88,7 @@
///
/// Thrown when the is not in
/// the interval [1, 20].
- public int N
+ public RoundedDouble N
{
get
{
@@ -101,7 +101,8 @@
throw new ArgumentOutOfRangeException(nameof(value), string.Format(Resources.N_Value_should_be_in_Range_0_,
validityRangeN));
}
- n = value;
+
+ n = value.ToPrecision(n.NumberOfDecimalPlaces);
}
}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -80,7 +80,7 @@
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.Categories_LengthEffect))]
[ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.FailureMechanism_N_DisplayName))]
[ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.FailureMechanism_N_Description))]
- public int LengthEffect
+ public RoundedDouble LengthEffect
{
get
{
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/GeneralStabilityPointStructuresInputTest.cs (.../GeneralStabilityPointStructuresInputTest.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -63,7 +63,8 @@
var inputParameters = new GeneralStabilityPointStructuresInput();
// Assert
- Assert.AreEqual(3, inputParameters.N);
+ Assert.AreEqual(2, inputParameters.N.NumberOfDecimalPlaces);
+ Assert.AreEqual(3.0, inputParameters.N, inputParameters.N.GetAccuracy());
Assert.AreEqual(2, inputParameters.GravitationalAcceleration.NumberOfDecimalPlaces);
Assert.AreEqual(9.81, inputParameters.GravitationalAcceleration, inputParameters.GravitationalAcceleration.GetAccuracy());
@@ -90,33 +91,33 @@
}
[Test]
- [TestCase(1)]
- [TestCase(10)]
- [TestCase(20)]
- public void N_ValueInsideValidRegion_DoesNotThrow(int value)
+ [TestCase(1.0)]
+ [TestCase(10.0)]
+ [TestCase(20.0)]
+ public void N_ValueInsideValidRegion_DoesNotThrow(double value)
{
// Setup
var generalStabilityPointStructuresInput = new GeneralStabilityPointStructuresInput();
// Call
- generalStabilityPointStructuresInput.N = value;
+ generalStabilityPointStructuresInput.N = (RoundedDouble) value;
// Assert
- Assert.AreEqual(value, generalStabilityPointStructuresInput.N);
+ Assert.AreEqual(value, generalStabilityPointStructuresInput.N, generalStabilityPointStructuresInput.N.GetAccuracy());
}
[Test]
- [TestCase(-10)]
- [TestCase(0)]
- [TestCase(21)]
- [TestCase(50)]
- public void N_ValueOutsideValidRegion_ThrowsArgumentOutOfRangeException(int value)
+ [TestCase(-10.0)]
+ [TestCase(0.0)]
+ [TestCase(21.0)]
+ [TestCase(50.0)]
+ public void N_ValueOutsideValidRegion_ThrowsArgumentOutOfRangeException(double value)
{
// Setup
var generalStabilityPointStructuresInput = new GeneralStabilityPointStructuresInput();
// Call
- TestDelegate test = () => generalStabilityPointStructuresInput.N = value;
+ TestDelegate test = () => generalStabilityPointStructuresInput.N = (RoundedDouble) value;
// Assert
const string expectedMessage = "De waarde voor 'N' moet in het bereik [1, 20] liggen.";
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs
===================================================================
diff -u -ra3acfc43c74e601ed4e7d3a80f9a7daa58a836c6 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision a3acfc43c74e601ed4e7d3a80f9a7daa58a836c6)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructuresFailureMechanismPropertiesTest.cs (.../StabilityPointStructuresFailureMechanismPropertiesTest.cs) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -22,10 +22,12 @@
using System;
using System.ComponentModel;
using Core.Common.Base;
+using Core.Common.Base.Data;
using Core.Common.Gui.PropertyBag;
using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Common.Forms.PropertyClasses;
using Ringtoets.Common.Forms.TestUtil;
using Ringtoets.StabilityPointStructures.Data;
@@ -254,10 +256,10 @@
}
[Test]
- [TestCase(0)]
- [TestCase(-1)]
- [TestCase(-20)]
- public void LengthEffect_InvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(int value)
+ [TestCase(0.0)]
+ [TestCase(-1.0)]
+ [TestCase(-20.0)]
+ public void LengthEffect_InvalidValue_ThrowsArgumentOutOfRangeExceptionNoNotifications(double value)
{
// Setup
var mockRepository = new MockRepository();
@@ -277,7 +279,7 @@
var properties = new StabilityPointStructuresFailureMechanismProperties(failureMechanism, changeHandler);
// Call
- TestDelegate test = () => properties.LengthEffect = value;
+ TestDelegate test = () => properties.LengthEffect = (RoundedDouble) value;
// Assert
Assert.Throws(test);
@@ -286,10 +288,10 @@
}
[Test]
- [TestCase(1)]
- [TestCase(10)]
- [TestCase(20)]
- public void LengthEffect_SetValidValue_UpdateDataAndNotifyObservers(int value)
+ [TestCase(1.0)]
+ [TestCase(10.0)]
+ [TestCase(20.0)]
+ public void LengthEffect_SetValidValue_UpdateDataAndNotifyObservers(double value)
{
// Setup
var mockRepository = new MockRepository();
@@ -310,10 +312,10 @@
var properties = new StabilityPointStructuresFailureMechanismProperties(failureMechanism, changeHandler);
// Call
- properties.LengthEffect = value;
+ properties.LengthEffect = (RoundedDouble) value;
// Assert
- Assert.AreEqual(value, failureMechanism.GeneralInput.N);
+ Assert.AreEqual(value, failureMechanism.GeneralInput.N, failureMechanism.GeneralInput.N.GetAccuracy());
Assert.IsTrue(changeHandler.Called);
mockRepository.VerifyAll();
}
Index: build/DatabaseStructure.sql
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 680d50ac48c78aba5bcdb6cc459343ef6941f7a0)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 24-jan-2018 15:52:34 */
+/* Created On : 25-jan-2018 16:07:42 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -508,7 +508,7 @@
(
'StabilityPointStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'ForeshoreProfileCollectionSourcePath' TEXT,
'StabilityPointStructureCollectionSourcePath' TEXT,
CONSTRAINT 'FK_StrengthStabilityPointConstructionFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
Index: design/DatabaseDesign.eap
===================================================================
diff -u -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8 -r680d50ac48c78aba5bcdb6cc459343ef6941f7a0
Binary files differ