Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Exporters/StabilityPointStructuresCalculationConfigurationWriter.cs
===================================================================
diff -u -ra6bfe739a97fac2ea5228a4c46f961a55351e9cb -r05772f7de5cf48deadb93cab09b6476af1a6e4c6
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Exporters/StabilityPointStructuresCalculationConfigurationWriter.cs (.../StabilityPointStructuresCalculationConfigurationWriter.cs) (revision a6bfe739a97fac2ea5228a4c46f961a55351e9cb)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Exporters/StabilityPointStructuresCalculationConfigurationWriter.cs (.../StabilityPointStructuresCalculationConfigurationWriter.cs) (revision 05772f7de5cf48deadb93cab09b6476af1a6e4c6)
@@ -49,6 +49,9 @@
WriteElementWhenContentAvailable(writer,
StabilityPointStructuresConfigurationSchemaIdentifiers.EvaluationLevelElement,
configuration.EvaluationLevel);
+ WriteElementWhenContentAvailable(writer,
+ StabilityPointStructuresConfigurationSchemaIdentifiers.FailureProbabilityRepairClosureElement,
+ configuration.FailureProbabilityRepairClosure);
}
protected override void WriteSpecificStochasts(StabilityPointStructuresCalculationConfiguration configuration, XmlWriter writer)
@@ -63,11 +66,14 @@
StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthLinearLoadModelStochastName,
configuration.ConstructiveStrengthLinearLoadModel);
WriteDistributionWhenAvailable(writer,
- StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthQuadraticLoadModelName,
+ StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthQuadraticLoadModelStochastName,
configuration.ConstructiveStrengthQuadraticLoadModel);
WriteDistributionWhenAvailable(writer,
StabilityPointStructuresConfigurationSchemaIdentifiers.FailureCollisionEnergyStochastName,
configuration.FailureCollisionEnergy);
+ WriteDistributionWhenAvailable(writer,
+ StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName,
+ configuration.FlowVelocityStructureClosable);
}
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresCalculationConfiguration.cs
===================================================================
diff -u -ra6bfe739a97fac2ea5228a4c46f961a55351e9cb -r05772f7de5cf48deadb93cab09b6476af1a6e4c6
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresCalculationConfiguration.cs (.../StabilityPointStructuresCalculationConfiguration.cs) (revision a6bfe739a97fac2ea5228a4c46f961a55351e9cb)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresCalculationConfiguration.cs (.../StabilityPointStructuresCalculationConfiguration.cs) (revision 05772f7de5cf48deadb93cab09b6476af1a6e4c6)
@@ -65,5 +65,15 @@
/// Gets or sets the stochast configuration for the failure collision energy of the structure.
///
public MeanVariationCoefficientStochastConfiguration FailureCollisionEnergy { get; set; }
+
+ ///
+ /// Gets or sets the failure probability of repairing a closure of the structure.
+ ///
+ public double? FailureProbabilityRepairClosure { get; set; }
+
+ ///
+ /// Gets or sets the stochast configuration for the flow velocity structure closable of the structure.
+ ///
+ public MeanVariationCoefficientStochastConfiguration FlowVelocityStructureClosable { get; set; }
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -ra6bfe739a97fac2ea5228a4c46f961a55351e9cb -r05772f7de5cf48deadb93cab09b6476af1a6e4c6
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresConfigurationSchemaIdentifiers.cs (.../StabilityPointStructuresConfigurationSchemaIdentifiers.cs) (revision a6bfe739a97fac2ea5228a4c46f961a55351e9cb)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresConfigurationSchemaIdentifiers.cs (.../StabilityPointStructuresConfigurationSchemaIdentifiers.cs) (revision 05772f7de5cf48deadb93cab09b6476af1a6e4c6)
@@ -44,7 +44,7 @@
///
/// The identifier for the constructive strength quadratic load model stochast name.
///
- public const string ConstructiveStrengthQuadraticLoadModelName = "kwadratischebelastingschematiseringsterkte";
+ public const string ConstructiveStrengthQuadraticLoadModelStochastName = "kwadratischebelastingschematiseringsterkte";
///
/// The identifier for evaluation level elements.
@@ -55,5 +55,15 @@
/// The identifier for the failure collision energy stochast name.
///
public const string FailureCollisionEnergyStochastName = "aanvaarenergie";
+
+ ///
+ /// The identifier for the failure probability of repairing a closure elements.
+ ///
+ public const string FailureProbabilityRepairClosureElement = "faalkansherstel";
+
+ ///
+ /// The identifier for the flow velocity structure closable stochast name.
+ ///
+ public const string FlowVelocityStructureClosableStochastName = "kritiekestroomsnelheid";
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresCalculationConfigurationTest.cs
===================================================================
diff -u -ra6bfe739a97fac2ea5228a4c46f961a55351e9cb -r05772f7de5cf48deadb93cab09b6476af1a6e4c6
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresCalculationConfigurationTest.cs (.../StabilityPointStructuresCalculationConfigurationTest.cs) (revision a6bfe739a97fac2ea5228a4c46f961a55351e9cb)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresCalculationConfigurationTest.cs (.../StabilityPointStructuresCalculationConfigurationTest.cs) (revision 05772f7de5cf48deadb93cab09b6476af1a6e4c6)
@@ -57,6 +57,8 @@
Assert.IsNull(configuration.ConstructiveStrengthQuadraticLoadModel);
Assert.IsNull(configuration.EvaluationLevel);
Assert.IsNull(configuration.FailureCollisionEnergy);
+ Assert.IsNull(configuration.FailureProbabilityRepairClosure);
+ Assert.IsNull(configuration.FlowVelocityStructureClosable);
}
[Test]
@@ -71,6 +73,8 @@
var constructiveStrengthQuadraticLoadModel = new MeanVariationCoefficientStochastConfiguration();
double evaluationLevel = random.NextDouble();
var failureCollisionEnergy = new MeanVariationCoefficientStochastConfiguration();
+ double failureProbabilityRepairClosure = random.NextDouble();
+ var flowVelocityStructureClosable = new MeanVariationCoefficientStochastConfiguration();
// Call
configuration.AreaFlowApertures = areaFlowApertures;
@@ -79,6 +83,8 @@
configuration.ConstructiveStrengthQuadraticLoadModel = constructiveStrengthQuadraticLoadModel;
configuration.EvaluationLevel = evaluationLevel;
configuration.FailureCollisionEnergy = failureCollisionEnergy;
+ configuration.FailureProbabilityRepairClosure = failureProbabilityRepairClosure;
+ configuration.FlowVelocityStructureClosable = flowVelocityStructureClosable;
// Assert
Assert.AreSame(areaFlowApertures, configuration.AreaFlowApertures);
@@ -87,6 +93,8 @@
Assert.AreSame(constructiveStrengthQuadraticLoadModel, configuration.ConstructiveStrengthQuadraticLoadModel);
Assert.AreEqual(evaluationLevel, configuration.EvaluationLevel);
Assert.AreSame(failureCollisionEnergy, configuration.FailureCollisionEnergy);
+ Assert.AreEqual(failureProbabilityRepairClosure, configuration.FailureProbabilityRepairClosure);
+ Assert.AreEqual(flowVelocityStructureClosable, configuration.FlowVelocityStructureClosable);
}
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresConfigurationSchemaIdentifiersTest.cs
===================================================================
diff -u -ra6bfe739a97fac2ea5228a4c46f961a55351e9cb -r05772f7de5cf48deadb93cab09b6476af1a6e4c6
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresConfigurationSchemaIdentifiersTest.cs (.../StabilityPointStructuresConfigurationSchemaIdentifiersTest.cs) (revision a6bfe739a97fac2ea5228a4c46f961a55351e9cb)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/StabilityPointStructuresConfigurationSchemaIdentifiersTest.cs (.../StabilityPointStructuresConfigurationSchemaIdentifiersTest.cs) (revision 05772f7de5cf48deadb93cab09b6476af1a6e4c6)
@@ -33,9 +33,11 @@
Assert.AreEqual("doorstroomoppervlak", StabilityPointStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName);
Assert.AreEqual("bermbreedte", StabilityPointStructuresConfigurationSchemaIdentifiers.BankWidthStochastName);
Assert.AreEqual("lineairebelastingschematiseringsterkte", StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthLinearLoadModelStochastName);
- Assert.AreEqual("kwadratischebelastingschematiseringsterkte", StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthQuadraticLoadModelName);
+ Assert.AreEqual("kwadratischebelastingschematiseringsterkte", StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthQuadraticLoadModelStochastName);
Assert.AreEqual("analysehoogte", StabilityPointStructuresConfigurationSchemaIdentifiers.EvaluationLevelElement);
Assert.AreEqual("aanvaarenergie", StabilityPointStructuresConfigurationSchemaIdentifiers.FailureCollisionEnergyStochastName);
+ Assert.AreEqual("faalkansherstel", StabilityPointStructuresConfigurationSchemaIdentifiers.FailureProbabilityRepairClosureElement);
+ Assert.AreEqual("kritiekestroomsnelheid", StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName);
}
}
}
\ No newline at end of file