Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs
===================================================================
diff -u -r11cddca2aab7156d87e370248723cec8ec435744 -rc37dfb9961f12a9eb3e4b8c1488fd3a261851610
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 11cddca2aab7156d87e370248723cec8ec435744)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision c37dfb9961f12a9eb3e4b8c1488fd3a261851610)
@@ -45,61 +45,61 @@
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.AssessmentLevel,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 26
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveHeight,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 28
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.WavePeakPeriod,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 29
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.WaveSpectralPeriod,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 29
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.QVariant,
- MethodId = 6,
+ CalculationTypeId = 6,
VariableId = 114
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesOvertopping,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 1
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.DikesPiping,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 44
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresOvertopping,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 60
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresClosure,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 65
},
new HydraRingConfigurationSettings
{
HydraRingFailureMechanismType = HydraRingFailureMechanismType.StructuresStructuralFailure,
- MethodId = 1,
+ CalculationTypeId = 1,
VariableId = 65
}
};
@@ -263,7 +263,7 @@
"AlternativeId", null // Fixed: no support for piping
},
{
- "Method", configurationSettingsForFailureMechanism.MethodId
+ "Method", configurationSettingsForFailureMechanism.CalculationTypeId
},
{
"VariableId", configurationSettingsForFailureMechanism.VariableId
Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs
===================================================================
diff -u -ra3f55b8c75b2b98dfe39fa0391f91323fa51be9f -rc37dfb9961f12a9eb3e4b8c1488fd3a261851610
--- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision a3f55b8c75b2b98dfe39fa0391f91323fa51be9f)
+++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfigurationSettings.cs (.../HydraRingConfigurationSettings.cs) (revision c37dfb9961f12a9eb3e4b8c1488fd3a261851610)
@@ -32,13 +32,18 @@
public HydraRingFailureMechanismType HydraRingFailureMechanismType { get; set; }
///
- /// Gets or sets the id of the calculation method that should be used.
+ /// Gets or sets the id of the calculation type that should be used.
///
- public int MethodId { get; set; }
+ public int CalculationTypeId { get; set; }
///
/// Gets or sets the id of the variable that is considered.
///
public int VariableId { get; set; }
+
+ ///
+ /// Gets or sets the id of the calculation technique that should be used.
+ ///
+ public int CalculationTechniqueId { get; set; }
}
}