Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelSettingsCsvReader.cs =================================================================== diff -u -r1a0ff933f6b5e06d3f7376652c88c068f9610a92 -r2a90d576840ec1028b7b7fcc051a635cff9c2cb0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelSettingsCsvReader.cs (.../HydraulicModelSettingsCsvReader.cs) (revision 1a0ff933f6b5e06d3f7376652c88c068f9610a92) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraulicModelSettingsCsvReader.cs (.../HydraulicModelSettingsCsvReader.cs) (revision 2a90d576840ec1028b7b7fcc051a635cff9c2cb0) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.Linq; using Ringtoets.HydraRing.Calculation.Data; +using Ringtoets.HydraRing.Calculation.Data.Settings; namespace Ringtoets.HydraRing.Calculation.IO { @@ -35,7 +36,7 @@ private readonly string fileContents; - private readonly IDictionary>> settings = new Dictionary>>(); + private readonly IDictionary>> settings = new Dictionary>>(); private readonly Dictionary columns = new Dictionary { @@ -71,7 +72,7 @@ /// Reads the settings from the file. /// /// A with the settings. - public IDictionary>> ReadSettings() + public IDictionary>> ReadSettings() { string[] lines = fileContents.Split('\n'); @@ -90,23 +91,23 @@ if (!settings.ContainsKey(failureMechanismType)) { - settings.Add(failureMechanismType, new Dictionary>()); + settings.Add(failureMechanismType, new Dictionary>()); } // Get sub mechanism int subMechanism = GetSubMechanismType(line); if (!settings[failureMechanismType].ContainsKey(subMechanism)) { - settings[failureMechanismType].Add(subMechanism, new Dictionary()); + settings[failureMechanismType].Add(subMechanism, new Dictionary()); } // Get TrajectId string ringId = GetRingId(line); if (!settings[failureMechanismType][subMechanism].ContainsKey(ringId)) { - settings[failureMechanismType][subMechanism].Add(ringId, (HydraRingTimeIntegrationSchemeType) GetIntValueFromElement(line[columns[timeIntegrationKey]])); + settings[failureMechanismType][subMechanism].Add(ringId, new HydraulicModelSettings((HydraRingTimeIntegrationSchemeType) GetIntValueFromElement(line[columns[timeIntegrationKey]]))); } }