Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 24-jan-2018 10:25:03 */
+/* Created On : 24-jan-2018 15:52:34 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -561,7 +561,7 @@
(
'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'DikeProfileCollectionSourcePath' TEXT,
CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -608,7 +608,7 @@
(
'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'HeightStructureCollectionSourcePath' TEXT,
'ForeshoreProfileCollectionSourcePath' TEXT,
CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
@@ -619,7 +619,7 @@
(
'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'ForeshoreProfileCollectionSourcePath' TEXT,
CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_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 -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -33,11 +33,31 @@
INSERT INTO GeneralResultSubMechanismIllustrationPointStochastEntity SELECT * FROM [SOURCEPROJECT].GeneralResultSubMechanismIllustrationPointStochastEntity;
INSERT INTO GrassCoverErosionInwardsCalculationEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsCalculationEntity;
INSERT INTO GrassCoverErosionInwardsDikeHeightOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsDikeHeightOutputEntity;
-INSERT INTO GrassCoverErosionInwardsFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionInwardsFailureMechanismMetaEntity;
+INSERT INTO GrassCoverErosionInwardsFailureMechanismMetaEntity(
+ [GrassCoverErosionInwardsFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [N],
+ [DikeProfileCollectionSourcePath])
+SELECT
+ [GrassCoverErosionInwardsFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [N] AS REAL,
+ [DikeProfileCollectionSourcePath]
+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 SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity;
+INSERT INTO GrassCoverErosionOutwardsFailureMechanismMetaEntity(
+ [GrassCoverErosionOutwardsFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [N],
+ [ForeshoreProfileCollectionSourcePath])
+SELECT
+ [GrassCoverErosionOutwardsFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [N] AS REAL,
+ [ForeshoreProfileCollectionSourcePath]
+FROM [SOURCEPROJECT].GrassCoverErosionOutwardsFailureMechanismMetaEntity;
INSERT INTO GrassCoverErosionOutwardsHydraulicLocationEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationEntity;
INSERT INTO GrassCoverErosionOutwardsHydraulicLocationOutputEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsHydraulicLocationOutputEntity;
INSERT INTO GrassCoverErosionOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverErosionOutwardsSectionResultEntity;
@@ -47,7 +67,19 @@
INSERT INTO GrassCoverSlipOffOutwardsSectionResultEntity SELECT * FROM [SOURCEPROJECT].GrassCoverSlipOffOutwardsSectionResultEntity;
INSERT INTO HeightStructureEntity SELECT * FROM [SOURCEPROJECT].HeightStructureEntity;
INSERT INTO HeightStructuresCalculationEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresCalculationEntity;
-INSERT INTO HeightStructuresFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].HeightStructuresFailureMechanismMetaEntity;
+INSERT INTO HeightStructuresFailureMechanismMetaEntity(
+ [HeightStructuresFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [N],
+ [HeightStructureCollectionSourcePath],
+ [ForeshoreProfileCollectionSourcePath])
+SELECT
+ [HeightStructuresFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [N] AS REAL,
+ [HeightStructureCollectionSourcePath],
+ [ForeshoreProfileCollectionSourcePath]
+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/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensions.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -54,7 +54,7 @@
{
var metaEntity = new GrassCoverErosionInwardsFailureMechanismMetaEntity
{
- N = (int) mechanism.GeneralInput.N,
+ N = mechanism.GeneralInput.N,
DikeProfileCollectionSourcePath = mechanism.DikeProfiles.SourcePath
};
entity.GrassCoverErosionInwardsFailureMechanismMetaEntities.Add(metaEntity);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -72,7 +72,7 @@
var metaEntity = new GrassCoverErosionOutwardsFailureMechanismMetaEntity
{
ForeshoreProfileCollectionSourcePath = failureMechanism.ForeshoreProfiles.SourcePath.DeepClone(),
- N = (int) Math.Round(failureMechanism.GeneralInput.N)
+ N = failureMechanism.GeneralInput.N
};
entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Add(metaEntity);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensions.cs (.../HeightStructuresFailureMechanismCreateExtensions.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -93,7 +93,7 @@
{
entity.HeightStructuresFailureMechanismMetaEntities.Add(new HeightStructuresFailureMechanismMetaEntity
{
- N = (int) mechanism.GeneralInput.N,
+ N = mechanism.GeneralInput.N,
HeightStructureCollectionSourcePath = mechanism.HeightStructures.SourcePath.DeepClone(),
ForeshoreProfileCollectionSourcePath = mechanism.ForeshoreProfiles.SourcePath.DeepClone()
});
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntity.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionInwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntity.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -34,7 +34,7 @@
{
public long GrassCoverErosionInwardsFailureMechanismMetaEntityId { get; set; }
public long FailureMechanismEntityId { get; set; }
- public int N { get; set; }
+ public double N { get; set; }
public string DikeProfileCollectionSourcePath { get; set; }
public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs
===================================================================
diff -u -r755360927a67d206d503b10e0d4c40d5426c4a3b -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs) (revision 755360927a67d206d503b10e0d4c40d5426c4a3b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntity.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -34,7 +34,7 @@
{
public long GrassCoverErosionOutwardsFailureMechanismMetaEntityId { get; set; }
public long FailureMechanismEntityId { get; set; }
- public int N { get; set; }
+ public double N { get; set; }
public string ForeshoreProfileCollectionSourcePath { get; set; }
public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs
===================================================================
diff -u -r755360927a67d206d503b10e0d4c40d5426c4a3b -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs (.../HeightStructuresFailureMechanismMetaEntity.cs) (revision 755360927a67d206d503b10e0d4c40d5426c4a3b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresFailureMechanismMetaEntity.cs (.../HeightStructuresFailureMechanismMetaEntity.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -34,7 +34,7 @@
{
public long HeightStructuresFailureMechanismMetaEntityId { get; set; }
public long FailureMechanismEntityId { get; set; }
- public int N { get; set; }
+ public double N { get; set; }
public string HeightStructureCollectionSourcePath { get; set; }
public string ForeshoreProfileCollectionSourcePath { get; set; }
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -381,7 +381,7 @@
-
+
@@ -430,7 +430,7 @@
-
+
@@ -599,7 +599,7 @@
-
+
@@ -4807,7 +4807,7 @@
-
+
@@ -4865,7 +4865,7 @@
-
+
@@ -5056,7 +5056,7 @@
-
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -9,94 +9,94 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismCreateExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -91,7 +91,7 @@
Assert.AreEqual(1, entity.GrassCoverErosionInwardsFailureMechanismMetaEntities.Count);
GrassCoverErosionInwardsFailureMechanismMetaEntity generalInputEntity = entity.GrassCoverErosionInwardsFailureMechanismMetaEntities.First();
- Assert.AreEqual((int) failureMechanism.GeneralInput.N, generalInputEntity.N);
+ Assert.AreEqual(failureMechanism.GeneralInput.N, generalInputEntity.N);
Assert.IsNull(generalInputEntity.DikeProfileCollectionSourcePath);
}
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -213,7 +213,7 @@
FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
// Assert
- Assert.AreEqual((int) n, entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Single().N);
+ Assert.AreEqual(failureMechanism.GeneralInput.N, entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Single().N);
}
[Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HeightStructures/HeightStructuresFailureMechanismCreateExtensionsTest.cs (.../HeightStructuresFailureMechanismCreateExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -91,7 +91,7 @@
Assert.AreEqual(failureMechanism.NotRelevantComments.Body, entity.NotRelevantComments);
HeightStructuresFailureMechanismMetaEntity metaEntity = entity.HeightStructuresFailureMechanismMetaEntities.First();
- Assert.AreEqual((int) failureMechanism.GeneralInput.N, metaEntity.N);
+ Assert.AreEqual(failureMechanism.GeneralInput.N, metaEntity.N);
Assert.IsNull(metaEntity.HeightStructureCollectionSourcePath);
}
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -63,6 +63,9 @@
AssertPipingSoilLayers(reader);
AssertHydraRingPreprocessor(reader);
AssertStabilityStoneCoverFailureMechanism(reader);
+ AssertHeightStructuresFailureMechanism(reader, sourceFilePath);
+ AssertGrassCoverErosionInwardsFailureMechanism(reader, sourceFilePath);
+ AssertGrassCoverErosionOutwardsFailureMechanism(reader, sourceFilePath);
}
AssertLogDatabase(logFilePath);
@@ -274,11 +277,50 @@
private static void AssertStabilityStoneCoverFailureMechanism(MigratedDatabaseReader reader)
{
- const string validatePreprocessorSettings =
+ const string validateStabilityStoneCoverFailureMechanism =
"SELECT COUNT() = 0 " +
- "FROM [StabilityStoneCoverFailureMechanismMetaEntity]" +
+ "FROM [StabilityStoneCoverFailureMechanismMetaEntity] " +
"WHERE [N] IS NOT 4;";
- reader.AssertReturnedDataIsValid(validatePreprocessorSettings);
+ 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/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -27,6 +27,7 @@
using Application.Ringtoets.Storage.Serializers;
using Application.Ringtoets.Storage.TestUtil;
using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards;
+using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
using NUnit.Framework;
@@ -36,6 +37,7 @@
using Ringtoets.Common.Data.DikeProfiles;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Data.Hydraulics;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.Integration.Data;
using Ringtoets.MacroStabilityInwards.Data;
@@ -739,7 +741,8 @@
Assert.AreEqual(originalInput, section.GrassCoverErosionInwards.InputComments.Body);
Assert.AreEqual(originalOutput, section.GrassCoverErosionInwards.OutputComments.Body);
Assert.AreEqual(originalNotRelevantText, section.GrassCoverErosionInwards.NotRelevantComments.Body);
- Assert.AreEqual(n, (int) section.GrassCoverErosionInwards.GeneralInput.N);
+ RoundedDouble actualN = section.GrassCoverErosionInwards.GeneralInput.N;
+ Assert.AreEqual(n, actualN, actualN.GetAccuracy());
}
[Test]
@@ -859,7 +862,8 @@
Assert.AreEqual(inputComments, section.GrassCoverErosionOutwards.InputComments.Body);
Assert.AreEqual(outputComments, section.GrassCoverErosionOutwards.OutputComments.Body);
Assert.AreEqual(notRelevantComments, section.GrassCoverErosionOutwards.NotRelevantComments.Body);
- Assert.AreEqual(n, (int) section.GrassCoverErosionOutwards.GeneralInput.N);
+ RoundedDouble actualN = section.GrassCoverErosionOutwards.GeneralInput.N;
+ Assert.AreEqual(n, actualN, actualN.GetAccuracy());
}
[Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -27,6 +27,7 @@
using Application.Ringtoets.Storage.TestUtil;
using Application.Ringtoets.Storage.TestUtil.MacroStabilityInwards;
using Core.Common.Base;
+using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
using NUnit.Framework;
@@ -975,7 +976,8 @@
Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body);
CollectionAssert.IsEmpty(failureMechanism.Sections);
- Assert.AreEqual(n, (int) failureMechanism.GeneralInput.N);
+ RoundedDouble actualN = failureMechanism.GeneralInput.N;
+ Assert.AreEqual(entity.GrassCoverErosionInwardsFailureMechanismMetaEntities.Single().N, actualN, actualN.GetAccuracy());
Assert.IsNull(failureMechanism.DikeProfiles.SourcePath);
}
@@ -1147,7 +1149,8 @@
Assert.AreEqual(entity.NotRelevantComments, failureMechanism.NotRelevantComments.Body);
CollectionAssert.IsEmpty(failureMechanism.Sections);
- Assert.AreEqual(n, (int) failureMechanism.GeneralInput.N);
+ RoundedDouble actualN = failureMechanism.GeneralInput.N;
+ Assert.AreEqual(entity.GrassCoverErosionOutwardsFailureMechanismMetaEntities.Single().N, actualN, actualN.GetAccuracy());
Assert.IsNull(failureMechanism.ForeshoreProfiles.SourcePath);
}
@@ -1815,7 +1818,8 @@
ForeshoreProfile child2 = foreshoreProfiles[1];
Assert.AreEqual("Child1", child2.Id);
- Assert.AreEqual(generalInputN, (int) failureMechanism.GeneralInput.N);
+ RoundedDouble actualN = failureMechanism.GeneralInput.N;
+ Assert.AreEqual(entity.HeightStructuresFailureMechanismMetaEntities.Single().N, actualN, actualN.GetAccuracy());
}
[Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -25,6 +25,7 @@
using Core.Common.Base.Data;
using Core.Common.TestUtil;
using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.GrassCoverErosionInwards.Data;
namespace Application.Ringtoets.Storage.Test.Read.GrassCoverErosionInwards
@@ -55,15 +56,15 @@
var entity = new GrassCoverErosionInwardsFailureMechanismMetaEntity
{
- N = (int) n
+ N = n
};
var inputToUpdate = new GeneralGrassCoverErosionInwardsInput();
// Call
entity.Read(inputToUpdate);
// Assert
- Assert.AreEqual((int) n, (int) inputToUpdate.N);
+ Assert.AreEqual(entity.N, inputToUpdate.N, inputToUpdate.N.GetAccuracy());
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -25,6 +25,7 @@
using Core.Common.Base.Data;
using Core.Common.TestUtil;
using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.GrassCoverErosionOutwards.Data;
namespace Application.Ringtoets.Storage.Test.Read.GrassCoverErosionOutwards
@@ -55,15 +56,15 @@
var entity = new GrassCoverErosionOutwardsFailureMechanismMetaEntity
{
- N = (int) n
+ N = n
};
var inputToUpdate = new GeneralGrassCoverErosionOutwardsInput();
// Call
entity.Read(inputToUpdate);
// Assert
- Assert.AreEqual((int) n, (int) inputToUpdate.N);
+ Assert.AreEqual(entity.N, inputToUpdate.N, inputToUpdate.N.GetAccuracy());
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructures/HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs (.../HeightStructuresFailureMechanismMetaEntityReadExtensionsTest.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -22,6 +22,7 @@
using Application.Ringtoets.Storage.DbContext;
using Application.Ringtoets.Storage.Read.HeightStructures;
using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
using Ringtoets.HeightStructures.Data;
namespace Application.Ringtoets.Storage.Test.Read.HeightStructures
@@ -42,7 +43,7 @@
GeneralHeightStructuresInput generalInput = entity.Read();
// Assert
- Assert.AreEqual(entity.N, (int) generalInput.N);
+ Assert.AreEqual(entity.N, generalInput.N, generalInput.N.GetAccuracy());
}
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -1377,7 +1377,7 @@
ZoneBoundaryLeft = (RoundedDouble) 10,
ZoneBoundaryRight = (RoundedDouble) 12
},
- Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
+ Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
},
new MacroStabilityInwardsCalculationScenario
{
@@ -1459,7 +1459,7 @@
ZoneBoundaryLeft = (RoundedDouble) 5.4,
ZoneBoundaryRight = (RoundedDouble) 6.5
},
- Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(),
+ Output = MacroStabilityInwardsOutputTestFactory.CreateOutput()
}
}
});
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GeneralGrassCoverErosionInwardsInput.cs
===================================================================
diff -u -r401ea38da560543cd91415c326b9463976b2e80a -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GeneralGrassCoverErosionInwardsInput.cs (.../GeneralGrassCoverErosionInwardsInput.cs) (revision 401ea38da560543cd91415c326b9463976b2e80a)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GeneralGrassCoverErosionInwardsInput.cs (.../GeneralGrassCoverErosionInwardsInput.cs) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -92,6 +92,7 @@
throw new ArgumentOutOfRangeException(nameof(value), string.Format(Resources.N_Value_should_be_in_Range_0_,
validityRangeN));
}
+
n = value.ToPrecision(n.NumberOfDecimalPlaces);
}
}
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision f7036a73fff399ef3c8524ffe9099e9b8fcbf3d8)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 24-jan-2018 10:25:03 */
+/* Created On : 24-jan-2018 15:52:34 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -561,7 +561,7 @@
(
'GrassCoverErosionInwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'DikeProfileCollectionSourcePath' TEXT,
CONSTRAINT 'FK_GrassCoverErosionInwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
@@ -608,7 +608,7 @@
(
'HeightStructuresFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'HeightStructureCollectionSourcePath' TEXT,
'ForeshoreProfileCollectionSourcePath' TEXT,
CONSTRAINT 'FK_HeightStructuresFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
@@ -619,7 +619,7 @@
(
'GrassCoverErosionOutwardsFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
- 'N' INT (4) NOT NULL,
+ 'N' REAL NOT NULL,
'ForeshoreProfileCollectionSourcePath' TEXT,
CONSTRAINT 'FK_GrassCoverErosionOutwardsFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
Index: design/DatabaseDesign.eap
===================================================================
diff -u -r7d89262d3b971dceec1e987e22d0027bf675c196 -rf7036a73fff399ef3c8524ffe9099e9b8fcbf3d8
Binary files differ