Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs =================================================================== diff -u -ra5b0726549ca0e36c37c560966b5cdc6d1a2ec42 -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision a5b0726549ca0e36c37c560966b5cdc6d1a2ec42) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -127,7 +127,7 @@ { scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema } - }, Resources.KunstwerkenHoogteSchemaConfiguratieSchema0To1) + }, Resources.KunstwerkenHoogteConfiguratieSchema0To1) }) {} protected override HeightStructuresCalculationConfiguration ParseCalculationElement(XElement calculationElement) Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Properties/Resources.Designer.cs =================================================================== diff -u -ra5b0726549ca0e36c37c560966b5cdc6d1a2ec42 -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a5b0726549ca0e36c37c560966b5cdc6d1a2ec42) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -82,7 +82,8 @@ } /// - /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?><!-- + /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> + ///<!-- ///Copyright (C) Stichting Deltares 2019. All rights reserved. /// ///This file is part of Riskeer. @@ -94,11 +95,11 @@ /// ///This program is distributed in the hope that it will be useful, ///but WITHOUT ANY WARRANTY; without even the implied warranty of - ///ME [rest of string was truncated]";. + /// [rest of string was truncated]";. /// - internal static string KunstwerkenHoogteSchema { + internal static string KunstwerkenHoogteConfiguratieSchema0To1 { get { - return ResourceManager.GetString("KunstwerkenHoogteSchema", resourceCulture); + return ResourceManager.GetString("KunstwerkenHoogteConfiguratieSchema0To1", resourceCulture); } } @@ -117,15 +118,14 @@ ///but WITHOUT ANY WARRANTY; without even the implied warranty of ///ME [rest of string was truncated]";. /// - internal static string KunstwerkenHoogteSchema_0 { + internal static string KunstwerkenHoogteSchema { get { - return ResourceManager.GetString("KunstwerkenHoogteSchema_0", resourceCulture); + return ResourceManager.GetString("KunstwerkenHoogteSchema", resourceCulture); } } /// - /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> - ///<!-- + /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?><!-- ///Copyright (C) Stichting Deltares 2019. All rights reserved. /// ///This file is part of Riskeer. @@ -137,11 +137,11 @@ /// ///This program is distributed in the hope that it will be useful, ///but WITHOUT ANY WARRANTY; without even the implied warranty of - /// [rest of string was truncated]";. + ///ME [rest of string was truncated]";. /// - internal static string KunstwerkenHoogteSchemaConfiguratieSchema0To1 { + internal static string KunstwerkenHoogteSchema_0 { get { - return ResourceManager.GetString("KunstwerkenHoogteSchemaConfiguratieSchema0To1", resourceCulture); + return ResourceManager.GetString("KunstwerkenHoogteSchema_0", resourceCulture); } } } Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Properties/Resources.resx =================================================================== diff -u -ra5b0726549ca0e36c37c560966b5cdc6d1a2ec42 -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Properties/Resources.resx (.../Resources.resx) (revision a5b0726549ca0e36c37c560966b5cdc6d1a2ec42) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Properties/Resources.resx (.../Resources.resx) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -118,12 +118,12 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + ..\resources\kunstwerkenhoogteconfiguratieschema0to1.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + ..\Resources\KunstwerkenHoogteSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - - ..\resources\kunstwerkenhoogteschemaconfiguratieschema0to1.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 - ..\resources\kunstwerkenhoogteschema_0.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Resources/KunstwerkenHoogteConfiguratieSchema0To1.xslt =================================================================== diff -u --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Resources/KunstwerkenHoogteConfiguratieSchema0To1.xslt (revision 0) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Resources/KunstwerkenHoogteConfiguratieSchema0To1.xslt (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 refers to a dead (removed) revision in file `Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Resources/KunstwerkenHoogteSchemaConfiguratieSchema0To1.xslt'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs =================================================================== diff -u -re9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025 -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision e9fbad61d0a2e9ab98d3b87e8690ecbe4eb14025) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -38,7 +38,8 @@ /// public class StabilityPointStructuresCalculationConfigurationReader : CalculationConfigurationReader { - private const string hbLocatieSchemaName = "HbLocatieSchema_0.xsd"; + private const string hbLocatieSchemaVersion0Name = "HbLocatieSchema_0.xsd"; + private const string hbLocatieSchemaVersion1Name = "HbLocatieSchema.xsd"; private const string orientatieSchemaName = "OrientatieSchema.xsd"; private const string golfReductieSchemaName = "GolfReductieSchema.xsd"; private const string voorlandProfielSchemaName = "VoorlandProfielSchema.xsd"; @@ -65,11 +66,11 @@ : base(filePath, new[] { new CalculationConfigurationSchemaDefinition( - 0, Resources.StabilityPointStructuresConfigurationSchema, + 0, Resources.KunstwerkenConstructiefFalenSchema_0, new Dictionary { { - hbLocatieSchemaName, RiskeerCommonIOResources.HbLocatieSchema_0 + hbLocatieSchemaVersion0Name, RiskeerCommonIOResources.HbLocatieSchema_0 }, { orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema @@ -95,7 +96,39 @@ { scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema } - }, null) + }, null), + new CalculationConfigurationSchemaDefinition( + 1, Resources.KunstwerkenConstructiefFalenSchema, + new Dictionary + { + { + hbLocatieSchemaVersion1Name, RiskeerCommonIOResources.HbLocatieSchema + }, + { + orientatieSchemaName, RiskeerCommonIOResources.OrientatieSchema + }, + { + voorlandProfielSchemaName, RiskeerCommonIOResources.VoorlandProfielSchema + }, + { + golfReductieSchemaName, RiskeerCommonIOResources.GolfReductieSchema + }, + { + stochastSchemaName, RiskeerCommonIOResources.StochastSchema + }, + { + stochastStandaardafwijkingSchemaName, RiskeerCommonIOResources.StochastStandaardafwijkingSchema + }, + { + stochastVariatiecoefficientSchemaName, RiskeerCommonIOResources.StochastVariatiecoefficientSchema + }, + { + structureBaseSchemaName, RiskeerCommonIOResources.KunstwerkenBasisSchema + }, + { + scenarioSchemaName, RiskeerCommonIOResources.ScenarioSchema + } + }, Resources.KunstwerkenConstructiefFalenConfiguratieSchema0To1) }) {} protected override StabilityPointStructuresCalculationConfiguration ParseCalculationElement(XElement calculationElement) @@ -117,7 +150,7 @@ FlowVelocityStructureClosable = calculationElement.GetStochastConfiguration(StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName), FlowWidthAtBottomProtection = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName), ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement), - HydraulicBoundaryLocationName = calculationElement.GetHydraulicBoundaryLocationName(), + HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElementNew), InflowModelType = (ConfigurationStabilityPointStructuresInflowModelType?) calculationElement.GetConvertedValueFromDescendantStringElement( StabilityPointStructuresConfigurationSchemaIdentifiers.InflowModelTypeElement), Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 106eeb3a0608bd85eb1fcc8fff72256fd9c3ac5f) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -40,7 +40,7 @@ // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -137,12 +137,24 @@ } /// - /// Looks up a localized string similar to Er kan geen spreiding voor stochast 'kritiekestroomsnelheid' opgegeven worden.. + /// Looks up a localized string similar to <?xml version="1.0" encoding="utf-8"?> + ///<!-- + ///Copyright (C) Stichting Deltares 2019. All rights reserved. + /// + ///This file is part of Riskeer. + /// + ///Riskeer is free software: you can redistribute it and/or modify + ///it under the terms of the GNU General Public License as published by + ///the Free Software Foundation, either version 3 of the License, or + ///(at your option) any later version. + /// + ///This program is distributed in the hope that it will be useful, + ///but WITHOUT ANY WARRANTY; without even the implied warranty of + /// [rest of string was truncated]";. /// - internal static string StabilityPointStructuresCalculationStochastAssigner_ValidateStochasts_Cannot_define_spread_for_FlowVelocityStructureClosable { + internal static string KunstwerkenConstructiefFalenConfiguratieSchema0To1 { get { - return ResourceManager.GetString("StabilityPointStructuresCalculationStochastAssigner_ValidateStochasts_Cannot_defi" + - "ne_spread_for_FlowVelocityStructureClosable", resourceCulture); + return ResourceManager.GetString("KunstwerkenConstructiefFalenConfiguratieSchema0To1", resourceCulture); } } @@ -158,12 +170,44 @@ ///(at your option) any later version. /// ///This program is distributed in the hope that it will be useful, - ///but WITHOUT ANY WARRANTY; without even the implied warranty of [rest of string was truncated]";. + ///but WITHOUT ANY WARRANTY; without even the implied warranty of + ///ME [rest of string was truncated]";. /// - internal static string StabilityPointStructuresConfigurationSchema { + internal static string KunstwerkenConstructiefFalenSchema { get { - return ResourceManager.GetString("StabilityPointStructuresConfigurationSchema", resourceCulture); + return ResourceManager.GetString("KunstwerkenConstructiefFalenSchema", resourceCulture); } } + + /// + /// Looks up a localized string similar to <?xml version="1.0" encoding="UTF-8"?><!-- + ///Copyright (C) Stichting Deltares 2019. All rights reserved. + /// + ///This file is part of Riskeer. + /// + ///Riskeer is free software: you can redistribute it and/or modify + ///it under the terms of the GNU General Public License as published by + ///the Free Software Foundation, either version 3 of the License, or + ///(at your option) any later version. + /// + ///This program is distributed in the hope that it will be useful, + ///but WITHOUT ANY WARRANTY; without even the implied warranty of + ///ME [rest of string was truncated]";. + /// + internal static string KunstwerkenConstructiefFalenSchema_0 { + get { + return ResourceManager.GetString("KunstwerkenConstructiefFalenSchema_0", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Er kan geen spreiding voor stochast 'kritiekestroomsnelheid' opgegeven worden.. + /// + internal static string StabilityPointStructuresCalculationStochastAssigner_ValidateStochasts_Cannot_define_spread_for_FlowVelocityStructureClosable { + get { + return ResourceManager.GetString("StabilityPointStructuresCalculationStochastAssigner_ValidateStochasts_Cannot_defi" + + "ne_spread_for_FlowVelocityStructureClosable", resourceCulture); + } + } } } Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Properties/Resources.resx =================================================================== diff -u -rbf1fde9d2147a6eeaecebbb371be2c4856759159 -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Properties/Resources.resx (.../Resources.resx) (revision bf1fde9d2147a6eeaecebbb371be2c4856759159) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Properties/Resources.resx (.../Resources.resx) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -139,7 +139,13 @@ de afstand onderkant wand en teen van de dijk/berm - - ..\Resources\KunstwerkenConstructiefFalenSchema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\resources\kunstwerkenconstructieffalenconfiguratieschema0to1.xslt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + ..\resources\kunstwerkenconstructieffalenschema.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + + + ..\resources\kunstwerkenconstructieffalenschema_0.xsd;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252 + \ No newline at end of file Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenConfiguratieSchema0To1.xslt =================================================================== diff -u --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenConfiguratieSchema0To1.xslt (revision 0) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenConfiguratieSchema0To1.xslt (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + \ No newline at end of file Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema.xsd =================================================================== diff -u -rff0edf44f1a80c349d4873d4e70d903d2a560ceb -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema.xsd (.../KunstwerkenConstructiefFalenSchema.xsd) (revision ff0edf44f1a80c349d4873d4e70d903d2a560ceb) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema.xsd (.../KunstwerkenConstructiefFalenSchema.xsd) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -32,6 +32,15 @@ + + + + + + + + + @@ -42,7 +51,7 @@ - + Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema_0.xsd =================================================================== diff -u --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema_0.xsd (revision 0) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.IO/Resources/KunstwerkenConstructiefFalenSchema_0.xsd (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -0,0 +1,165 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs =================================================================== diff -u -r764c8b09aaa1c65fa6ae78d8e07414c800266fd1 -r8ad7f5ddc8aff2b1ab034a3816410c8a107722b9 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 764c8b09aaa1c65fa6ae78d8e07414c800266fd1) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -346,6 +346,10 @@ yield return new TestCaseData("invalidShouldIllustrationPointsBeCalculatedNoBoolean.xml", "The 'illustratiepunteninlezen' element is invalid - The value 'string' is invalid according to its datatype 'Boolean'") .SetName("invalidShouldIllustrationPointsBeCalculatedNoBoolean"); + + yield return new TestCaseData("invalidCalculationVersion1HydraulicBoundaryLocationOld.xml", + "The element 'berekening' has invalid child element 'hrlocatie'.") + .SetName("invalidCalculationVersion1HydraulicBoundaryLocationOld"); } } @@ -383,6 +387,8 @@ [TestCase("validFullConfigurationNew")] [TestCase("validFullConfiguration_differentOrder_old")] [TestCase("validFullConfiguration_differentOrder_new")] + [TestCase("validFullConfigurationVersion1")] + [TestCase("validFullConfiguration_differentOrder_Version1")] public void Read_ValidFullConfigurations_ExpectedValues(string fileName) { // Setup @@ -785,7 +791,7 @@ Assert.That(double.IsNegativeInfinity(calculation.WidthFlowApertures.StandardDeviation.Value)); Assert.That(double.IsNegativeInfinity(calculation.WaveReduction.BreakWaterHeight.Value)); - + Assert.That(double.IsPositiveInfinity(calculation.Scenario.Contribution.Value)); } Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidCalculationVersion1HydraulicBoundaryLocationOld.xml =================================================================== diff -u --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidCalculationVersion1HydraulicBoundaryLocationOld.xml (revision 0) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/invalidCalculationVersion1HydraulicBoundaryLocationOld.xml (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -0,0 +1,6 @@ + + + + Some_hydraulic_boundary_location + + \ No newline at end of file Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationVersion1.xml =================================================================== diff -u --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationVersion1.xml (revision 0) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfigurationVersion1.xml (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -0,0 +1,120 @@ + + + + Locatie1 + 9.81 + 0.01 + kunstwerk1 + 7 + verdronkenkoker + lineair + 0.1 + 2 + 0.001 + 1 + 1E-05 + 0.0001 + true + profiel1 + + true + havendam + 1.23 + false + + + + 6 + 0.12 + + + 0.5 + 0.1 + + + 0.7 + 0.1 + + + 0.1 + 0.12 + + + 0.1 + 0.12 + + + 15.2 + 0.1 + + + 80.5 + 1 + + + 15.2 + 0.1 + + + 15000 + 0.01 + + + 0.2 + 0.01 + + + 4.3 + 0.1 + + + 1.2 + 0.1 + + + 2 + 0.1 + + + 1.1 + 0.12 + + + 2 + 0.1 + + + 2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 16000 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + + true + 8.8 + + + \ No newline at end of file Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_Version1.xml =================================================================== diff -u --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_Version1.xml (revision 0) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.IO.Test/test-data/StabilityPointStructuresCalculationConfigurationReader/validFullConfiguration_differentOrder_Version1.xml (revision 8ad7f5ddc8aff2b1ab034a3816410c8a107722b9) @@ -0,0 +1,120 @@ + + + + Locatie1 + kunstwerk1 + 7 + true + 0.0001 + profiel1 + 0.1 + 0.01 + 0.001 + verdronkenkoker + lineair + 1 + 1E-05 + 2 + 9.81 + + true + havendam + 1.23 + false + + + true + 8.8 + + + + 15.2 + 0.1 + + + 15.2 + 0.1 + + + 15000 + 0.01 + + + 2 + 0.1 + + + 0.1 + 0.12 + + + 0.2 + 0.01 + + + 6 + 0.12 + + + 80.5 + 1 + + + 1.2 + 0.1 + + + 2 + 0.1 + + + 2 + 0.1 + + + 0.1 + 0.12 + + + 1.2 + 0.1 + + + 1.1 + 0.12 + + + 0.5 + 0.1 + + + 0.7 + 0.1 + + + 4.3 + 0.1 + + + 16000 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + 1.2 + 0.1 + + + + \ No newline at end of file