Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rb09f4737de300a8cdedc66f9d6ade8bffbd4f619 -r28ae527a0c6ba649083457a4f96f7fc26867e628
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision b09f4737de300a8cdedc66f9d6ade8bffbd4f619)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
@@ -36,8 +36,8 @@
namespace Ringtoets.ClosingStructures.IO.Configurations
{
///
- /// Class for importing a configuration of from an XML file and storing
- /// it on a .
+ /// Class for importing a configuration of
+ /// from an XML file and storing it on a .
///
public class ClosingStructuresCalculationConfigurationImporter
: CalculationConfigurationImporter
@@ -95,27 +95,29 @@
Name = readCalculation.Name
};
- if (TryReadStructure(readCalculation.StructureName, calculation)
- && TryReadHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
- && TryReadForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
- && TryReadStochasts(readCalculation, calculation)
- && TryReadOrientation(readCalculation, calculation)
- && TryReadFailureProbabilityStructureWithErosion(readCalculation, calculation)
- && TryReadFailureProbabilityOpenStructure(readCalculation, calculation)
- && TryReadFailureProbabilityReparation(readCalculation, calculation)
- && TryReadProbabilityOrFrequencyOpenStructureBeforeFlooding(readCalculation, calculation)
- && TryReadInflowModelType(readCalculation, calculation)
- && TryReadIdenticalApertures(readCalculation, calculation)
- && readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile, calculation.Name, Log))
+ if (TrySetStructure(readCalculation.StructureName, calculation)
+ && TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
+ && TrySetForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
+ && TrySetStochasts(readCalculation, calculation)
+ && TrySetOrientation(readCalculation, calculation)
+ && TrySetFailureProbabilityStructureWithErosion(readCalculation, calculation)
+ && TrySetFailureProbabilityOpenStructure(readCalculation, calculation)
+ && TrySetFailureProbabilityReparation(readCalculation, calculation)
+ && TrySetProbabilityOrFrequencyOpenStructureBeforeFlooding(readCalculation, calculation)
+ && TrySetInflowModelType(readCalculation, calculation)
+ && TrySetIdenticalApertures(readCalculation, calculation)
+ && readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile,
+ calculation.Name, Log))
{
- ReadFactorStormDurationOpenStructure(readCalculation, calculation);
- ReadWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
+ SetFactorStormDurationOpenStructure(readCalculation, calculation);
+ SetWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
return calculation;
}
return null;
}
- private bool TryReadStochasts(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetStochasts(ClosingStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (!readCalculation.ValidateStructureBaseStochasts(Log))
{
@@ -126,75 +128,77 @@
return false;
}
+ string calculationName = calculation.Name;
+ ClosingStructuresInput input = calculation.InputParameters;
return TryReadStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.LevelCrestStructureNotClosingStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.LevelCrestStructureNotClosing,
i => i.LevelCrestStructureNotClosing, (i, d) => i.LevelCrestStructureNotClosing = d)
&& TryReadStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.AreaFlowApertures,
i => i.AreaFlowApertures, (i, d) => i.AreaFlowApertures = d)
&& TryReadStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.DrainCoefficient,
i => i.DrainCoefficient, (i, d) => i.DrainCoefficient = d)
&& TryReadStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.InsideWaterLevelStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.InsideWaterLevel,
i => i.InsideWaterLevel, (i, d) => i.InsideWaterLevel = d)
&& TryReadStandardDeviationStochast(
ClosingStructuresConfigurationSchemaIdentifiers.ThresholdHeightOpenWeirStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ThresholdHeightOpenWeir,
i => i.ThresholdHeightOpenWeir, (i, d) => i.ThresholdHeightOpenWeir = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.AllowedLevelIncreaseStorage,
i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.FlowWidthAtBottomProtection,
i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ModelFactorSuperCriticalFlow,
i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.CriticalOvertoppingDischarge,
i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StorageStructureArea,
i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StormDurationStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StormDuration,
i => i.StormDuration, (i, d) => i.StormDuration = d);
}
@@ -204,29 +208,31 @@
if (configuration.DrainCoefficient?.StandardDeviation != null
|| configuration.DrainCoefficient?.VariationCoefficient != null)
{
- Log.LogCalculationConversionError(RingtoetsCommonIOResources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient,
- configuration.Name);
+ Log.LogCalculationConversionError(
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_ValidateStochasts_Cannot_define_spread_for_DrainCoefficient,
+ configuration.Name);
return false;
}
return true;
}
///
- /// Reads the orientation.
+ /// Sets the orientation.
///
/// The calculation read from the imported file.
/// The calculation to configure.
/// false when the orientation is invalid or when there is an orientation but
/// no structure defined, true otherwise.
- private bool TryReadOrientation(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetOrientation(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
{
if (readCalculation.StructureNormalOrientation.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
+ calculation.Name);
return false;
}
@@ -239,11 +245,12 @@
}
catch (ArgumentOutOfRangeException e)
{
- Log.LogOutOfRangeException(string.Format(RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
- orientation,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
- calculation.Name,
- e);
+ Log.LogOutOfRangeException(
+ string.Format(RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+ orientation,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
+ calculation.Name,
+ e);
return false;
}
@@ -253,13 +260,14 @@
}
///
- /// Reads the failure probability structure with erosion.
+ /// Sets the failure probability structure with erosion.
///
/// The calculation read from the imported file.
/// The calculation to configure.
/// false when the orientation is invalid or when there is a failure probability
/// structure with erosion but no structure defined, true otherwise.
- private bool TryReadFailureProbabilityStructureWithErosion(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetFailureProbabilityStructureWithErosion(StructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.FailureProbabilityStructureWithErosion.HasValue)
{
@@ -271,12 +279,13 @@
}
catch (ArgumentOutOfRangeException e)
{
- Log.LogOutOfRangeException(string.Format(
- RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
- failureProbability,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName),
- calculation.Name,
- e);
+ Log.LogOutOfRangeException(
+ string.Format(
+ RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+ failureProbability,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName),
+ calculation.Name,
+ e);
return false;
}
@@ -286,11 +295,12 @@
}
///
- /// Reads the factor storm duration.
+ /// Sets the factor storm duration.
///
/// The calculation read from the imported file.
/// The calculation to configure.
- private void ReadFactorStormDurationOpenStructure(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private void SetFactorStormDurationOpenStructure(ClosingStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.FactorStormDurationOpenStructure.HasValue)
{
@@ -299,21 +309,23 @@
}
///
- /// Reads the failure probability open structure.
+ /// Sets the failure probability open structure.
///
/// The calculation read from the imported file.
/// The calculation to configure.
- /// false when the failure probability open structure is invalid or when there is a failure probability
- /// open structure but no structure defined, true otherwise.
- private bool TryReadFailureProbabilityOpenStructure(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ /// false when the failure probability open structure is invalid or when
+ /// there is a failure probability open structure but no structure defined, true otherwise.
+ private bool TrySetFailureProbabilityOpenStructure(ClosingStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.FailureProbabilityOpenStructure.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName),
+ calculation.Name);
return false;
}
@@ -326,12 +338,13 @@
}
catch (ArgumentOutOfRangeException e)
{
- Log.LogOutOfRangeException(string.Format(
- RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
- failureProbability,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName),
- calculation.Name,
- e);
+ Log.LogOutOfRangeException(
+ string.Format(
+ RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+ failureProbability,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityOpenStructure_DisplayName),
+ calculation.Name,
+ e);
return false;
}
@@ -341,21 +354,23 @@
}
///
- /// Reads the failure probability reparation.
+ /// Sets the failure probability reparation.
///
/// The calculation read from the imported file.
/// The calculation to configure.
- /// false when the failure probability reparation is invalid or when there is a failure probability
- /// reparation but no structure defined, true otherwise.
- private bool TryReadFailureProbabilityReparation(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ /// false when the failure probability reparation is invalid or when there
+ /// is a failure probability reparation but no structure defined, true otherwise.
+ private bool TrySetFailureProbabilityReparation(ClosingStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.FailureProbabilityReparation.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName),
+ calculation.Name);
return false;
}
@@ -368,12 +383,13 @@
}
catch (ArgumentOutOfRangeException e)
{
- Log.LogOutOfRangeException(string.Format(
- RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
- failureProbability,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName),
- calculation.Name,
- e);
+ Log.LogOutOfRangeException(
+ string.Format(
+ RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+ failureProbability,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityReparation_DisplayName),
+ calculation.Name,
+ e);
return false;
}
@@ -383,21 +399,24 @@
}
///
- /// Reads the probability or frequency open structure before flooding.
+ /// Sets the probability or frequency open structure before flooding.
///
/// The calculation read from the imported file.
/// The calculation to configure.
- /// false when the probability or frequency open structure before flooding is invalid or when there is a
- /// probability or frequency open structure before flooding but no structure defined, true otherwise.
- private bool TryReadProbabilityOrFrequencyOpenStructureBeforeFlooding(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ /// false when the probability or frequency open structure before flooding
+ /// is invalid or when there is a probability or frequency open structure before flooding
+ /// but no structure defined, true otherwise.
+ private bool TrySetProbabilityOrFrequencyOpenStructureBeforeFlooding(ClosingStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.ProbabilityOrFrequencyOpenStructureBeforeFlooding.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName),
+ calculation.Name);
return false;
}
@@ -410,12 +429,13 @@
}
catch (ArgumentOutOfRangeException e)
{
- Log.LogOutOfRangeException(string.Format(
- RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
- failureProbability,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName),
- calculation.Name,
- e);
+ Log.LogOutOfRangeException(
+ string.Format(
+ RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+ failureProbability,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_ProbabilityOrFrequencyOpenStructureBeforeFlooding_DisplayName),
+ calculation.Name,
+ e);
return false;
}
@@ -425,21 +445,23 @@
}
///
- /// Reads the inflow model type.
+ /// Sets the inflow model type.
///
/// The calculation read from the imported file.
/// The calculation to configure.
/// false when the inflow model type is invalid or when there is a
/// inflow model type but no structure defined, true otherwise.
- private bool TryReadInflowModelType(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetInflowModelType(ClosingStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.InflowModelType.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_InflowModelType_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_InflowModelType_DisplayName),
+ calculation.Name);
return false;
}
@@ -453,21 +475,23 @@
}
///
- /// Reads the number of identical apertures.
+ /// Sets the number of identical apertures.
///
/// The calculation read from the imported file.
/// The calculation to configure.
/// false when the number of identical apertures is invalid or when there is a
/// number of identical apertures but no structure defined, true otherwise.
- private bool TryReadIdenticalApertures(ClosingStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetIdenticalApertures(ClosingStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.IdenticalApertures.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_IdenticalApertures_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_IdenticalApertures_DisplayName),
+ calculation.Name);
return false;
}
@@ -478,7 +502,7 @@
return true;
}
- private bool TryReadHydraulicBoundaryLocation(string locationName, StructuresCalculation calculation)
+ private bool TrySetHydraulicBoundaryLocation(string locationName, StructuresCalculation calculation)
{
HydraulicBoundaryLocation location;
@@ -491,7 +515,7 @@
return false;
}
- private bool TryReadStructure(string structureName, StructuresCalculation calculation)
+ private bool TrySetStructure(string structureName, StructuresCalculation calculation)
{
ClosingStructure structure;
@@ -504,7 +528,7 @@
return false;
}
- private bool TryReadForeshoreProfile(string foreshoreProfileName, StructuresCalculation calculation)
+ private bool TrySetForeshoreProfile(string foreshoreProfileName, StructuresCalculation calculation)
{
ForeshoreProfile foreshoreProfile;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs
===================================================================
diff -u -r69252f8c0e925637e9978bcf127dc32193efc6b3 -r28ae527a0c6ba649083457a4f96f7fc26867e628
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision 69252f8c0e925637e9978bcf127dc32193efc6b3)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
@@ -276,7 +276,7 @@
/// Type of the input for which values are assigned from the configuration.
/// The wave reduction configuration containing values for the parameters.
/// The input to assign the values to.
- protected static void ReadWaveReductionParameters(WaveReductionConfiguration waveReduction, T input)
+ protected static void SetWaveReductionParameters(WaveReductionConfiguration waveReduction, T input)
where T : IUseBreakWater, IUseForeshore
{
if (waveReduction != null)
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -rfe7c27dc926b4087fd6ed9551655d0571c8018c9 -r28ae527a0c6ba649083457a4f96f7fc26867e628
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision fe7c27dc926b4087fd6ed9551655d0571c8018c9)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
@@ -882,7 +882,7 @@
public void PublicReadWaveReductionParameters(WaveReductionConfiguration waveReduction, T input)
where T : IUseBreakWater, IUseForeshore
{
- ReadWaveReductionParameters(waveReduction, input);
+ SetWaveReductionParameters(waveReduction, input);
}
public bool PublicTryReadHydraulicBoundaryLocation(string locationName, string calculationName, IEnumerable hydraulicBoundaryLocations, out HydraulicBoundaryLocation location)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rfe7c27dc926b4087fd6ed9551655d0571c8018c9 -r28ae527a0c6ba649083457a4f96f7fc26867e628
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision fe7c27dc926b4087fd6ed9551655d0571c8018c9)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
@@ -35,8 +35,8 @@
namespace Ringtoets.HeightStructures.IO.Configurations
{
///
- /// Class for importing a configuration of from an XML file and storing
- /// it on a .
+ /// Class for importing a configuration of
+ /// from an XML file and storing it on a .
///
public class HeightStructuresCalculationConfigurationImporter
: CalculationConfigurationImporter
@@ -94,92 +94,97 @@
Name = readCalculation.Name
};
- if (TryReadStructure(readCalculation.StructureName, calculation)
- && TryReadHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
- && TryReadForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
- && TryReadStochasts(readCalculation, calculation)
- && TryReadOrientation(readCalculation, calculation)
- && TryReadFailureProbabilityStructureWithErosion(readCalculation, calculation)
- && readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile, calculation.Name, Log))
+ if (TrySetStructure(readCalculation.StructureName, calculation)
+ && TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
+ && TrySetForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
+ && TrySetStochasts(readCalculation, calculation)
+ && TrySetOrientation(readCalculation, calculation)
+ && TrySetFailureProbabilityStructureWithErosion(readCalculation, calculation)
+ && readCalculation.WaveReduction.ValidateWaveReduction(calculation.InputParameters.ForeshoreProfile,
+ calculation.Name, Log))
{
- ReadWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
+ SetWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
return calculation;
}
return null;
}
- private bool TryReadStochasts(HeightStructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetStochasts(HeightStructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (!readCalculation.ValidateStructureBaseStochasts(Log))
{
return false;
}
+ string calculationName = calculation.Name;
+ HeightStructuresInput input = calculation.InputParameters;
return TryReadStandardDeviationStochast(
HeightStructuresConfigurationSchemaIdentifiers.LevelCrestStructureStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.LevelCrestStructure,
i => i.LevelCrestStructure, (i, d) => i.LevelCrestStructure = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.AllowedLevelIncreaseStorageStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.AllowedLevelIncreaseStorage,
i => i.AllowedLevelIncreaseStorage, (i, d) => i.AllowedLevelIncreaseStorage = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.FlowWidthAtBottomProtection,
i => i.FlowWidthAtBottomProtection, (i, d) => i.FlowWidthAtBottomProtection = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.ModelFactorSuperCriticalFlowStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.ModelFactorSuperCriticalFlow,
i => i.ModelFactorSuperCriticalFlow, (i, d) => i.ModelFactorSuperCriticalFlow = d)
&& TryReadStandardDeviationStochast(
ConfigurationSchemaIdentifiers.WidthFlowAperturesStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.WidthFlowApertures, i => i.WidthFlowApertures, (i, d) => i.WidthFlowApertures = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.CriticalOvertoppingDischargeStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.CriticalOvertoppingDischarge,
i => i.CriticalOvertoppingDischarge, (i, d) => i.CriticalOvertoppingDischarge = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StorageStructureArea,
i => i.StorageStructureArea, (i, d) => i.StorageStructureArea = d)
&& TryReadVariationCoefficientStochast(
ConfigurationSchemaIdentifiers.StormDurationStochastName,
- calculation.Name,
- calculation.InputParameters,
+ calculationName,
+ input,
readCalculation.StormDuration,
i => i.StormDuration, (i, d) => i.StormDuration = d);
}
///
- /// Reads the orientation.
+ /// Sets the orientation.
///
/// The calculation read from the imported file.
/// The calculation to configure.
/// false when the orientation is invalid or when there is an orientation but
/// no structure defined, true otherwise.
- private bool TryReadOrientation(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetOrientation(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
{
if (readCalculation.StructureNormalOrientation.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
+ calculation.Name);
return false;
}
@@ -192,11 +197,12 @@
}
catch (ArgumentOutOfRangeException e)
{
- Log.LogOutOfRangeException(string.Format(RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
- orientation,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
- calculation.Name,
- e);
+ Log.LogOutOfRangeException(
+ string.Format(RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+ orientation,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_Orientation_DisplayName),
+ calculation.Name,
+ e);
return false;
}
@@ -206,21 +212,23 @@
}
///
- /// Reads the failure probability structure with erosion.
+ /// Sets the failure probability structure with erosion.
///
/// The calculation read from the imported file.
/// The calculation to configure.
/// false when the failure probability structure with erosion is invalid or when there is
/// a failure probability structure with erosion but no structure defined, true otherwise.
- private bool TryReadFailureProbabilityStructureWithErosion(StructuresCalculationConfiguration readCalculation, StructuresCalculation calculation)
+ private bool TrySetFailureProbabilityStructureWithErosion(StructuresCalculationConfiguration readCalculation,
+ StructuresCalculation calculation)
{
if (readCalculation.FailureProbabilityStructureWithErosion.HasValue)
{
if (calculation.InputParameters.Structure == null)
{
- Log.LogCalculationConversionError(string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName),
- calculation.Name);
+ Log.LogCalculationConversionError(
+ string.Format(RingtoetsCommonIOResources.CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName),
+ calculation.Name);
return false;
}
@@ -233,12 +241,13 @@
}
catch (ArgumentOutOfRangeException e)
{
- Log.LogOutOfRangeException(string.Format(
- RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
- failureProbability,
- RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName),
- calculation.Name,
- e);
+ Log.LogOutOfRangeException(
+ string.Format(
+ RingtoetsCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
+ failureProbability,
+ RingtoetsCommonIOResources.CalculationConfigurationImporter_FailureProbabilityStructureWithErosion_DisplayName),
+ calculation.Name,
+ e);
return false;
}
@@ -247,7 +256,7 @@
return true;
}
- private bool TryReadHydraulicBoundaryLocation(string locationName, StructuresCalculation calculation)
+ private bool TrySetHydraulicBoundaryLocation(string locationName, StructuresCalculation calculation)
{
HydraulicBoundaryLocation location;
@@ -260,7 +269,7 @@
return false;
}
- private bool TryReadStructure(string structureName, StructuresCalculation calculation)
+ private bool TrySetStructure(string structureName, StructuresCalculation calculation)
{
HeightStructure structure;
@@ -273,7 +282,7 @@
return false;
}
- private bool TryReadForeshoreProfile(string foreshoreProfileName, StructuresCalculation calculation)
+ private bool TrySetForeshoreProfile(string foreshoreProfileName, StructuresCalculation calculation)
{
ForeshoreProfile foreshoreProfile;
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rd6fd6d35d668c6d15e3e45480150b8d02f4288ab -r28ae527a0c6ba649083457a4f96f7fc26867e628
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision d6fd6d35d668c6d15e3e45480150b8d02f4288ab)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 28ae527a0c6ba649083457a4f96f7fc26867e628)
@@ -116,7 +116,7 @@
{
SetFactorStormDurationOpenStructure(readCalculation, calculation);
SetVolumicWeightWater(readCalculation, calculation);
- ReadWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
+ SetWaveReductionParameters(readCalculation.WaveReduction, calculation.InputParameters);
return calculation;
}
return null;