Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r28ae527a0c6ba649083457a4f96f7fc26867e628 -r85ae13f77971a2e41dead771061de46624f8994c
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 85ae13f77971a2e41dead771061de46624f8994c)
@@ -130,72 +130,72 @@
string calculationName = calculation.Name;
ClosingStructuresInput input = calculation.InputParameters;
- return TryReadStandardDeviationStochast(
+ return TrySetStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.LevelCrestStructureNotClosingStochastName,
calculationName,
input,
readCalculation.LevelCrestStructureNotClosing,
i => i.LevelCrestStructureNotClosing, (i, d) => i.LevelCrestStructureNotClosing = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName,
calculationName,
input,
readCalculation.AreaFlowApertures,
i => i.AreaFlowApertures, (i, d) => i.AreaFlowApertures = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
calculationName,
input,
readCalculation.DrainCoefficient,
i => i.DrainCoefficient, (i, d) => i.DrainCoefficient = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.InsideWaterLevelStochastName,
calculationName,
input,
readCalculation.InsideWaterLevel,
i => i.InsideWaterLevel, (i, d) => i.InsideWaterLevel = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.ThresholdHeightOpenWeirStochastName,
calculationName,
input,
readCalculation.ThresholdHeightOpenWeir,
i => i.ThresholdHeightOpenWeir, (i, d) => i.ThresholdHeightOpenWeir = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
calculationName,
input,
readCalculation.AllowedLevelIncreaseStorage,
i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
calculationName,
input,
readCalculation.FlowWidthAtBottomProtection,
i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
calculationName,
input,
readCalculation.ModelFactorSuperCriticalFlow,
i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName,
calculationName,
input,
readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
calculationName,
input,
readCalculation.CriticalOvertoppingDischarge,
i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName,
calculationName,
input,
readCalculation.StorageStructureArea,
i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StormDurationStochastName,
calculationName,
input,
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs
===================================================================
diff -u -r28ae527a0c6ba649083457a4f96f7fc26867e628 -r85ae13f77971a2e41dead771061de46624f8994c
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision 85ae13f77971a2e41dead771061de46624f8994c)
@@ -304,7 +304,7 @@
}
///
- /// Reads the stochast parameters.
+ /// Sets the stochast parameters.
///
/// The type of the distribution to read.
/// The type of the calculation input.
@@ -316,7 +316,7 @@
/// The function to set the stochast with the read parameters.
/// true if reading all required stochast parameters was successful,
/// false otherwise.
- protected bool TryReadStandardDeviationStochast(
+ protected bool TrySetStandardDeviationStochast(
string stochastName,
string calculationName,
TCalculationInput input,
@@ -353,7 +353,7 @@
}
///
- /// Reads the stochast parameters.
+ /// Sets the stochast parameters.
///
/// The type of the distribution to read.
/// The type of the calculation input.
@@ -365,7 +365,7 @@
/// The function to set the stochast with the read parameters.
/// true if reading all required stochast parameters was successful,
/// false otherwise.
- protected bool TryReadVariationCoefficientStochast(
+ protected bool TrySetVariationCoefficientStochast(
string stochastName,
string calculationName,
TCalculationInput input,
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -r28ae527a0c6ba649083457a4f96f7fc26867e628 -r85ae13f77971a2e41dead771061de46624f8994c
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 85ae13f77971a2e41dead771061de46624f8994c)
@@ -713,7 +713,7 @@
[TestCase(false, true)]
[TestCase(true, true)]
[TestCase(false, false)]
- public void TryReadStandardDeviationStochast_ValidStochastConfiguration_ReturnsTrueParametersSet(bool setMean, bool setStandardDeviation)
+ public void TrySetStandardDeviationStochast_ValidStochastConfiguration_ReturnsTrueParametersSet(bool setMean, bool setStandardDeviation)
{
// Setup
string filePath = Path.Combine(readerPath, "validConfiguration.xml");
@@ -737,7 +737,7 @@
var input = new TestInputWithStochasts();
// Call
- bool valid = importer.PublicTryReadStandardDeviationStochast(
+ bool valid = importer.PublicTrySetStandardDeviationStochast(
"some stochast name",
"some calculation name",
input,
@@ -758,7 +758,7 @@
}
[Test]
- public void TryReadStandardDeviationStochast_StochastConfigurationWithStandardDeviation_LogsErrorReturnsFalse()
+ public void TrySetStandardDeviationStochast_StochastConfigurationWithStandardDeviation_LogsErrorReturnsFalse()
{
// Setup
string filePath = Path.Combine(readerPath, "validConfiguration.xml");
@@ -777,7 +777,7 @@
const string calculationName = "some calculation name";
// Call
- Action validate = () => valid = importer.PublicTryReadStandardDeviationStochast(
+ Action validate = () => valid = importer.PublicTrySetStandardDeviationStochast(
stochastName,
calculationName,
input, configuration,
@@ -796,7 +796,7 @@
[TestCase(false, true)]
[TestCase(true, true)]
[TestCase(false, false)]
- public void TryReadVariationCoefficientStochast_ValidStochastConfiguration_ReturnsTrueParametersSet(bool setMean, bool setVariationCoefficient)
+ public void TrySetVariationCoefficientStochast_ValidStochastConfiguration_ReturnsTrueParametersSet(bool setMean, bool setVariationCoefficient)
{
// Setup
string filePath = Path.Combine(readerPath, "validConfiguration.xml");
@@ -820,7 +820,7 @@
var input = new TestInputWithStochasts();
// Call
- bool valid = importer.PublicTryReadVariationCoefficientStochast(
+ bool valid = importer.PublicTrySetVariationCoefficientStochast(
"some stochast name",
"some calculation name",
input, configuration,
@@ -841,7 +841,7 @@
}
[Test]
- public void TryReadVariationCoefficientStochast_StochastConfigurationWithStandardDeviation_LogsErrorReturnsFalse()
+ public void TrySetVariationCoefficientStochast_StochastConfigurationWithStandardDeviation_LogsErrorReturnsFalse()
{
// Setup
string filePath = Path.Combine(readerPath, "validConfiguration.xml");
@@ -860,7 +860,7 @@
const string calculationName = "some calculation name";
// Call
- Action validate = () => valid = importer.PublicTryReadVariationCoefficientStochast(
+ Action validate = () => valid = importer.PublicTrySetVariationCoefficientStochast(
stochastName,
calculationName,
input, configuration,
@@ -900,7 +900,7 @@
return TryReadStructure(locationName, calculationName, structures, out location);
}
- public bool PublicTryReadStandardDeviationStochast(
+ public bool PublicTrySetStandardDeviationStochast(
string stochastName,
string calculationName,
TestInputWithStochasts input,
@@ -909,10 +909,10 @@
Action setStochast)
where TDistribution : IDistribution
{
- return TryReadStandardDeviationStochast(stochastName, calculationName, input, stochastConfiguration, getStochast, setStochast);
+ return TrySetStandardDeviationStochast(stochastName, calculationName, input, stochastConfiguration, getStochast, setStochast);
}
- public bool PublicTryReadVariationCoefficientStochast(
+ public bool PublicTrySetVariationCoefficientStochast(
string stochastName,
string calculationName,
TestInputWithStochasts input,
@@ -921,7 +921,7 @@
Action setStochast)
where TDistribution : IVariationCoefficientDistribution
{
- return TryReadVariationCoefficientStochast(stochastName, calculationName, input, stochastConfiguration, getStochast, setStochast);
+ return TrySetVariationCoefficientStochast(stochastName, calculationName, input, stochastConfiguration, getStochast, setStochast);
}
protected override CalculationConfigurationReader CreateCalculationConfigurationReader(string xmlFilePath)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r28ae527a0c6ba649083457a4f96f7fc26867e628 -r85ae13f77971a2e41dead771061de46624f8994c
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 85ae13f77971a2e41dead771061de46624f8994c)
@@ -119,48 +119,48 @@
string calculationName = calculation.Name;
HeightStructuresInput input = calculation.InputParameters;
- return TryReadStandardDeviationStochast(
+ return TrySetStandardDeviationStochast(
HeightStructuresConfigurationSchemaIdentifiers.LevelCrestStructureStochastName,
calculationName,
input,
readCalculation.LevelCrestStructure,
i => i.LevelCrestStructure, (i, d) => i.LevelCrestStructure = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
calculationName,
input,
readCalculation.AllowedLevelIncreaseStorage,
i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
calculationName,
input,
readCalculation.FlowWidthAtBottomProtection,
i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
calculationName,
input,
readCalculation.ModelFactorSuperCriticalFlow,
i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName,
calculationName,
input,
readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
calculationName,
input,
readCalculation.CriticalOvertoppingDischarge,
i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName,
calculationName,
input,
readCalculation.StorageStructureArea,
i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StormDurationStochastName,
calculationName,
input,
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r28ae527a0c6ba649083457a4f96f7fc26867e628 -r85ae13f77971a2e41dead771061de46624f8994c
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 85ae13f77971a2e41dead771061de46624f8994c)
@@ -163,132 +163,132 @@
string calculationName = calculation.Name;
StabilityPointStructuresInput input = calculation.InputParameters;
- return TryReadStandardDeviationStochast(
+ return TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
calculationName,
input,
readCalculation.AllowedLevelIncreaseStorage,
i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName,
calculationName,
input,
readCalculation.AreaFlowApertures,
i => i.AreaFlowApertures, (i, d) => i.AreaFlowApertures = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.BankWidthStochastName,
calculationName,
input,
readCalculation.BankWidth,
i => i.BankWidth, (i, d) => i.BankWidth = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
calculationName,
input,
readCalculation.CriticalOvertoppingDischarge,
i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
calculationName,
input,
readCalculation.DrainCoefficient,
i => i.DrainCoefficient, (i, d) => i.DrainCoefficient = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.FailureCollisionEnergyStochastName,
calculationName,
input,
readCalculation.FailureCollisionEnergy,
i => i.FailureCollisionEnergy, (i, d) => i.FailureCollisionEnergy = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName,
calculationName,
input,
readCalculation.FlowVelocityStructureClosable,
i => i.FlowVelocityStructureClosable, (i, d) => i.FlowVelocityStructureClosable = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
calculationName,
input,
readCalculation.FlowWidthAtBottomProtection,
i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.InsideWaterLevelStochastName,
calculationName,
input,
readCalculation.InsideWaterLevel,
i => i.InsideWaterLevel, (i, d) => i.InsideWaterLevel = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.InsideWaterLevelFailureConstructionStochastName,
calculationName,
input,
readCalculation.InsideWaterLevelFailureConstruction,
i => i.InsideWaterLevelFailureConstruction, (i, d) => i.InsideWaterLevelFailureConstruction = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
calculationName,
input,
readCalculation.ModelFactorSuperCriticalFlow,
i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.LevelCrestStructureStochastName,
calculationName,
input,
readCalculation.LevelCrestStructure,
i => i.LevelCrestStructure, (i, d) => i.LevelCrestStructure = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthLinearLoadModelStochastName,
calculationName,
input,
readCalculation.ConstructiveStrengthLinearLoadModel,
i => i.ConstructiveStrengthLinearLoadModel, (i, d) => i.ConstructiveStrengthLinearLoadModel = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ConstructiveStrengthQuadraticLoadModelStochastName,
calculationName,
input,
readCalculation.ConstructiveStrengthQuadraticLoadModel,
i => i.ConstructiveStrengthQuadraticLoadModel, (i, d) => i.ConstructiveStrengthQuadraticLoadModel = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ShipMassStochastName,
calculationName,
input,
readCalculation.ShipMass,
i => i.ShipMass, (i, d) => i.ShipMass = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ShipVelocityStochastName,
calculationName,
input,
readCalculation.ShipVelocity,
i => i.ShipVelocity, (i, d) => i.ShipVelocity = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.StabilityLinearLoadModelStochastName,
calculationName,
input,
readCalculation.StabilityLinearLoadModel,
i => i.StabilityLinearLoadModel, (i, d) => i.StabilityLinearLoadModel = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.StabilityQuadraticLoadModelStochastName,
calculationName,
input,
readCalculation.StabilityQuadraticLoadModel,
i => i.StabilityQuadraticLoadModel, (i, d) => i.StabilityQuadraticLoadModel = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName,
calculationName,
input,
readCalculation.StorageStructureArea,
i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d)
- && TryReadVariationCoefficientStochast(
+ && TrySetVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StormDurationStochastName,
calculationName,
input,
readCalculation.StormDuration,
i => i.StormDuration, (i, d) => i.StormDuration = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName,
calculationName,
input,
readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
- && TryReadStandardDeviationStochast(
+ && TrySetStandardDeviationStochast(
StabilityPointStructuresConfigurationSchemaIdentifiers.ThresholdHeightOpenWeirStochastName,
calculationName,
input,