Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs =================================================================== diff -u -r4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866 -rc99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision 4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision c99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f) @@ -66,6 +66,18 @@ }, { dikeHeightKey, HydraRingFailureMechanismType.DikesHeight + }, + { + grassKey, HydraRingFailureMechanismType.DikesOvertopping + }, + { + heightStructuresKey, HydraRingFailureMechanismType.StructuresOvertopping + }, + { + closingStructuresKey, HydraRingFailureMechanismType.StructuresClosure + }, + { + structuresStructuralFailureKey, HydraRingFailureMechanismType.StructuresStructuralFailure } }; @@ -128,6 +140,10 @@ private const string waveSpectralPeriodKey = "Tm-1,0"; private const string qVariantKey = "Q"; private const string dikeHeightKey = "HBN"; + private const string grassKey = "Gras"; + private const string heightStructuresKey = "KwHoogte"; + private const string closingStructuresKey = "KwSluiten"; + private const string structuresStructuralFailureKey = "KwPuntconstructies"; #endregion } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs =================================================================== diff -u -r4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866 -rc99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs (.../DesignTablesSettingsCsvReaderTest.cs) (revision 4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs (.../DesignTablesSettingsCsvReaderTest.cs) (revision c99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f) @@ -72,7 +72,7 @@ IDictionary> settings = reader.ReadSettings(); // Assert - Assert.AreEqual(2, settings.Count); + Assert.AreEqual(10, settings.Count); foreach (KeyValuePair> expectedMechanism in expectedDictionary) { @@ -118,7 +118,71 @@ "11-1", new DesignTablesSetting(5, 15) } } - } + }, + { + HydraRingFailureMechanismType.WaveHeight, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, + { + HydraRingFailureMechanismType.WavePeakPeriod, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, + { + HydraRingFailureMechanismType.WaveSpectralPeriod, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, + { + HydraRingFailureMechanismType.DikesHeight, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, + { + HydraRingFailureMechanismType.DikesOvertopping, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, + { + HydraRingFailureMechanismType.StructuresOvertopping, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, + { + HydraRingFailureMechanismType.StructuresClosure, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, + { + HydraRingFailureMechanismType.StructuresStructuralFailure, new Dictionary + { + { + "205", new DesignTablesSetting(5, 15) + } + } + }, }; } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Settings/DesignTablesSettingsTest.csv =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -rc99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Settings/DesignTablesSettingsTest.csv (.../DesignTablesSettingsTest.csv) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/test-data/Settings/DesignTablesSettingsTest.csv (.../DesignTablesSettingsTest.csv) (revision c99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f) @@ -3,3 +3,11 @@ "205;""Q"";5;15" "11-1;""Toetspeil"";5;15" "11-1;""Q"";5;15" +"205;""Hs"";5;15" +"205;""Tp"";5;15" +"205;""Tm-1,0"";5;15" +"205;""HBN"";5;15" +"205;""Gras"";5;15" +"205;""KwHoogte"";5;15" +"205;""KwSluiten"";5;15" +"205;""KwPuntconstructies"";5;15" \ No newline at end of file