Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs =================================================================== diff -u -rfe9af51d0ecee9dc64884d9370cf951fe787a8bc -r43074cf185009dabd2b9a4ee2b1a8fffa73747c5 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision fe9af51d0ecee9dc64884d9370cf951fe787a8bc) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRingConfiguration.cs (.../HydraRingConfiguration.cs) (revision 43074cf185009dabd2b9a4ee2b1a8fffa73747c5) @@ -62,6 +62,10 @@ private readonly HydraRingTimeIntegrationSchemeType timeIntegrationSchemeType; private readonly HydraRingUncertaintiesType uncertaintiesType; + private const double defaultLayerId = 1; + private const double defaultAlternativeId = 1; + private const double defaultHydraRingValue = 0.0; + /// /// Creates a new instance of the class. /// @@ -248,10 +252,10 @@ "MechanismId", failureMechanismDefaults.MechanismId }, { - "LayerId", null // Fixed: no support for revetments + "LayerId", defaultLayerId // Fixed: no support for revetments }, { - "AlternativeId", null // Fixed: no support for piping + "AlternativeId", defaultAlternativeId // Fixed: no support for piping }, { "Method", failureMechanismDefaults.CalculationTypeId @@ -260,16 +264,16 @@ "VariableId", failureMechanismDefaults.VariableId }, { - "LoadVariableId", null // Fixed: not relevant + "LoadVariableId", defaultHydraRingValue // Fixed: not relevant }, { - "TableMin", null // Fixed: no support for type 3 computations (see "Method") + "TableMin", defaultHydraRingValue // Fixed: no support for type 3 computations (see "Method") }, { - "TableMax", null // Fixed: no support for type 3 computations (see "Method") + "TableMax", defaultHydraRingValue // Fixed: no support for type 3 computations (see "Method") }, { - "TableStepSize", null // Fixed: no support for type 3 computations (see "Method") + "TableStepSize", defaultHydraRingValue // Fixed: no support for type 3 computations (see "Method") }, { "ValueMin", GetHydraRingValue(failureMechanismSettings.ValueMin) @@ -307,10 +311,10 @@ "MechanismId", failureMechanismDefaults.MechanismId }, { - "LayerId", null // Fixed: no support for revetments + "LayerId", defaultLayerId // Fixed: no support for revetments }, { - "AlternativeId", null // Fixed: no support for piping + "AlternativeId", defaultAlternativeId // Fixed: no support for piping }, { "SubMechanismId", subMechanimsId @@ -388,40 +392,40 @@ "MechanismId", failureMechanismDefaults.MechanismId }, { - "LayerId", null // Fixed: no support for revetments + "LayerId", defaultLayerId // Fixed: no support for revetments }, { - "AlternativeId", null // Fixed: no support for piping + "AlternativeId", defaultAlternativeId // Fixed: no support for piping }, { "VariableId", hydraRingVariable.VariableId }, { "Value", hydraRingVariable.DistributionType == HydraRingDistributionType.Deterministic ? GetHydraRingValue(hydraRingVariable.Value) - : null + : defaultHydraRingValue }, { "DistributionType", (int?) hydraRingVariable.DistributionType }, { "Parameter1", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic ? GetHydraRingValue(hydraRingVariable.Mean) - : null + : defaultHydraRingValue }, { "Parameter2", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic && hydraRingVariable.DeviationType == HydraRingDeviationType.Standard ? GetHydraRingValue(hydraRingVariable.Variability) - : null + : defaultHydraRingValue }, { "Parameter3", hydraRingVariable.DistributionType == HydraRingDistributionType.LogNormal ? GetHydraRingValue(hydraRingVariable.Shift) - : null + : defaultHydraRingValue }, { - "Parameter4", null // Fixed: Not relevant + "Parameter4", defaultHydraRingValue // Fixed: Not relevant }, { "DeviationType", (int?) hydraRingVariable.DeviationType @@ -430,7 +434,7 @@ "CoefficientOfVariation", hydraRingVariable.DistributionType != HydraRingDistributionType.Deterministic && hydraRingVariable.DeviationType == HydraRingDeviationType.Variation ? GetHydraRingValue(hydraRingVariable.Variability) - : null + : defaultHydraRingValue }, { "CorrelationLength", GetHydraRingValue(variableDefaults.CorrelationLength) @@ -494,10 +498,10 @@ "MechanismId", failureMechanismDefaults.MechanismId }, { - "LayerId", null // Fixed: no support for revetments + "LayerId", defaultLayerId // Fixed: no support for revetments }, { - "AlternativeId", null // Fixed: no support for piping + "AlternativeId", defaultAlternativeId // Fixed: no support for piping }, { "FaultTreeModelId", failureMechanismSettings.FaultTreeModelId @@ -531,10 +535,10 @@ "MechanismId", failureMechanismDefaults.MechanismId }, { - "LayerId", null // Fixed: no support for revetments + "LayerId", defaultLayerId // Fixed: no support for revetments }, { - "AlternativeId", null // Fixed: no support for piping + "AlternativeId", defaultAlternativeId // Fixed: no support for piping }, { "SubMechanismId", subMechanismId @@ -698,7 +702,7 @@ private double? GetHydraRingValue(double value) { - return !double.IsNaN(value) ? (double?) value : null; + return !double.IsNaN(value) ? value : defaultHydraRingValue; } } } \ No newline at end of file