Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsGrid.cs =================================================================== diff -u -raf102911fb9673a007d2859e6ea5a10c47fb169f -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsGrid.cs (.../MacroStabilityInwardsGrid.cs) (revision af102911fb9673a007d2859e6ea5a10c47fb169f) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsGrid.cs (.../MacroStabilityInwardsGrid.cs) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -181,7 +181,7 @@ string message = string.Format(Resources.NumberOfHorizontalPoints_must_be_in_Range_0_, numberOfPointsValidityRange); - throw new ArgumentOutOfRangeException(nameof(value), message); + throw new ArgumentOutOfRangeException(null, message); } numberOfHorizontalPoints = value; @@ -205,7 +205,7 @@ string message = string.Format(Resources.NumberOfVerticalPoints_must_be_in_Range_0_, numberOfPointsValidityRange); - throw new ArgumentOutOfRangeException(nameof(value), message); + throw new ArgumentOutOfRangeException(null, message); } numberOfVerticalPoints = value; Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs =================================================================== diff -u -raa967d02f0b4b19c03083f019278054bd2b8aee1 -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision aa967d02f0b4b19c03083f019278054bd2b8aee1) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Configurations/MacroStabilityInwardsCalculationConfigurationImporter.cs (.../MacroStabilityInwardsCalculationConfigurationImporter.cs) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -94,7 +94,8 @@ && TrySetStochasticSoilProfile(calculationConfiguration, calculation) && TrySetScenarioParameters(calculationConfiguration.Scenario, calculation) && TrySetTangentLineZTopBottom(calculationConfiguration, calculation) - && TrySetTangentLineNumber(calculationConfiguration, calculation)) + && TrySetTangentLineNumber(calculationConfiguration, calculation) + && TrySetGrids(calculationConfiguration, calculation)) { SetSimpleProperties(calculationConfiguration, calculation.InputParameters); @@ -107,6 +108,209 @@ } /// + /// Assigns the read grids to the . + /// + /// The configuration read from the imported file. + /// The calculation to configure. + /// true if no grids where given, or set to the + /// , false otherwise. + private bool TrySetGrids(MacroStabilityInwardsCalculationConfiguration calculationConfiguration, + MacroStabilityInwardsCalculationScenario calculation) + { + return TrySetGrid(calculationConfiguration.LeftGrid, + calculation.InputParameters.LeftGrid, + calculation.Name) + && TrySetGrid(calculationConfiguration.RightGrid, + calculation.InputParameters.RightGrid, + calculation.Name); + } + + /// + /// Assigns the read grid to the . + /// + /// The grid configuration read from the imported file. + /// The grid to configure. + /// The name of the read calculation. + /// true if no grid configuration where given, or set to the + /// , false otherwise. + private bool TrySetGrid(MacroStabilityInwardsGridConfiguration gridConfiguration, + MacroStabilityInwardsGrid grid, + string calculationName) + { + if (gridConfiguration == null) + { + return true; + } + + return TrySetGridZTopZBottom(gridConfiguration, grid, calculationName) + && TrySetGridXLeftXRight(gridConfiguration, grid, calculationName) + && TrySetNumberOfHorizontalPoints(gridConfiguration, grid, calculationName) + && TrySetNumberOfVerticalPoints(gridConfiguration, grid, calculationName); + } + + /// + /// Assigns the grid Z top and Z bottom parameters to the . + /// + /// The grid configuration read from the imported file. + /// The calculation grid to configure. + /// The name of the read calculation. + /// true if no z top and z bottom was given, or when z top and z bottom + /// are set to the , false otherwise. + private bool TrySetGridZTopZBottom(MacroStabilityInwardsGridConfiguration gridConfiguration, + MacroStabilityInwardsGrid grid, + string calculationName) + { + bool hasZTopValue = gridConfiguration.ZTop.HasValue; + bool hasZBottomValue = gridConfiguration.ZBottom.HasValue; + if (!hasZTopValue && !hasZBottomValue) + { + return true; + } + + RoundedDouble zTop = hasZTopValue + ? (RoundedDouble) gridConfiguration.ZTop.Value + : RoundedDouble.NaN; + + RoundedDouble zBottom = hasZBottomValue + ? (RoundedDouble) gridConfiguration.ZBottom.Value + : RoundedDouble.NaN; + try + { + grid.ZTop = zTop; + grid.ZBottom = zBottom; + } + catch (ArgumentException e) + { + Log.LogCalculationConversionError(string.Format(Resources.MacroStabilityInwardsCalculationConfigurationImporter_TrySetGridZTopZBottom_Combination_of_ZTop_0_and_ZBottom_1_invalid_Reason_2, + zTop.ToPrecision(grid.ZTop.NumberOfDecimalPlaces), + zBottom.ToPrecision(grid.ZBottom.NumberOfDecimalPlaces), + e.Message), + calculationName); + + return false; + } + + return true; + } + + /// + /// Assigns the grid x left and x right parameters to the . + /// + /// The grid configuration read from the imported file. + /// The calculation grid to configure. + /// The name of the read calculation. + /// true if no x left and x right was given, or when x left and x right + /// are set to the , false otherwise. + private bool TrySetGridXLeftXRight(MacroStabilityInwardsGridConfiguration gridConfiguration, + MacroStabilityInwardsGrid grid, + string calculationName) + { + bool hasXLeftValue = gridConfiguration.XLeft.HasValue; + bool hasXRightValue = gridConfiguration.XRight.HasValue; + if (!hasXLeftValue && !hasXRightValue) + { + return true; + } + + RoundedDouble xLeft = hasXLeftValue + ? (RoundedDouble) gridConfiguration.XLeft.Value + : RoundedDouble.NaN; + + RoundedDouble xRight = hasXRightValue + ? (RoundedDouble) gridConfiguration.XRight.Value + : RoundedDouble.NaN; + try + { + grid.XLeft = xLeft; + grid.XRight = xRight; + } + catch (ArgumentException e) + { + Log.LogCalculationConversionError(string.Format(Resources.MacroStabilityInwardsCalculationConfigurationImporter_TrySetGridXLeftXRight_Combination_of_XLeft_0_and_XRight_1_invalid_Reason_2, + xLeft.ToPrecision(grid.XLeft.NumberOfDecimalPlaces), + xRight.ToPrecision(grid.XRight.NumberOfDecimalPlaces), + e.Message), + calculationName); + + return false; + } + + return true; + } + + /// + /// Assigns the number of horizontal points to the . + /// + /// The grid configuration read from the imported file. + /// The calculation grid to configure. + /// The name of the read calculation. + /// true if no number of horizontal points was given, or when number of + /// horizontal points is set to the , false otherwise. + private bool TrySetNumberOfHorizontalPoints(MacroStabilityInwardsGridConfiguration gridConfiguration, + MacroStabilityInwardsGrid grid, + string calculationName) + { + if (!gridConfiguration.NumberOfHorizontalPoints.HasValue) + { + return true; + } + + int numberOfHorizontalPoints = gridConfiguration.NumberOfHorizontalPoints.Value; + + try + { + grid.NumberOfHorizontalPoints = numberOfHorizontalPoints; + } + catch (ArgumentOutOfRangeException e) + { + Log.LogOutOfRangeException(string.Format(Resources.MacroStabilityInwardsCalculationConfigurationImporter_TrySetNumberOfHorizontalPoints_NumberOfHorizontalPoints_0_invalid, + numberOfHorizontalPoints), + calculationName, + e); + + return false; + } + + return true; + } + + /// + /// Assigns the number of vertical points to the . + /// + /// The grid configuration read from the imported file. + /// The calculation grid to configure. + /// The name of the read calculation. + /// true if no number of vertical points was given, or when number of + /// vertical points is set to the , false otherwise. + private bool TrySetNumberOfVerticalPoints(MacroStabilityInwardsGridConfiguration gridConfiguration, + MacroStabilityInwardsGrid grid, + string calculationName) + { + if (!gridConfiguration.NumberOfVerticalPoints.HasValue) + { + return true; + } + + int numberOfVerticalPoints = gridConfiguration.NumberOfVerticalPoints.Value; + + try + { + grid.NumberOfVerticalPoints = numberOfVerticalPoints; + } + catch (ArgumentOutOfRangeException e) + { + Log.LogOutOfRangeException(string.Format(Resources.MacroStabilityInwardsCalculationConfigurationImporter_TrySetNumberOfVerticalPoints_NumberOfVerticalPoints_0_invalid, + numberOfVerticalPoints), + calculationName, + e); + + return false; + } + + return true; + } + + /// /// Assigns the tangent line Z top and tangent line Z bottom parameters to the . /// /// The calculation read from the imported file. @@ -159,7 +363,8 @@ /// The calculation to configure. /// true when the tangent line number is set to the , /// false otherwise. - private bool TrySetTangentLineNumber(MacroStabilityInwardsCalculationConfiguration calculationConfiguration, MacroStabilityInwardsCalculationScenario calculation) + private bool TrySetTangentLineNumber(MacroStabilityInwardsCalculationConfiguration calculationConfiguration, + MacroStabilityInwardsCalculationScenario calculation) { if (!calculationConfiguration.TangentLineNumber.HasValue) { @@ -174,7 +379,8 @@ } catch (ArgumentOutOfRangeException e) { - Log.LogOutOfRangeException(string.Format("Een waarde van '{0}' als aantal tangentlijnen is ongeldig.", tangentLineNumber), + Log.LogOutOfRangeException(string.Format(Resources.MacroStabilityInwardsCalculationConfigurationImporter_TrySetTangentLineNumber_TangentLineNumber_0_invalid, + tangentLineNumber), calculation.Name, e); Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r8d42ff2fc79d3e478b29cf122c4f35ee1a013c3c -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8d42ff2fc79d3e478b29cf122c4f35ee1a013c3c) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -240,6 +240,56 @@ } /// + /// Looks up a localized string similar to Een waarde van '{0}' als X links en '{1}' als X rechts is ongeldig. {2}. + /// + public static string MacroStabilityInwardsCalculationConfigurationImporter_TrySetGridXLeftXRight_Combination_of_XLeft_0_and_XRight_1_invalid_Reason_2 { + get { + return ResourceManager.GetString("MacroStabilityInwardsCalculationConfigurationImporter_TrySetGridXLeftXRight_Combi" + + "nation_of_XLeft_0_and_XRight_1_invalid_Reason_2", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Een waarde van '{0}' als Z boven en '{1}' als Z onder is ongeldig. {2}. + /// + public static string MacroStabilityInwardsCalculationConfigurationImporter_TrySetGridZTopZBottom_Combination_of_ZTop_0_and_ZBottom_1_invalid_Reason_2 { + get { + return ResourceManager.GetString("MacroStabilityInwardsCalculationConfigurationImporter_TrySetGridZTopZBottom_Combi" + + "nation_of_ZTop_0_and_ZBottom_1_invalid_Reason_2", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Een waarde van '{0}' als aantal horizontale punten is ongeldig.. + /// + public static string MacroStabilityInwardsCalculationConfigurationImporter_TrySetNumberOfHorizontalPoints_NumberOfHorizontalPoints_0_invalid { + get { + return ResourceManager.GetString("MacroStabilityInwardsCalculationConfigurationImporter_TrySetNumberOfHorizontalPoi" + + "nts_NumberOfHorizontalPoints_0_invalid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Een waarde van '{0}' als aantal verticale punten is ongeldig.. + /// + public static string MacroStabilityInwardsCalculationConfigurationImporter_TrySetNumberOfVerticalPoints_NumberOfVerticalPoints_0_invalid { + get { + return ResourceManager.GetString("MacroStabilityInwardsCalculationConfigurationImporter_TrySetNumberOfVerticalPoint" + + "s_NumberOfVerticalPoints_0_invalid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Een waarde van '{0}' als aantal tangentlijnen is ongeldig.. + /// + public static string MacroStabilityInwardsCalculationConfigurationImporter_TrySetTangentLineNumber_TangentLineNumber_0_invalid { + get { + return ResourceManager.GetString("MacroStabilityInwardsCalculationConfigurationImporter_TrySetTangentLineNumber_Tan" + + "gentLineNumber_0_invalid", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Een waarde van '{0}' als tangentlijn Z-boven en '{1}' als tangentlijn Z-onder is ongeldig. {2}. /// public static string MacroStabilityInwardsCalculationConfigurationImporter_TrySetTangentLineZTopBottom_Combination_of_TangentLineZTop_0_and_TangentLineZBottom_1_invalid_Reason_2 { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx =================================================================== diff -u -r8d42ff2fc79d3e478b29cf122c4f35ee1a013c3c -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision 8d42ff2fc79d3e478b29cf122c4f35ee1a013c3c) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -268,4 +268,19 @@ Een waarde van '{0}' als tangentlijn Z-boven en '{1}' als tangentlijn Z-onder is ongeldig. {2} + + Een waarde van '{0}' als aantal tangentlijnen is ongeldig. + + + Een waarde van '{0}' als Z boven en '{1}' als Z onder is ongeldig. {2} + + + Een waarde van '{0}' als X links en '{1}' als X rechts is ongeldig. {2} + + + Een waarde van '{0}' als aantal horizontale punten is ongeldig. + + + Een waarde van '{0}' als aantal verticale punten is ongeldig. + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsGridsSchema.xsd =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsGridsSchema.xsd (.../MacroStabiliteitBinnenwaartsGridsSchema.xsd) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Resources/MacroStabiliteitBinnenwaartsGridsSchema.xsd (.../MacroStabiliteitBinnenwaartsGridsSchema.xsd) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -68,12 +68,12 @@ - - - - - - + + + + + + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -raa967d02f0b4b19c03083f019278054bd2b8aee1 -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision aa967d02f0b4b19c03083f019278054bd2b8aee1) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -502,6 +502,326 @@ } [Test] + public void Import_ValidLeftGrid_DataAddedToModel() + { + // Setup + string filePath = Path.Combine(importerPath, "validConfigurationCalculationContainingValidLeftGrid.xml"); + + var calculationGroup = new CalculationGroup(); + + var importer = new MacroStabilityInwardsCalculationConfigurationImporter(filePath, + calculationGroup, + Enumerable.Empty(), + new MacroStabilityInwardsFailureMechanism()); + + // Call + bool successful = importer.Import(); + + // Assert + Assert.IsTrue(successful); + + var expectedCalculations = new[] + { + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z top and Z bottom", + InputParameters = + { + LeftGrid = + { + ZTop = (RoundedDouble) 0, + ZBottom = (RoundedDouble) 0 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z top, Z bottom NaN", + InputParameters = + { + LeftGrid = + { + ZTop = (RoundedDouble) 1, + ZBottom = RoundedDouble.NaN + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z top", + InputParameters = + { + LeftGrid = + { + ZTop = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Z top NaN, valid Z bottom", + InputParameters = + { + LeftGrid = + { + ZTop = RoundedDouble.NaN, + ZBottom = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z bottom", + InputParameters = + { + LeftGrid = + { + ZBottom = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X rechts and X links", + InputParameters = + { + LeftGrid = + { + XLeft = (RoundedDouble) 0, + XRight = (RoundedDouble) 0 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X rechts, X links NaN", + InputParameters = + { + LeftGrid = + { + XLeft = RoundedDouble.NaN, + XRight = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X rechts", + InputParameters = + { + LeftGrid = + { + XRight = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "X rechts NaN, valid X links", + InputParameters = + { + LeftGrid = + { + XLeft = (RoundedDouble) 1, + XRight = RoundedDouble.NaN + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X links", + InputParameters = + { + LeftGrid = + { + XLeft = (RoundedDouble) 1 + } + } + } + }; + + ICalculation[] actualCalculations = calculationGroup.GetCalculations().ToArray(); + Assert.AreEqual(expectedCalculations.Length, actualCalculations.Length); + for (var i = 0; i < expectedCalculations.Length; i++) + { + AssertMacroStabilityInwardsCalculationScenario(expectedCalculations[i], + (MacroStabilityInwardsCalculationScenario) actualCalculations[i]); + } + } + + [Test] + public void Import_ValidRightGrid_DataAddedToModel() + { + // Setup + string filePath = Path.Combine(importerPath, "validConfigurationCalculationContainingValidRightGrid.xml"); + + var calculationGroup = new CalculationGroup(); + + var importer = new MacroStabilityInwardsCalculationConfigurationImporter(filePath, + calculationGroup, + Enumerable.Empty(), + new MacroStabilityInwardsFailureMechanism()); + + // Call + bool successful = importer.Import(); + + // Assert + Assert.IsTrue(successful); + + var expectedCalculations = new[] + { + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z top and Z bottom", + InputParameters = + { + RightGrid = + { + ZTop = (RoundedDouble) 0, + ZBottom = (RoundedDouble) 0 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z top, Z bottom NaN", + InputParameters = + { + RightGrid = + { + ZTop = (RoundedDouble) 1, + ZBottom = RoundedDouble.NaN + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z top", + InputParameters = + { + RightGrid = + { + ZTop = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Z top NaN, valid Z bottom", + InputParameters = + { + RightGrid = + { + ZTop = RoundedDouble.NaN, + ZBottom = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid Z bottom", + InputParameters = + { + RightGrid = + { + ZBottom = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X rechts and X links", + InputParameters = + { + RightGrid = + { + XLeft = (RoundedDouble) 0, + XRight = (RoundedDouble) 0 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X rechts, X links NaN", + InputParameters = + { + RightGrid = + { + XLeft = RoundedDouble.NaN, + XRight = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X rechts", + InputParameters = + { + RightGrid = + { + XRight = (RoundedDouble) 1 + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "X rechts NaN, valid X links", + InputParameters = + { + RightGrid = + { + XLeft = (RoundedDouble) 1, + XRight = RoundedDouble.NaN + } + } + }, + new MacroStabilityInwardsCalculationScenario + { + Name = "Valid X links", + InputParameters = + { + RightGrid = + { + XLeft = (RoundedDouble) 1 + } + } + } + }; + + ICalculation[] actualCalculations = calculationGroup.GetCalculations().ToArray(); + Assert.AreEqual(expectedCalculations.Length, actualCalculations.Length); + for (var i = 0; i < expectedCalculations.Length; i++) + { + AssertMacroStabilityInwardsCalculationScenario(expectedCalculations[i], + (MacroStabilityInwardsCalculationScenario) actualCalculations[i]); + } + } + + [Test] + [SetCulture("en-US")] + [TestCaseSource(nameof(GetInvalidGridCombinations))] + public void Import_InvalidGrid_LogMessageAndContinueImport(string file, string expectedMessage) + { + // Setup + string filePath = Path.Combine(importerPath, file); + + var calculationGroup = new CalculationGroup(); + var importer = new MacroStabilityInwardsCalculationConfigurationImporter(filePath, + calculationGroup, + new HydraulicBoundaryLocation[0], + new MacroStabilityInwardsFailureMechanism()); + + // Call + var successful = false; + Action call = () => successful = importer.Import(); + + // Assert + TestHelper.AssertLogMessageWithLevelIsGenerated(call, Tuple.Create(expectedMessage, LogLevelConstant.Error), 1); + Assert.IsTrue(successful); + CollectionAssert.IsEmpty(calculationGroup.Children); + } + + [Test] [TestCase(false, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml")] [TestCase(true, "validConfigurationFullCalculationContainingAssessmentLevel.xml")] public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(bool manualAssessmentLevel, string file) @@ -583,7 +903,25 @@ TangentLineZBottom = (RoundedDouble) 1, TangentLineNumber = 5, GridDeterminationType = MacroStabilityInwardsGridDeterminationType.Automatic, - TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated + TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.LayerSeparated, + LeftGrid = + { + XLeft = RoundedDouble.NaN, + XRight = RoundedDouble.NaN, + ZTop = RoundedDouble.NaN, + ZBottom = RoundedDouble.NaN, + NumberOfVerticalPoints = 6, + NumberOfHorizontalPoints = 5 + }, + RightGrid = + { + XLeft = (RoundedDouble) 1, + XRight = (RoundedDouble) 2, + ZTop = (RoundedDouble) 4, + ZBottom = (RoundedDouble) 3, + NumberOfVerticalPoints = 5, + NumberOfHorizontalPoints = 6 + } }, IsRelevant = false, Contribution = (RoundedDouble) 0.088 @@ -640,24 +978,84 @@ Assert.AreEqual(expectedInput.GridDeterminationType, actualInput.GridDeterminationType); Assert.AreEqual(expectedInput.TangentLineDeterminationType, actualInput.TangentLineDeterminationType); + AssertMacroStabilityInwardsGrid(expectedInput.LeftGrid, actualInput.LeftGrid); + AssertMacroStabilityInwardsGrid(expectedInput.RightGrid, actualInput.RightGrid); + Assert.AreEqual(expectedCalculation.IsRelevant, actualCalculation.IsRelevant); Assert.AreEqual(expectedCalculation.Contribution, actualCalculation.Contribution, actualCalculation.Contribution.GetAccuracy()); } - private static IEnumerable GetValidLargerThanCombinations() + private static void AssertMacroStabilityInwardsGrid(MacroStabilityInwardsGrid expected, MacroStabilityInwardsGrid actual) { - yield return new TestCaseData(1.0, null); - yield return new TestCaseData(1.0, double.NaN); - yield return new TestCaseData(null, 0.0); - yield return new TestCaseData(double.NaN, 0.0); - yield return new TestCaseData(0.0, 0.0); - yield return new TestCaseData(1.0, 0.0); + Assert.AreEqual(expected.ZTop, actual.ZTop); + Assert.AreEqual(expected.ZBottom, actual.ZBottom); + Assert.AreEqual(expected.XLeft, actual.XLeft); + Assert.AreEqual(expected.XRight, actual.XRight); + Assert.AreEqual(expected.NumberOfHorizontalPoints, actual.NumberOfHorizontalPoints); + Assert.AreEqual(expected.NumberOfVerticalPoints, actual.NumberOfVerticalPoints); } - private static IEnumerable GetInvalidLargerThanCombinations() + private static IEnumerable GetInvalidGridCombinations() { - yield return new TestCaseData(1.0, 0.0); - yield return new TestCaseData(0.0, -1.0); + const string expectedZTopZBottomMessage = "Een waarde van '0.00' als Z boven en '10.00' als Z onder is ongeldig. " + + "Z onder moet kleiner zijn dan of gelijk zijn aan Z boven, of NaN. " + + "Berekening 'Calculation' is overgeslagen."; + yield return new TestCaseData("validConfigurationCalculationContainingInvalidLeftGridZTopAndZBottom.xml", + expectedZTopZBottomMessage) + .SetName("Invalid left grid ZTop And ZBottom"); + yield return new TestCaseData("validConfigurationCalculationContainingInvalidRightGridZTopAndZBottom.xml", + expectedZTopZBottomMessage) + .SetName("Invalid right grid ZTop And ZBottom"); + + const string expectedXLeftXRightMessage = "Een waarde van '10.00' als X links en '0.00' als X rechts is ongeldig. " + + "X rechts moet groter zijn dan of gelijk zijn aan X links, of NaN. " + + "Berekening 'Calculation' is overgeslagen."; + yield return new TestCaseData("validConfigurationCalculationContainingInvalidLeftGridXLeftAndXRight.xml", + expectedXLeftXRightMessage) + .SetName("Invalid left grid XLeft And XRight"); + yield return new TestCaseData("validConfigurationCalculationContainingInvalidRightGridXLeftAndXRight.xml", + expectedXLeftXRightMessage) + .SetName("Invalid left grid XLeft And XRight"); + + const string expectedNumberOfHorizontalPointsTooLargeMessage = "Een waarde van '101' als aantal horizontale punten is ongeldig. " + + "De waarde voor het aantal horizontale punten moet in het bereik [1, 100] liggen. " + + "Berekening 'Calculation' is overgeslagen."; + yield return new TestCaseData("validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLarge.xml", + expectedNumberOfHorizontalPointsTooLargeMessage) + .SetName("Invalid left grid NumberOfHorizontalPoints too large"); + yield return new TestCaseData("validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLarge.xml", + expectedNumberOfHorizontalPointsTooLargeMessage) + .SetName("Invalid left grid NumberOfHorizontalPoints too large"); + + const string expectedNumberOfHorizontalPointsTooLowMessage = "Een waarde van '0' als aantal horizontale punten is ongeldig. " + + "De waarde voor het aantal horizontale punten moet in het bereik [1, 100] liggen. " + + "Berekening 'Calculation' is overgeslagen."; + yield return new TestCaseData("validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLow.xml", + expectedNumberOfHorizontalPointsTooLowMessage) + .SetName("Invalid left grid NumberOfHorizontalPoints too low"); + yield return new TestCaseData("validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLow.xml", + expectedNumberOfHorizontalPointsTooLowMessage) + .SetName("Invalid left grid NumberOfHorizontalPoints too low"); + + const string expectedNumberOfVerticalPointsTooLargeMessage = "Een waarde van '101' als aantal verticale punten is ongeldig. " + + "De waarde voor het aantal verticale punten moet in het bereik [1, 100] liggen. " + + "Berekening 'Calculation' is overgeslagen."; + yield return new TestCaseData("validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLarge.xml", + expectedNumberOfVerticalPointsTooLargeMessage) + .SetName("Invalid left grid NumberOfVerticalPoints too large"); + yield return new TestCaseData("validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLarge.xml", + expectedNumberOfVerticalPointsTooLargeMessage) + .SetName("Invalid left grid NumberOfVerticalPoints too large"); + + const string expectedNumberOfVerticalPointsTooLowMessage = "Een waarde van '0' als aantal verticale punten is ongeldig. " + + "De waarde voor het aantal verticale punten moet in het bereik [1, 100] liggen. " + + "Berekening 'Calculation' is overgeslagen."; + yield return new TestCaseData("validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLow.xml", + expectedNumberOfVerticalPointsTooLowMessage) + .SetName("Invalid left grid NumberOfVerticalPoints too low"); + yield return new TestCaseData("validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLow.xml", + expectedNumberOfVerticalPointsTooLowMessage) + .SetName("Invalid left grid NumberOfVerticalPoints too low"); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -327,8 +327,8 @@ Assert.IsNotNull(rightGridConfiguration); Assert.AreEqual(1, rightGridConfiguration.XLeft); Assert.AreEqual(2, rightGridConfiguration.XRight); - Assert.AreEqual(3, rightGridConfiguration.ZTop); - Assert.AreEqual(4, rightGridConfiguration.ZBottom); + Assert.AreEqual(4, rightGridConfiguration.ZTop); + Assert.AreEqual(3, rightGridConfiguration.ZBottom); Assert.AreEqual(5, rightGridConfiguration.NumberOfVerticalPoints); Assert.AreEqual(6, rightGridConfiguration.NumberOfHorizontalPoints); @@ -436,8 +436,8 @@ Assert.IsNotNull(rightGridConfiguration); Assert.AreEqual(1, rightGridConfiguration.XLeft); Assert.AreEqual(2, rightGridConfiguration.XRight); - Assert.AreEqual(3, rightGridConfiguration.ZTop); - Assert.AreEqual(4, rightGridConfiguration.ZBottom); + Assert.AreEqual(4, rightGridConfiguration.ZTop); + Assert.AreEqual(3, rightGridConfiguration.ZBottom); Assert.AreEqual(5, rightGridConfiguration.NumberOfVerticalPoints); Assert.AreEqual(6, rightGridConfiguration.NumberOfHorizontalPoints); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLarge.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLarge.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLarge.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 101 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLow.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLow.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfHorizontalPointsTooLow.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 0 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLarge.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLarge.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLarge.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 101 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLow.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLow.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridNumberOfVerticalPointsTooLow.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 0 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridXLeftAndXRight.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridXLeftAndXRight.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridXLeftAndXRight.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,11 @@ + + + + + + 10 + 0 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridZTopAndZBottom.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridZTopAndZBottom.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidLeftGridZTopAndZBottom.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,11 @@ + + + + + + 0 + 10 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLarge.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLarge.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLarge.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 101 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLow.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLow.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfHorizontalPointsTooLow.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 0 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLarge.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLarge.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLarge.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 101 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLow.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLow.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridNumberOfVerticalPointsTooLow.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,10 @@ + + + + + + 0 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridXLeftAndXRight.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridXLeftAndXRight.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridXLeftAndXRight.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,11 @@ + + + + + + 10 + 0 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridZTopAndZBottom.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridZTopAndZBottom.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingInvalidRightGridZTopAndZBottom.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,11 @@ + + + + + + 0 + 10 + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingValidLeftGrid.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingValidLeftGrid.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingValidLeftGrid.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,81 @@ + + + + + + + 0 + 0 + + + + + + + 1 + NaN + + + + + + + 1 + + + + + + + NaN + 1 + + + + + + + 1 + + + + + + + 0 + 0 + + + + + + + 1 + NaN + + + + + + + 1 + + + + + + + NaN + 1 + + + + + + + 1 + + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingValidRightGrid.xml =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingValidRightGrid.xml (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationImporter/validConfigurationCalculationContainingValidRightGrid.xml (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -0,0 +1,81 @@ + + + + + + + 0 + 0 + + + + + + + 1 + NaN + + + + + + + 1 + + + + + + + NaN + 1 + + + + + + + 1 + + + + + + + 0 + 0 + + + + + + + 1 + NaN + + + + + + + 1 + + + + + + + NaN + 1 + + + + + + + 1 + + + + + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfHorizontalPointsEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfHorizontalPointsEmpty.xml (.../invalidLeftGridGridNumberOfHorizontalPointsEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfHorizontalPointsEmpty.xml (.../invalidLeftGridGridNumberOfHorizontalPointsEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,11 +3,6 @@ - NaN - NaN - NaN - NaN - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfHorizontalPointsNoInteger.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfHorizontalPointsNoInteger.xml (.../invalidLeftGridGridNumberOfHorizontalPointsNoInteger.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfHorizontalPointsNoInteger.xml (.../invalidLeftGridGridNumberOfHorizontalPointsNoInteger.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,11 +3,6 @@ - NaN - NaN - NaN - NaN - 5 string Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfVerticalPointsEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfVerticalPointsEmpty.xml (.../invalidLeftGridGridNumberOfVerticalPointsEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfVerticalPointsEmpty.xml (.../invalidLeftGridGridNumberOfVerticalPointsEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN - NaN - NaN - NaN - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfVerticalPointsNoInteger.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfVerticalPointsNoInteger.xml (.../invalidLeftGridGridNumberOfVerticalPointsNoInteger.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridGridNumberOfVerticalPointsNoInteger.xml (.../invalidLeftGridGridNumberOfVerticalPointsNoInteger.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN - NaN - NaN - NaN string - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXLeftEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXLeftEmpty.xml (.../invalidLeftGridXLeftEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXLeftEmpty.xml (.../invalidLeftGridXLeftEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -4,11 +4,6 @@ - NaN - NaN - NaN - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXLeftNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXLeftNoDouble.xml (.../invalidLeftGridXLeftNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXLeftNoDouble.xml (.../invalidLeftGridXLeftNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -4,11 +4,6 @@ string - NaN - NaN - NaN - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXRightEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXRightEmpty.xml (.../invalidLeftGridXRightEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXRightEmpty.xml (.../invalidLeftGridXRightEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN - NaN - NaN - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXRightNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXRightNoDouble.xml (.../invalidLeftGridXRightNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridXRightNoDouble.xml (.../invalidLeftGridXRightNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN string - NaN - NaN - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZBottomEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZBottomEmpty.xml (.../invalidLeftGridZBottomEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZBottomEmpty.xml (.../invalidLeftGridZBottomEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN - NaN - NaN - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZBottomNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZBottomNoDouble.xml (.../invalidLeftGridZBottomNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZBottomNoDouble.xml (.../invalidLeftGridZBottomNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN - NaN - NaN string - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZTopEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZTopEmpty.xml (.../invalidLeftGridZTopEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZTopEmpty.xml (.../invalidLeftGridZTopEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN - NaN - NaN - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZTopNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZTopNoDouble.xml (.../invalidLeftGridZTopNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidLeftGridZTopNoDouble.xml (.../invalidLeftGridZTopNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - NaN - NaN string - NaN - 5 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfHorizontalPointsEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfHorizontalPointsEmpty.xml (.../invalidRightGridGridNumberOfHorizontalPointsEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfHorizontalPointsEmpty.xml (.../invalidRightGridGridNumberOfHorizontalPointsEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,11 +3,6 @@ - 1 - 2 - 3 - 4 - 5 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfHorizontalPointsNoInteger.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfHorizontalPointsNoInteger.xml (.../invalidRightGridGridNumberOfHorizontalPointsNoInteger.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfHorizontalPointsNoInteger.xml (.../invalidRightGridGridNumberOfHorizontalPointsNoInteger.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,11 +3,6 @@ - 1 - 2 - 3 - 4 - 5 string Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfVerticalPointsEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfVerticalPointsEmpty.xml (.../invalidRightGridGridNumberOfVerticalPointsEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfVerticalPointsEmpty.xml (.../invalidRightGridGridNumberOfVerticalPointsEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 - 2 - 3 - 4 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfVerticalPointsNoInteger.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfVerticalPointsNoInteger.xml (.../invalidRightGridGridNumberOfVerticalPointsNoInteger.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridGridNumberOfVerticalPointsNoInteger.xml (.../invalidRightGridGridNumberOfVerticalPointsNoInteger.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 - 2 - 3 - 4 string - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXLeftEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXLeftEmpty.xml (.../invalidRightGridXLeftEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXLeftEmpty.xml (.../invalidRightGridXLeftEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -4,11 +4,6 @@ - 2 - 3 - 4 - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXLeftNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXLeftNoDouble.xml (.../invalidRightGridXLeftNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXLeftNoDouble.xml (.../invalidRightGridXLeftNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -4,11 +4,6 @@ string - 2 - 3 - 4 - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXRightEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXRightEmpty.xml (.../invalidRightGridXRightEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXRightEmpty.xml (.../invalidRightGridXRightEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 - 3 - 4 - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXRightNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXRightNoDouble.xml (.../invalidRightGridXRightNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridXRightNoDouble.xml (.../invalidRightGridXRightNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 string - 3 - 4 - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZBottomEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZBottomEmpty.xml (.../invalidRightGridZBottomEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZBottomEmpty.xml (.../invalidRightGridZBottomEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 - 2 - 3 - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZBottomNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZBottomNoDouble.xml (.../invalidRightGridZBottomNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZBottomNoDouble.xml (.../invalidRightGridZBottomNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 - 2 - 3 string - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZTopEmpty.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZTopEmpty.xml (.../invalidRightGridZTopEmpty.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZTopEmpty.xml (.../invalidRightGridZTopEmpty.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 - 2 - 4 - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZTopNoDouble.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZTopNoDouble.xml (.../invalidRightGridZTopNoDouble.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/invalidRightGridZTopNoDouble.xml (.../invalidRightGridZTopNoDouble.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -3,12 +3,7 @@ - 1 - 2 string - 4 - 5 - 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml =================================================================== diff -u -r578d9ed2cd2330f233659f25ff91910533cabf39 -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml (.../validConfigurationFullCalculationContainingAssessmentLevel.xml) (revision 578d9ed2cd2330f233659f25ff91910533cabf39) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel.xml (.../validConfigurationFullCalculationContainingAssessmentLevel.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -78,8 +78,8 @@ 1 2 - 3 - 4 + 4 + 3 5 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml =================================================================== diff -u -r578d9ed2cd2330f233659f25ff91910533cabf39 -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml (.../validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml) (revision 578d9ed2cd2330f233659f25ff91910533cabf39) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml (.../validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -11,8 +11,8 @@ 1 2 - 3 - 4 + 4 + 3 5 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml =================================================================== diff -u -r77628d5f2ea3b6237adfca49e4f801250138243d -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml (.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml) (revision 77628d5f2ea3b6237adfca49e4f801250138243d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml (.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -78,8 +78,8 @@ 1 2 - 3 - 4 + 4 + 3 5 6 Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml =================================================================== diff -u -r578d9ed2cd2330f233659f25ff91910533cabf39 -ra2007eb52624e8787adf2834a0c43751b939f45b --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml (.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml) (revision 578d9ed2cd2330f233659f25ff91910533cabf39) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsCalculationConfigurationReader/validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml (.../validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml) (revision a2007eb52624e8787adf2834a0c43751b939f45b) @@ -14,8 +14,8 @@ 6 5 - 4 - 3 + 3 + 4 2 1