Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs =================================================================== diff -u -r1ffce7db57db828039b8e2d5a24715cbaa76f6a8 -rf8240e07daa9f12cccd51403958eabb55c6a78e3 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision 1ffce7db57db828039b8e2d5a24715cbaa76f6a8) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision f8240e07daa9f12cccd51403958eabb55c6a78e3) @@ -31,22 +31,6 @@ /// internal class DesignTablesSettingsCsvReader : HydraRingSettingsVariableCsvReader>> { - private readonly Dictionary columns = new Dictionary - { - { - ringIdKey, 0 - }, - { - variableKey, 1 - }, - { - minKey, 2 - }, - { - maxKey, 3 - } - }; - /// /// Creates a new instance of . /// @@ -57,16 +41,14 @@ protected override void CreateSetting(IList line) { - // Get failure mechanism - var failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[columns[variableKey]])); + HydraRingFailureMechanismType failureMechanismType = GetFailureMechanismType(GetStringValueFromElement(line[(int) DesignTablesSettingsColumns.Variable])); if (!Settings.ContainsKey(failureMechanismType)) { Settings.Add(failureMechanismType, new Dictionary()); } - // Get TrajectId - var ringId = GetRingId(line); + string ringId = GetRingId(line); if (!Settings[failureMechanismType].ContainsKey(ringId)) { Settings[failureMechanismType].Add(ringId, GetDesignTablesSetting(line)); @@ -75,22 +57,13 @@ private string GetRingId(IList line) { - return GetStringValueFromElement(line[columns[ringIdKey]]); + return GetStringValueFromElement(line[(int) DesignTablesSettingsColumns.RingId]); } private DesignTablesSetting GetDesignTablesSetting(IList line) { - return new DesignTablesSetting(GetDoubleValueFromElement(line[columns[minKey]]), - GetDoubleValueFromElement(line[columns[maxKey]])); + return new DesignTablesSetting(GetDoubleValueFromElement(line[(int) DesignTablesSettingsColumns.Min]), + GetDoubleValueFromElement(line[(int) DesignTablesSettingsColumns.Max])); } - - #region Csv column names - - private const string ringIdKey = "TrajectID"; - private const string variableKey = "Variable"; - private const string minKey = "Min"; - private const string maxKey = "Max"; - - #endregion } } \ No newline at end of file