Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs =================================================================== diff -u -r6d2a451c86300fe64ea80a345ab6d37549007ea0 -rd5c726012814b171018b95de1a37f80c9a692594 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs (.../MacroStabilityInwardsCalculationConfigurationReader.cs) (revision 6d2a451c86300fe64ea80a345ab6d37549007ea0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationReader.cs (.../MacroStabilityInwardsCalculationConfigurationReader.cs) (revision d5c726012814b171018b95de1a37f80c9a692594) @@ -33,8 +33,9 @@ namespace Ringtoets.MacroStabilityInwards.IO.Configurations { /// - /// This class reads a macro stability inwards calculation configuration from XML and creates a collection of corresponding - /// , typically containing one or more . + /// This class reads a macro stability inwards calculation configuration from XML and creates + /// a collection of corresponding , typically containing one + /// or more . /// public class MacroStabilityInwardsCalculationConfigurationReader : CalculationConfigurationReader @@ -81,191 +82,236 @@ var configuration = new MacroStabilityInwardsCalculationConfiguration( calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value) { - AssessmentLevel = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement), - HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement), - SurfaceLineName = calculationElement.GetStringValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SurfaceLineElement), - StochasticSoilModelName = calculationElement.GetStringValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilModelElement), - StochasticSoilProfileName = calculationElement.GetStringValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement), - DikeSoilScenario = (ConfigurationDikeSoilScenario?) calculationElement.GetConvertedValueFromDescendantStringElement( - MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DikeSoilScenarioElement), + AssessmentLevel = calculationElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement), + HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement( + ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement), + SurfaceLineName = calculationElement.GetStringValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SurfaceLineElement), + StochasticSoilModelName = calculationElement.GetStringValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilModelElement), + StochasticSoilProfileName = calculationElement.GetStringValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement), + DikeSoilScenario = (ConfigurationDikeSoilScenario?) + calculationElement.GetConvertedValueFromDescendantStringElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DikeSoilScenarioElement), - WaterLevelRiverAverage = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelRiverAverageElement), - DrainageConstructionPresent = calculationElement.GetBoolValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionPresentElement), - XCoordinateDrainageConstruction = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.XCoordinateDrainageConstructionElement), - ZCoordinateDrainageConstruction = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZCoordinateDrainageConstructionElement), + WaterLevelRiverAverage = calculationElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterLevelRiverAverageElement), + DrainageConstructionPresent = calculationElement.GetBoolValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionPresentElement), + XCoordinateDrainageConstruction = calculationElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.XCoordinateDrainageConstructionElement), + ZCoordinateDrainageConstruction = calculationElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZCoordinateDrainageConstructionElement), - AdjustPhreaticLine3And4ForUplift = calculationElement.GetBoolValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement), + AdjustPhreaticLine3And4ForUplift = calculationElement.GetBoolValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement), LocationInputDaily = calculationElement.GetMacroStabilityInwardsLocationInputConfiguration(), LocationInputExtreme = calculationElement.GetMacroStabilityInwardsLocationInputExtremeConfiguration(), - SlipPlaneMinimumDepth = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumDepthElement), - SlipPlaneMinimumLength = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumLengthElement), - MaximumSliceWidth = calculationElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MaximumSliceWidthElement), + SlipPlaneMinimumDepth = calculationElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumDepthElement), + SlipPlaneMinimumLength = calculationElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.SlipPlaneMinimumLengthElement), + MaximumSliceWidth = calculationElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MaximumSliceWidthElement), Scenario = calculationElement.GetScenarioConfiguration() }; - SetPhreaticLine1Properties(configuration, calculationElement); - SetPhreaticLine2Properties(configuration, calculationElement); - SetPhreaticLine3Properties(configuration, calculationElement); - SetPhreaticLine4Properties(configuration, calculationElement); + SetMinimumLevelPhreaticLineProperties(configuration, calculationElement); + SetPiezometricHeadPhreaticLine2Properties(configuration, calculationElement); + SetLeakageLengthPhreaticLine3Properties(configuration, calculationElement); + SetLeakageLengthPhreaticLine4Properties(configuration, calculationElement); SetZonesProperties(configuration, calculationElement); SetGridProperties(configuration, calculationElement); return configuration; } /// - /// Sets the phreatic line 1 related parameters to . + /// Sets the minimum level phreatic line related properties to . /// - /// The configuration to set to the phreatic line 1 properties, if any. + /// The configuration to set to the minimum level phreatic line properties. /// The that contains the phreatic line 1 element. - /// Thrown when the value for a parameter isn't in the correct format. - /// Thrown when the value for a parameter represents a number less + /// Thrown when the value for a property isn't in the correct format. + /// Thrown when the value for a property represents a number less /// than or greater than . /// Thrown when any conversion cannot be performed. - private static void SetPhreaticLine1Properties(MacroStabilityInwardsCalculationConfiguration configuration, XElement calculationElement) + private static void SetMinimumLevelPhreaticLineProperties(MacroStabilityInwardsCalculationConfiguration configuration, + XElement calculationElement) { - XElement descendantElement = calculationElement.GetDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine1MinimumLevelElement); + XElement descendantElement = calculationElement.GetDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine1MinimumLevelElement); if (descendantElement == null) { return; } - configuration.MinimumLevelPhreaticLineAtDikeTopPolder = descendantElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MinimumLevelPhreaticLineAtDikeTopPolderElement); - configuration.MinimumLevelPhreaticLineAtDikeTopRiver = descendantElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MinimumLevelPhreaticLineAtDikeTopRiverElement); + configuration.MinimumLevelPhreaticLineAtDikeTopPolder = descendantElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MinimumLevelPhreaticLineAtDikeTopPolderElement); + configuration.MinimumLevelPhreaticLineAtDikeTopRiver = descendantElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MinimumLevelPhreaticLineAtDikeTopRiverElement); } /// - /// Sets the phreatic line 2 related parameters to . + /// Sets the piezometric head phreatic line 2 related properties to . /// - /// The configuration to set to the phreatic line 2 properties, if any. + /// The configuration to set to the piezometric head phreatic line 2 properties. /// The that contains the phreatic line 2 element. - /// Thrown when the value for a parameter isn't in the correct format. - /// Thrown when the value for a parameter represents a number less + /// Thrown when the value for a property isn't in the correct format. + /// Thrown when the value for a property represents a number less /// than or greater than . /// Thrown when any conversion cannot be performed. - private static void SetPhreaticLine2Properties(MacroStabilityInwardsCalculationConfiguration configuration, XElement calculationElement) + private static void SetPiezometricHeadPhreaticLine2Properties(MacroStabilityInwardsCalculationConfiguration configuration, + XElement calculationElement) { - XElement descendantElement = calculationElement.GetDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine2PiezometricHeadElement); + XElement descendantElement = calculationElement.GetDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine2PiezometricHeadElement); if (descendantElement == null) { return; } - configuration.PiezometricHeadPhreaticLine2Inwards = descendantElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineInwardsElement); - configuration.PiezometricHeadPhreaticLine2Outwards = descendantElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); + configuration.PiezometricHeadPhreaticLine2Inwards = descendantElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineInwardsElement); + configuration.PiezometricHeadPhreaticLine2Outwards = descendantElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); } /// - /// Sets the phreatic line 3 related parameters to . + /// Sets the leakage length phreatic line 3 related properties to . /// - /// The configuration to set to the phreatic line 3 properties, if any. + /// The configuration to set to the leakage length phreatic line 3 properties. /// The that contains the phreatic line 3 element. - /// Thrown when the value for a parameter isn't in the correct format. - /// Thrown when the value for a parameter represents a number less + /// Thrown when the value for a property isn't in the correct format. + /// Thrown when the value for a property represents a number less /// than or greater than . /// Thrown when any conversion cannot be performed. - private static void SetPhreaticLine3Properties(MacroStabilityInwardsCalculationConfiguration configuration, XElement calculationElement) + private static void SetLeakageLengthPhreaticLine3Properties(MacroStabilityInwardsCalculationConfiguration configuration, + XElement calculationElement) { - XElement phreaticLine1Element = calculationElement.GetDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine3LeakageLengthElement); + XElement phreaticLine1Element = calculationElement.GetDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine3LeakageLengthElement); if (phreaticLine1Element == null) { return; } - configuration.LeakageLengthInwardsPhreaticLine3 = phreaticLine1Element.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineInwardsElement); - configuration.LeakageLengthOutwardsPhreaticLine3 = phreaticLine1Element.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); + configuration.LeakageLengthInwardsPhreaticLine3 = phreaticLine1Element.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineInwardsElement); + configuration.LeakageLengthOutwardsPhreaticLine3 = phreaticLine1Element.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); } /// - /// Sets the phreatic line 4 related parameters to . + /// Sets the leakage length phreatic line 4 related properties to . /// - /// The configuration to set to the phreatic line 4 properties, if any. + /// The configuration to set to the leakage length phreatic line 4 properties. /// The that contains the phreatic line 4 element. - /// Thrown when the value for a parameter isn't in the correct format. - /// Thrown when the value for a parameter represents a number less + /// Thrown when the value for a property isn't in the correct format. + /// Thrown when the value for a property represents a number less /// than or greater than . /// Thrown when any conversion cannot be performed. - private static void SetPhreaticLine4Properties(MacroStabilityInwardsCalculationConfiguration configuration, XElement calculationElement) + private static void SetLeakageLengthPhreaticLine4Properties(MacroStabilityInwardsCalculationConfiguration configuration, + XElement calculationElement) { - XElement phreaticLine1Element = calculationElement.GetDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine4LeakageLengthElement); + XElement phreaticLine1Element = calculationElement.GetDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine4LeakageLengthElement); if (phreaticLine1Element == null) { return; } - configuration.LeakageLengthInwardsPhreaticLine4 = phreaticLine1Element.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineInwardsElement); - configuration.LeakageLengthOutwardsPhreaticLine4 = phreaticLine1Element.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); + configuration.LeakageLengthInwardsPhreaticLine4 = phreaticLine1Element.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineInwardsElement); + configuration.LeakageLengthOutwardsPhreaticLine4 = phreaticLine1Element.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLineOutwardsElement); } /// - /// Sets the zone related parameters to . + /// Sets the zone related properties to . /// - /// The configuration to set to the zone properties, if any. + /// The configuration to set to the zone properties. /// The that contains the zone element. - /// Thrown when the value for a parameter isn't in the correct format. - private static void SetZonesProperties(MacroStabilityInwardsCalculationConfiguration configuration, XElement calculationElement) + /// Thrown when the value for a property isn't in the correct format. + private static void SetZonesProperties(MacroStabilityInwardsCalculationConfiguration configuration, + XElement calculationElement) { - XElement zonesElement = calculationElement.GetDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZonesElement); + XElement zonesElement = calculationElement.GetDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZonesElement); if (zonesElement == null) { return; } - configuration.CreateZones = zonesElement.GetBoolValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.CreateZonesElement); + configuration.CreateZones = zonesElement.GetBoolValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.CreateZonesElement); } /// - /// Sets the grid related parameters to . + /// Sets the grid related properties to . /// - /// The configuration to set to the grid properties, if any. + /// The configuration to set to the grid properties. /// The that contains the grid element. - /// Thrown when the value for a parameter isn't in the correct format. - /// Thrown when the value for a parameter represents a number less + /// Thrown when the value for a property isn't in the correct format. + /// Thrown when the value for a property represents a number less /// than or greater than . /// Thrown when any conversion cannot be performed. - private static void SetGridProperties(MacroStabilityInwardsCalculationConfiguration configuration, XElement calculationElement) + private static void SetGridProperties(MacroStabilityInwardsCalculationConfiguration configuration, + XElement calculationElement) { - XElement gridElement = calculationElement.GetDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridsElement); + XElement gridElement = calculationElement.GetDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridsElement); if (gridElement == null) { return; } - configuration.MoveGrid = gridElement.GetBoolValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MoveGridElement); - configuration.GridDeterminationType = (ConfigurationGridDeterminationType?) gridElement.GetConvertedValueFromDescendantStringElement( - MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeElement); + configuration.MoveGrid = gridElement.GetBoolValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MoveGridElement); + configuration.GridDeterminationType = (ConfigurationGridDeterminationType?) + gridElement.GetConvertedValueFromDescendantStringElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeElement); SetTangentLineProperties(configuration, gridElement); - configuration.LeftGrid = gridElement.GetMacroStabilityInwardsGridConfiguration(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LeftGridElement); - configuration.RightGrid = gridElement.GetMacroStabilityInwardsGridConfiguration(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.RightGridElement); + configuration.LeftGrid = gridElement.GetMacroStabilityInwardsGridConfiguration( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LeftGridElement); + configuration.RightGrid = gridElement.GetMacroStabilityInwardsGridConfiguration( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.RightGridElement); } /// - /// Sets the tangent line related parameters to . + /// Sets the tangent line related properties to . /// - /// The configuration to set to the tangent line properties, if any. + /// The configuration to set to the tangent line properties. /// The that contains the tangent line element. - /// Thrown when the value for a parameter isn't in the correct format. - /// Thrown when the value for a parameter represents a number less + /// Thrown when the value for a property isn't in the correct format. + /// Thrown when the value for a property represents a number less /// than or greater than . /// Thrown when any conversion cannot be performed. - private static void SetTangentLineProperties(MacroStabilityInwardsCalculationConfiguration configuration, XElement gridElement) + private static void SetTangentLineProperties(MacroStabilityInwardsCalculationConfiguration configuration, + XElement gridElement) { - XElement tangentLineElement = gridElement.GetDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineElement); + XElement tangentLineElement = gridElement.GetDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineElement); if (tangentLineElement == null) { return; } - configuration.TangentLineDeterminationType = (ConfigurationTangentLineDeterminationType?) tangentLineElement.GetConvertedValueFromDescendantStringElement( - MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineDeterminationTypeElement); - configuration.TangentLineZTop = tangentLineElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineZTopElement); - configuration.TangentLineZBottom = tangentLineElement.GetDoubleValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineZBottomElement); - configuration.TangentLineNumber = tangentLineElement.GetIntegerValueFromDescendantElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineNumberElement); + configuration.TangentLineDeterminationType = (ConfigurationTangentLineDeterminationType?) + tangentLineElement.GetConvertedValueFromDescendantStringElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineDeterminationTypeElement); + configuration.TangentLineZTop = tangentLineElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineZTopElement); + configuration.TangentLineZBottom = tangentLineElement.GetDoubleValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineZBottomElement); + configuration.TangentLineNumber = tangentLineElement.GetIntegerValueFromDescendantElement( + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineNumberElement); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs =================================================================== diff -u -r6d2a451c86300fe64ea80a345ab6d37549007ea0 -rd5c726012814b171018b95de1a37f80c9a692594 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision 6d2a451c86300fe64ea80a345ab6d37549007ea0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationWriter.cs (.../MacroStabilityInwardsCalculationConfigurationWriter.cs) (revision d5c726012814b171018b95de1a37f80c9a692594) @@ -30,7 +30,8 @@ /// /// Writer for writing a macro stability inwards calculation configuration to XML. /// - public class MacroStabilityInwardsCalculationConfigurationWriter : CalculationConfigurationWriter + public class MacroStabilityInwardsCalculationConfigurationWriter + : CalculationConfigurationWriter { /// /// Creates a new instance of . @@ -46,7 +47,8 @@ /// public MacroStabilityInwardsCalculationConfigurationWriter(string filePath) : base(filePath) {} - protected override void WriteCalculation(MacroStabilityInwardsCalculationConfiguration configuration, XmlWriter writer) + protected override void WriteCalculation(MacroStabilityInwardsCalculationConfiguration configuration, + XmlWriter writer) { writer.WriteStartElement(ConfigurationSchemaIdentifiers.CalculationElement); writer.WriteAttributeString(ConfigurationSchemaIdentifiers.NameAttribute, configuration.Name); @@ -62,7 +64,8 @@ /// The writer to use for writing. /// The calculation configuration to write. /// Thrown when the is closed. - private static void WriteCalculationElements(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteCalculationElements(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { WriteElementWhenContentAvailable(writer, MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement, @@ -81,9 +84,9 @@ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement, configuration.StochasticSoilProfileName); - WriteDikeSoilScenarioWhenAvailable(writer, - MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DikeSoilScenarioElement, - configuration.DikeSoilScenario); + WriteDikeSoilScenarioWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DikeSoilScenarioElement, + configuration.DikeSoilScenario); WriteWaterStresses(writer, configuration); @@ -105,13 +108,14 @@ } /// - /// Writes the zone related parameters. + /// Writes the zone related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WriteZones(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteZones(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.ZonesElement); @@ -123,7 +127,7 @@ } /// - /// Writes the in XML format to file. + /// Writes the in XML format to file when it has a value. /// /// The writer to use for writing. /// The XML element name. @@ -132,9 +136,9 @@ /// is closed. /// Thrown when the conversion of /// cannot be performed. - private static void WriteDikeSoilScenarioWhenAvailable(XmlWriter writer, - string elementName, - ConfigurationDikeSoilScenario? dikeSoilScenario) + private static void WriteDikeSoilScenarioWhenContentAvailable(XmlWriter writer, + string elementName, + ConfigurationDikeSoilScenario? dikeSoilScenario) { if (!dikeSoilScenario.HasValue) { @@ -149,13 +153,14 @@ #region Write water stresses /// - /// Writes the water stress related parameters. + /// Writes the water stress related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WriteWaterStresses(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteWaterStresses(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.WaterStressesElement); @@ -171,26 +176,26 @@ MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.AdjustPhreaticLine3And4ForUpliftElement, configuration.AdjustPhreaticLine3And4ForUplift); - WritePhreaticLine3Configuration(writer, configuration); - WritePhreaticLine4Configuration(writer, configuration); - WritePhreaticLine2Configuration(writer, configuration); + WriteLeakageLengthPhreaticLine3Configuration(writer, configuration); + WriteLeakageLengthPhreaticLine4Configuration(writer, configuration); + WritePiezometricHeadPhreaticLine2Configuration(writer, configuration); - WriteLocationDailyInputWhenContentAvailable(writer, configuration.LocationInputDaily); + WriteLocationDailyInputWhenAvailable(writer, configuration.LocationInputDaily); - WriteLocationExtremeInputWhenContentAvailable(writer, configuration.LocationInputExtreme); + WriteLocationExtremeInputWhenAvailable(writer, configuration.LocationInputExtreme); writer.WriteEndElement(); } /// - /// Writes a phreatic line 2 configuration. + /// Writes the piezometric head phreatic line 2 related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WritePhreaticLine2Configuration(XmlWriter writer, - MacroStabilityInwardsCalculationConfiguration configuration) + private static void WritePiezometricHeadPhreaticLine2Configuration(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine2PiezometricHeadElement); @@ -206,14 +211,14 @@ } /// - /// Writes a phreatic line 3 configuration. + /// Writes the leakage length phreatic line 3 related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WritePhreaticLine3Configuration(XmlWriter writer, - MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteLeakageLengthPhreaticLine3Configuration(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine3LeakageLengthElement); @@ -229,14 +234,14 @@ } /// - /// Writes a phreatic line 4 configuration. + /// Writes the leakage length phreatic line 4 related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WritePhreaticLine4Configuration(XmlWriter writer, - MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteLeakageLengthPhreaticLine4Configuration(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine4LeakageLengthElement); @@ -252,13 +257,15 @@ } /// - /// Writes a location input configuration for daily conditions. + /// Writes a location input configuration for daily conditions in XML format to file when + /// has a value. /// /// The writer to use for writing. /// The configuration for the location input that can be null. /// Thrown when the /// is closed. - private static void WriteLocationDailyInputWhenContentAvailable(XmlWriter writer, MacroStabilityInwardsLocationInputConfiguration configuration) + private static void WriteLocationDailyInputWhenAvailable(XmlWriter writer, + MacroStabilityInwardsLocationInputConfiguration configuration) { if (configuration == null) { @@ -277,14 +284,15 @@ } /// - /// Writes a location input configuration for extreme conditions. + /// Writes a location input configuration for extreme conditions in XML format to file + /// when has a value. /// /// The writer to use for writing. /// The configuration for the location input that can be null. /// Thrown when the /// is closed. - private static void WriteLocationExtremeInputWhenContentAvailable(XmlWriter writer, - MacroStabilityInwardsLocationInputExtremeConfiguration configuration) + private static void WriteLocationExtremeInputWhenAvailable(XmlWriter writer, + MacroStabilityInwardsLocationInputExtremeConfiguration configuration) { if (configuration == null) { @@ -307,13 +315,14 @@ } /// - /// Writes the offset of a location input configuration. + /// Writes the offset of a location input configuration in XML format to file. /// /// The writer to use for writing. /// The configuration for the location input that can be null. /// Thrown when the /// is closed. - private static void WriteLocationLocationInputOffset(XmlWriter writer, MacroStabilityInwardsLocationInputConfiguration configuration) + private static void WriteLocationLocationInputOffset(XmlWriter writer, + MacroStabilityInwardsLocationInputConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.LocationInputOffsetElement); @@ -337,13 +346,14 @@ } /// - /// Writes the drainage construction related parameters. + /// Writes the drainage construction related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WriteDrainageConstruction(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteDrainageConstruction(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.DrainageConstructionElement); @@ -361,13 +371,14 @@ } /// - /// Writes the phreatic line 1 minimum level related parameters. + /// Writes the phreatic line 1 minimum level related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WriteMinimumLevelPhreaticLine(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteMinimumLevelPhreaticLine(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.PhreaticLine1MinimumLevelElement); @@ -386,22 +397,23 @@ #region Write grids /// - /// Writes the grid related parameters. + /// Writes the grid related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WriteGrid(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteGrid(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridsElement); WriteElementWhenContentAvailable(writer, MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.MoveGridElement, configuration.MoveGrid); - WriteGridDeterminationTypeWhenAvailable(writer, - MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeElement, - configuration.GridDeterminationType); + WriteGridDeterminationTypeWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.GridDeterminationTypeElement, + configuration.GridDeterminationType); WriteTangentLine(writer, configuration); @@ -416,7 +428,7 @@ } /// - /// Writes the in XML format to file. + /// Writes the in XML format to file when it has a value. /// /// The writer to use for writing. /// The XML element name. @@ -425,9 +437,9 @@ /// is closed. /// Thrown when the conversion of /// cannot be performed. - private static void WriteGridDeterminationTypeWhenAvailable(XmlWriter writer, - string elementName, - ConfigurationGridDeterminationType? gridDeterminationType) + private static void WriteGridDeterminationTypeWhenContentAvailable(XmlWriter writer, + string elementName, + ConfigurationGridDeterminationType? gridDeterminationType) { if (!gridDeterminationType.HasValue) { @@ -442,19 +454,20 @@ #region Write tangent line /// - /// Writes the tangent line related parameters. + /// Writes the tangent line related properties in XML format to file. /// /// The writer to use for writing. /// The configuration to write. /// Thrown when the /// is closed. - private static void WriteTangentLine(XmlWriter writer, MacroStabilityInwardsCalculationConfiguration configuration) + private static void WriteTangentLine(XmlWriter writer, + MacroStabilityInwardsCalculationConfiguration configuration) { writer.WriteStartElement(MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineElement); - WriteTangentLineDeterminationTypeWhenAvailable(writer, - MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineDeterminationTypeElement, - configuration.TangentLineDeterminationType); + WriteTangentLineDeterminationTypeWhenContentAvailable(writer, + MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineDeterminationTypeElement, + configuration.TangentLineDeterminationType); WriteElementWhenContentAvailable(writer, MacroStabilityInwardsCalculationConfigurationSchemaIdentifiers.TangentLineZTopElement, @@ -472,7 +485,7 @@ } /// - /// Writes the in XML format to file. + /// Writes the in XML format to file when it has a value. /// /// The writer to use for writing. /// The XML element name. @@ -481,9 +494,9 @@ /// is closed. /// Thrown when the conversion of /// cannot be performed. - private static void WriteTangentLineDeterminationTypeWhenAvailable(XmlWriter writer, - string elementName, - ConfigurationTangentLineDeterminationType? tangentLineDeterminationType) + private static void WriteTangentLineDeterminationTypeWhenContentAvailable(XmlWriter writer, + string elementName, + ConfigurationTangentLineDeterminationType? tangentLineDeterminationType) { if (!tangentLineDeterminationType.HasValue) { @@ -498,7 +511,7 @@ #endregion /// - /// Writes a grid configuration. + /// Writes a grid configuration in XML format to file when has a value. /// /// The writer to use for writing. /// The name of the location of the grid. Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputConfiguration.cs =================================================================== diff -u -rf0525483bb0f01219ec1990b2e366de5faa7cb96 -rd5c726012814b171018b95de1a37f80c9a692594 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputConfiguration.cs (.../MacroStabilityInwardsLocationInputConfiguration.cs) (revision f0525483bb0f01219ec1990b2e366de5faa7cb96) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputConfiguration.cs (.../MacroStabilityInwardsLocationInputConfiguration.cs) (revision d5c726012814b171018b95de1a37f80c9a692594) @@ -22,7 +22,7 @@ namespace Ringtoets.MacroStabilityInwards.IO.Configurations { /// - /// Configuration of Locations input. + /// Configuration of locations input. /// public class MacroStabilityInwardsLocationInputConfiguration { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputExtremeConfiguration.cs =================================================================== diff -u -rf0525483bb0f01219ec1990b2e366de5faa7cb96 -rd5c726012814b171018b95de1a37f80c9a692594 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputExtremeConfiguration.cs (.../MacroStabilityInwardsLocationInputExtremeConfiguration.cs) (revision f0525483bb0f01219ec1990b2e366de5faa7cb96) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsLocationInputExtremeConfiguration.cs (.../MacroStabilityInwardsLocationInputExtremeConfiguration.cs) (revision d5c726012814b171018b95de1a37f80c9a692594) @@ -22,7 +22,7 @@ namespace Ringtoets.MacroStabilityInwards.IO.Configurations { /// - /// Configuration of Locations input for extreme conditions. + /// Configuration of locations input for extreme conditions. /// public class MacroStabilityInwardsLocationInputExtremeConfiguration : MacroStabilityInwardsLocationInputConfiguration { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsGridsSchema.xsd =================================================================== diff -u -ra2007eb52624e8787adf2834a0c43751b939f45b -rd5c726012814b171018b95de1a37f80c9a692594 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsGridsSchema.xsd (.../MacroStabiliteitBinnenwaartsGridsSchema.xsd) (revision a2007eb52624e8787adf2834a0c43751b939f45b) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsGridsSchema.xsd (.../MacroStabiliteitBinnenwaartsGridsSchema.xsd) (revision d5c726012814b171018b95de1a37f80c9a692594) @@ -122,20 +122,6 @@ - - - - - - - - - - - - - -