Index: Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r7d7e2fd0915f0ec377f5eac92e477308dd5a2675 -re96706d46bfd53d20b4010cc85444f5bee48a265
--- Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 7d7e2fd0915f0ec377f5eac92e477308dd5a2675)
+++ Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e96706d46bfd53d20b4010cc85444f5bee48a265)
@@ -225,6 +225,15 @@
}
///
+ /// Looks up a localized string similar to stapgrootte.
+ ///
+ public static string CalculationConfigurationImporter_StepSize_DisplayName {
+ get {
+ return ResourceManager.GetString("CalculationConfigurationImporter_StepSize_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Er is geen kunstwerk opgegeven om {0} aan toe te voegen..
///
public static string CalculationConfigurationImporter_TryParameter_No_Structure_to_assign_Parameter_0_ {
@@ -388,8 +397,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string ConfiguratieSchema {
get {
@@ -908,8 +916,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string GolfReductieSchema {
get {
@@ -929,8 +936,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string HbLocatieSchema {
get {
@@ -950,8 +956,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string HbLocatieSchema_0 {
get {
@@ -1204,8 +1209,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string KunstwerkenBasisSchema {
get {
@@ -1225,8 +1229,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string KunstwerkenBasisSchema_0 {
get {
@@ -1255,8 +1258,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string OrientatieSchema {
get {
@@ -1591,8 +1593,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string ScenarioSchema {
get {
@@ -1612,8 +1613,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string ScenarioSchema_0 {
get {
@@ -1940,8 +1940,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string StochastSchema {
get {
@@ -1961,8 +1960,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string StochastStandaardafwijkingSchema {
get {
@@ -1982,8 +1980,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string StochastVariatiecoefficientSchema {
get {
@@ -2655,8 +2652,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string VersieSchema {
get {
@@ -2676,8 +2672,7 @@
///(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]";.
+ ///but WITHOUT ANY WARRANTY; without eve [rest of string was truncated]";.
///
public static string VoorlandProfielSchema {
get {
@@ -2697,8 +2692,7 @@
///(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
- ///MERCHANTABILITY or [rest of string was truncated]";.
+ ///but WITHOUT ANY WARRANTY; without even the implied war [rest of string was truncated]";.
///
public static string XmlGeometrySchema {
get {
Index: Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.resx
===================================================================
diff -u -refcbd052c7d80565033ad56891749d9356f1ba9e -re96706d46bfd53d20b4010cc85444f5bee48a265
--- Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision efcbd052c7d80565033ad56891749d9356f1ba9e)
+++ Riskeer/Common/src/Riskeer.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision e96706d46bfd53d20b4010cc85444f5bee48a265)
@@ -894,4 +894,7 @@
zip archief
+
+ stapgrootte
+
\ No newline at end of file
Index: Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs
===================================================================
diff -u -re5ae21624afdf7f1608f245f7719f9fe216a1bf2 -re96706d46bfd53d20b4010cc85444f5bee48a265
--- Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs (.../WaveConditionsCalculationConfigurationImporter.cs) (revision e5ae21624afdf7f1608f245f7719f9fe216a1bf2)
+++ Riskeer/Revetment/src/Riskeer.Revetment.IO/Configurations/WaveConditionsCalculationConfigurationImporter.cs (.../WaveConditionsCalculationConfigurationImporter.cs) (revision e96706d46bfd53d20b4010cc85444f5bee48a265)
@@ -327,7 +327,7 @@
Log.LogOutOfRangeException(string.Format(
RiskeerCommonIOResources.TryReadParameter_Value_0_ParameterName_1_is_invalid,
stepSize,
- "stapgrootte"),
+ RiskeerCommonIOResources.CalculationConfigurationImporter_StepSize_DisplayName),
calculation.Name, e);
return false;
}
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r47088b4fec24b5241404604faf68954bcb1d9bf7 -re96706d46bfd53d20b4010cc85444f5bee48a265
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision 47088b4fec24b5241404604faf68954bcb1d9bf7)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationReaderTest.cs (.../WaveConditionsCalculationConfigurationReaderTest.cs) (revision e96706d46bfd53d20b4010cc85444f5bee48a265)
@@ -259,14 +259,15 @@
Assert.IsNaN(configuration.UpperBoundaryWaterLevels);
Assert.IsNaN(configuration.LowerBoundaryWaterLevels);
Assert.IsNaN(configuration.Orientation);
+ Assert.IsNaN(configuration.StepSize);
Assert.IsNaN(configuration.WaveReduction.BreakWaterHeight);
}
[Test]
public void Read_ValidConfigurationWithCalculationContainingInfinities_ReturnExpectedReadWaveConditionsCalculation()
{
// Setup
- string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContaininInfinities.xml");
+ string filePath = Path.Combine(testDirectoryPath, "validConfigurationCalculationContainingInfinities.xml");
var reader = new TestWaveConditionsCalculationConfigurationReader(filePath, validMainSchemaDefinitions);
// Call
@@ -283,6 +284,7 @@
Assert.IsNotNull(configuration.UpperBoundaryWaterLevels);
Assert.IsNotNull(configuration.LowerBoundaryWaterLevels);
Assert.IsNotNull(configuration.Orientation);
+ Assert.IsNotNull(configuration.StepSize);
Assert.IsNotNull(configuration.WaveReduction.BreakWaterHeight);
Assert.IsTrue(double.IsPositiveInfinity(configuration.TargetProbability.Value));
@@ -291,6 +293,7 @@
Assert.IsTrue(double.IsPositiveInfinity(configuration.UpperBoundaryWaterLevels.Value));
Assert.IsTrue(double.IsNegativeInfinity(configuration.LowerBoundaryWaterLevels.Value));
Assert.IsTrue(double.IsPositiveInfinity(configuration.Orientation.Value));
+ Assert.IsTrue(double.IsPositiveInfinity(configuration.StepSize.Value));
Assert.IsTrue(double.IsPositiveInfinity(configuration.WaveReduction.BreakWaterHeight.Value));
}
Fisheye: Tag e96706d46bfd53d20b4010cc85444f5bee48a265 refers to a dead (removed) revision in file `Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationCalculationContaininInfinities.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationCalculationContainingInfinities.xml
===================================================================
diff -u
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationCalculationContainingInfinities.xml (revision 0)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationCalculationContainingInfinities.xml (revision e96706d46bfd53d20b4010cc85444f5bee48a265)
@@ -0,0 +1,15 @@
+
+
+
+ INF
+ INF
+ -INF
+ INF
+ -INF
+ INF
+ INF
+
+ INF
+
+
+
Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationCalculationContainingNaNs.xml
===================================================================
diff -u -r63c0c4a746482e4369f67a5f59ecc0b7864bb3db -re96706d46bfd53d20b4010cc85444f5bee48a265
--- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationCalculationContainingNaNs.xml (.../validConfigurationCalculationContainingNaNs.xml) (revision 63c0c4a746482e4369f67a5f59ecc0b7864bb3db)
+++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/test-data/WaveConditionsCalculationConfigurationReader/validConfigurationCalculationContainingNaNs.xml (.../validConfigurationCalculationContainingNaNs.xml) (revision e96706d46bfd53d20b4010cc85444f5bee48a265)
@@ -7,6 +7,7 @@
NaN
NaN
NaN
+ NaN
NaN