Index: Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationSchemaIdentifiers.cs
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationSchemaIdentifiers.cs (.../PipingCalculationConfigurationSchemaIdentifiers.cs) (revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/src/Riskeer.Piping.IO/Configurations/PipingCalculationConfigurationSchemaIdentifiers.cs (.../PipingCalculationConfigurationSchemaIdentifiers.cs) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -59,7 +59,7 @@
///
/// The identifier for the phreatic level exit stochast names.
///
- public const string PhreaticLevelExitStochastName = "polderpeil";
+ public const string PhreaticLevelExitStochastName = "binnendijksewaterstand";
///
/// The identifier for the damping factor exit stochast names.
Index: Riskeer/Piping/src/Riskeer.Piping.IO/Resources/PipingConfiguratieSchema.xsd
===================================================================
diff -u -r7dcfb4e551cfcb33c8e5f787a31b0565a6f18918 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/src/Riskeer.Piping.IO/Resources/PipingConfiguratieSchema.xsd (.../PipingConfiguratieSchema.xsd) (revision 7dcfb4e551cfcb33c8e5f787a31b0565a6f18918)
+++ Riskeer/Piping/src/Riskeer.Piping.IO/Resources/PipingConfiguratieSchema.xsd (.../PipingConfiguratieSchema.xsd) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -63,7 +63,7 @@
-
+
Index: Riskeer/Piping/src/Riskeer.Piping.IO/Resources/PipingConfiguratieSchema0To1.xslt
===================================================================
diff -u -r473548eb891e8457874906f24933ecc3557def40 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/src/Riskeer.Piping.IO/Resources/PipingConfiguratieSchema0To1.xslt (.../PipingConfiguratieSchema0To1.xslt) (revision 473548eb891e8457874906f24933ecc3557def40)
+++ Riskeer/Piping/src/Riskeer.Piping.IO/Resources/PipingConfiguratieSchema0To1.xslt (.../PipingConfiguratieSchema0To1.xslt) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -39,4 +39,11 @@
+
+
+
+
+
+
+
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r4a91111c1fda2c629fef0f552a2b33d9dbb5df92 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision 4a91111c1fda2c629fef0f552a2b33d9dbb5df92)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -59,7 +59,7 @@
yield return new TestCaseData("validConfigurationCalculationContainingInfinityExitPoint.xml",
$"Een waarde van '{double.PositiveInfinity}' als uittredepunt is ongeldig. Het gespecificeerde punt moet op het profiel liggen (bereik [0,0, 10,0]).");
yield return new TestCaseData("validConfigurationInvalidStandardDeviationPhreaticLevelExit.xml",
- "Een standaardafwijking van '-1' is ongeldig voor stochast 'polderpeil'. Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0.");
+ "Een standaardafwijking van '-1' is ongeldig voor stochast 'binnendijksewaterstand'. Standaardafwijking (σ) moet groter zijn dan of gelijk zijn aan 0.");
yield return new TestCaseData("validConfigurationInvalidMeanDampingFactorExit.xml",
"Een gemiddelde van '-1' is ongeldig voor stochast 'dempingsfactor'. Gemiddelde moet groter zijn dan 0.");
yield return new TestCaseData("validConfigurationInvalidStandardDeviationDampingFactorExit.xml",
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs (.../PipingCalculationConfigurationReaderTest.cs) (revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationReaderTest.cs (.../PipingCalculationConfigurationReaderTest.cs) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -190,6 +190,9 @@
yield return new TestCaseData("invalidCalculationVersion1ContainingBothAssessmentLevelAndHydraulicBoundaryLocation.xml",
"Element 'hblocatie' cannot appear more than once if content model type is \"all\".")
.SetName("invalidCalculationVersion1ContainingBothAssessmentLevelAndHydraulicBoundaryLocation");
+ yield return new TestCaseData("invalidCalculationVersion1OldStochastName.xml",
+ "The 'naam' attribute is invalid - The value 'polderpeil' is invalid according to its datatype 'nameType' - The Enumeration constraint failed.")
+ .SetName("invalidCalculationVersion1OldStochastName");
}
}
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationSchemaIdentifiersTest.cs
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationSchemaIdentifiersTest.cs (.../PipingCalculationConfigurationSchemaIdentifiersTest.cs) (revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/Configurations/PipingCalculationConfigurationSchemaIdentifiersTest.cs (.../PipingCalculationConfigurationSchemaIdentifiersTest.cs) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -36,7 +36,7 @@
Assert.AreEqual("uittredepunt", PipingCalculationConfigurationSchemaIdentifiers.ExitPointLElement);
Assert.AreEqual("ondergrondmodel", PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilModelElement);
Assert.AreEqual("ondergrondschematisatie", PipingCalculationConfigurationSchemaIdentifiers.StochasticSoilProfileElement);
- Assert.AreEqual("polderpeil", PipingCalculationConfigurationSchemaIdentifiers.PhreaticLevelExitStochastName);
+ Assert.AreEqual("binnendijksewaterstand", PipingCalculationConfigurationSchemaIdentifiers.PhreaticLevelExitStochastName);
Assert.AreEqual("dempingsfactor", PipingCalculationConfigurationSchemaIdentifiers.DampingFactorExitStochastName);
}
}
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationIrrelevant.xml (.../calculationIrrelevant.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -8,7 +8,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
0
0.1
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithAssessmentLevel.xml (.../calculationWithAssessmentLevel.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -8,7 +8,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
0
0.1
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithInfinities.xml (.../calculationWithInfinities.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -8,7 +8,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
-INF
INF
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithNaNs.xml (.../calculationWithNaNs.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -8,7 +8,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
NaN
NaN
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutHydraulicLocation.xml (.../calculationWithoutHydraulicLocation.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -7,7 +7,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
0
0.1
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilProfile.xml (.../calculationWithoutSoilProfile.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -7,7 +7,7 @@
10
PK001_0001_Piping
-
+
0
0.1
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSoilmodel.xml (.../calculationWithoutSoilmodel.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -6,7 +6,7 @@
0
10
-
+
0
0.1
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/calculationWithoutSurfaceline.xml (.../calculationWithoutSurfaceline.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -5,7 +5,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
0
0.1
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationExporter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -9,7 +9,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
0
0.1
@@ -32,7 +32,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
0
0.1
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationVersion1OldStochastName.xml
===================================================================
diff -u
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationVersion1OldStochastName.xml (revision 0)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/invalidCalculationVersion1OldStochastName.xml (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -0,0 +1,11 @@
+
+
+
+
+
+ 0.000
+ 0.100
+
+
+
+
\ No newline at end of file
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation.xml
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation.xml (.../validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation.xml) (revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation.xml (.../validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -8,7 +8,7 @@
Ondergrondmodel
Ondergrondschematisatie
-
+
4.4
5.5
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation_differentOrder.xml
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation_differentOrder.xml (.../validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation_differentOrder.xml) (revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation_differentOrder.xml (.../validConfigurationFullCalculationVersion1ContainingHydraulicBoundaryLocation_differentOrder.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -6,7 +6,7 @@
7.7
6.6
-
+
5.5
4.4
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel.xml
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel.xml (.../validConfigurationFullCalculationVersion1ContainingWaterLevel.xml) (revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel.xml (.../validConfigurationFullCalculationVersion1ContainingWaterLevel.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -8,7 +8,7 @@
Ondergrondmodel
Ondergrondschematisatie
-
+
4.4
5.5
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel_differentOrder.xml
===================================================================
diff -u -rf78793e43568d72b0d61651d1c82691126af01d4 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel_differentOrder.xml (.../validConfigurationFullCalculationVersion1ContainingWaterLevel_differentOrder.xml) (revision f78793e43568d72b0d61651d1c82691126af01d4)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationReader/validConfigurationFullCalculationVersion1ContainingWaterLevel_differentOrder.xml (.../validConfigurationFullCalculationVersion1ContainingWaterLevel_differentOrder.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -6,7 +6,7 @@
7.7
6.6
-
+
5.5
4.4
Index: Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml
===================================================================
diff -u -rfe7cbdce377ed794bdf460e0e2911642417c3954 -re9ac8660f203ae4e88f4360340ffef47c0de0656
--- Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision fe7cbdce377ed794bdf460e0e2911642417c3954)
+++ Riskeer/Piping/test/Riskeer.Piping.IO.Test/test-data/PipingCalculationConfigurationWriter/folderWithSubfolderAndCalculation.xml (.../folderWithSubfolderAndCalculation.xml) (revision e9ac8660f203ae4e88f4360340ffef47c0de0656)
@@ -10,7 +10,7 @@
PK001_0001_Piping
W1-6_0_1D1
-
+
0
0.1