Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs =================================================================== diff -u -rc99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f -r1ffce7db57db828039b8e2d5a24715cbaa76f6a8 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision c99a72f80fc8db3a8a6fd0db0d1181bcda1e0f8f) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision 1ffce7db57db828039b8e2d5a24715cbaa76f6a8) @@ -29,7 +29,7 @@ /// /// The reader for in csv format. /// - internal class DesignTablesSettingsCsvReader : HydraRingSettingsCsvReader>> + internal class DesignTablesSettingsCsvReader : HydraRingSettingsVariableCsvReader>> { private readonly Dictionary columns = new Dictionary { @@ -47,40 +47,6 @@ } }; - private readonly Dictionary failureMechanismTypes = new Dictionary - { - { - assessmentLevelKey, HydraRingFailureMechanismType.AssessmentLevel - }, - { - waveHeightKey, HydraRingFailureMechanismType.WaveHeight - }, - { - wavePeakPeriodKey, HydraRingFailureMechanismType.WavePeakPeriod - }, - { - waveSpectralPeriodKey, HydraRingFailureMechanismType.WaveSpectralPeriod - }, - { - qVariantKey, HydraRingFailureMechanismType.QVariant - }, - { - dikeHeightKey, HydraRingFailureMechanismType.DikesHeight - }, - { - grassKey, HydraRingFailureMechanismType.DikesOvertopping - }, - { - heightStructuresKey, HydraRingFailureMechanismType.StructuresOvertopping - }, - { - closingStructuresKey, HydraRingFailureMechanismType.StructuresClosure - }, - { - structuresStructuralFailureKey, HydraRingFailureMechanismType.StructuresStructuralFailure - } - }; - /// /// Creates a new instance of . /// @@ -92,7 +58,7 @@ protected override void CreateSetting(IList line) { // Get failure mechanism - var failureMechanismType = GetFailureMechanismType(line); + var failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[columns[variableKey]])); if (!Settings.ContainsKey(failureMechanismType)) { @@ -107,11 +73,6 @@ } } - private HydraRingFailureMechanismType GetFailureMechanismType(IList line) - { - return failureMechanismTypes[GetStringValueFromElement(line[columns[variableKey]])]; - } - private string GetRingId(IList line) { return GetStringValueFromElement(line[columns[ringIdKey]]); @@ -131,20 +92,5 @@ private const string maxKey = "Max"; #endregion - - #region Variable names - - private const string assessmentLevelKey = "Toetspeil"; - private const string waveHeightKey = "Hs"; - private const string wavePeakPeriodKey = "Tp"; - 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 } } \ No newline at end of file