Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -r785b134de206df57655fd652a72367bb913314f7 -ra9b057e543ac7738a932d2b880bf0e740033efed --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 785b134de206df57655fd652a72367bb913314f7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision a9b057e543ac7738a932d2b880bf0e740033efed) @@ -23,6 +23,7 @@ using System.Collections.Generic; using System.Collections.Specialized; using System.Globalization; +using System.Linq; using Ringtoets.HydraRing.Data; namespace Ringtoets.HydraRing.Calculation @@ -43,43 +44,53 @@ { new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel + HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel, + VariableId = 26 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.QVariant + HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveHeight, + VariableId = 28 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveHeight + HydraRingFailureMechanismType = HydraRingFailureMechanismType.WavePeakPeriod, + VariableId = 29 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.WavePeakPeriod + HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveSpectralPeriod, + VariableId = 29 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveSpectralPeriod + HydraRingFailureMechanismType = HydraRingFailureMechanismType.QVariant, + VariableId = 114 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping + HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping, + VariableId = 1 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesPiping + HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesPiping, + VariableId = 44 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping + HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping, + VariableId = 60 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresClosure + HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresClosure, + VariableId = 65 }, new HydraRingConfigurationSettings { - HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure + HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure, + VariableId = 65 } }; } @@ -242,7 +253,7 @@ "Method", 1 // Fixed: no support for computations other than of type 1 }, { - "VariableId", null // TODO: Fix as part of WTI-324 + "VariableId", configurationSettings.First(cs => cs.HydraRingFailureMechanismType == FailureMechanismType).VariableId }, { "LoadVariableId", null // Fixed: not relevant Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs =================================================================== diff -u -rcfbf9b34d71b46cca6c038e90e45db85d883ea30 -ra9b057e543ac7738a932d2b880bf0e740033efed --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision cfbf9b34d71b46cca6c038e90e45db85d883ea30) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision a9b057e543ac7738a932d2b880bf0e740033efed) @@ -27,8 +27,13 @@ public class HydraRingConfigurationSettings { /// - /// Gets or sets the of the . + /// Gets or sets the . /// public HydraRingFailureMechanismType HydraRingFailureMechanismType { get; set; } + + /// + /// Gets or sets the id of the variable that is considered. + /// + public int VariableId { get; set; } } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs =================================================================== diff -u -r785b134de206df57655fd652a72367bb913314f7 -ra9b057e543ac7738a932d2b880bf0e740033efed --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 785b134de206df57655fd652a72367bb913314f7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision a9b057e543ac7738a932d2b880bf0e740033efed) @@ -114,7 +114,7 @@ "INSERT INTO [Sections] VALUES (999, 1, 1, 'HydraRingLocation', 'HydraRingLocation', NULL, NULL, NULL, NULL, 700003, 700003, 100, NULL, NULL);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (999, 3, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (999, 3, NULL, NULL, 1, 114, NULL, NULL, NULL, NULL, NULL, NULL, NULL);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Areas];" + Environment.NewLine + "INSERT INTO [Areas] VALUES (1, '1', 'Nederland');" + Environment.NewLine +