Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -ra9b057e543ac7738a932d2b880bf0e740033efed -ra3f55b8c75b2b98dfe39fa0391f91323fa51be9f --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision a9b057e543ac7738a932d2b880bf0e740033efed) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision a3f55b8c75b2b98dfe39fa0391f91323fa51be9f) @@ -45,51 +45,61 @@ new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel, + MethodId = 1, VariableId = 26 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveHeight, + MethodId = 1, VariableId = 28 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.WavePeakPeriod, + MethodId = 1, VariableId = 29 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveSpectralPeriod, + MethodId = 1, VariableId = 29 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.QVariant, + MethodId = 6, VariableId = 114 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping, + MethodId = 1, VariableId = 1 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesPiping, + MethodId = 1, VariableId = 44 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping, + MethodId = 1, VariableId = 60 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresClosure, + MethodId = 1, VariableId = 65 }, new HydraRingConfigurationSettings { HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure, + MethodId = 1, VariableId = 65 } }; @@ -233,6 +243,8 @@ private void InitializeDesignTablesConfiguration(Dictionary> configurationDictionary) { + var configurationSettingsForFailureMechanism = configurationSettings.First(cs => cs.HydraRingFailureMechanismType == FailureMechanismType); + configurationDictionary["DesignTables"] = new List { new OrderedDictionary @@ -250,10 +262,10 @@ "AlternativeId", null // Fixed: no support for piping }, { - "Method", 1 // Fixed: no support for computations other than of type 1 + "Method", configurationSettingsForFailureMechanism.MethodId }, { - "VariableId", configurationSettings.First(cs => cs.HydraRingFailureMechanismType == FailureMechanismType).VariableId + "VariableId", configurationSettingsForFailureMechanism.VariableId }, { "LoadVariableId", null // Fixed: not relevant Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs =================================================================== diff -u -ra9b057e543ac7738a932d2b880bf0e740033efed -ra3f55b8c75b2b98dfe39fa0391f91323fa51be9f --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision a9b057e543ac7738a932d2b880bf0e740033efed) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision a3f55b8c75b2b98dfe39fa0391f91323fa51be9f) @@ -32,6 +32,11 @@ public HydraRingFailureMechanismType HydraRingFailureMechanismType { get; set; } /// + /// Gets or sets the id of the calculation method that should be used. + /// + public int MethodId { 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 -ra9b057e543ac7738a932d2b880bf0e740033efed -ra3f55b8c75b2b98dfe39fa0391f91323fa51be9f --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision a9b057e543ac7738a932d2b880bf0e740033efed) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision a3f55b8c75b2b98dfe39fa0391f91323fa51be9f) @@ -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, 114, NULL, NULL, NULL, NULL, NULL, NULL, NULL);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (999, 3, NULL, NULL, 6, 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 +