Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r3e3087bd9c43ca5a3910438b3c9daf0defcb09bf -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 3e3087bd9c43ca5a3910438b3c9daf0defcb09bf)
+++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -318,7 +318,7 @@
0.1,
4,
1.0,
- ClosingStructureType.VerticalWall);
+ ClosingStructureInflowModelType.VerticalWall);
}
#endregion
Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r396f21603d742cdfb0e92817e5fd0b4df1e9f851 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 396f21603d742cdfb0e92817e5fd0b4df1e9f851)
+++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -358,7 +358,7 @@
Assert.AreEqual(0.1, closingStructure.FailureProbabilityOpenStructure.Value);
Assert.AreEqual(4, closingStructure.IdenticalApertures);
Assert.AreEqual(1.0, closingStructure.FailureProbabilityReparation.Value);
- Assert.AreEqual(ClosingStructureType.VerticalWall, closingStructure.InflowModel);
+ Assert.AreEqual(ClosingStructureInflowModelType.VerticalWall, closingStructure.InflowModelType);
}
private static void AssertExpectedClosingStructuresInput(ClosingStructuresInput inputParameters)
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs
===================================================================
diff -u -r8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision 8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructure.cs (.../ClosingStructure.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -61,11 +61,11 @@
/// The probability of failing to close the closing structure.
/// The number of identical apertures of the closing structure.
/// The probability of failing to repair a failed closure of the closing structure.
- /// The type of closing structure.
+ /// The type of closing structure inflow model.
/// Thrown when or is null
/// , empty or consists of whitespace.
/// Thrown when is null.
- /// When any stochastic variable parameter is out if its valid domain.
+ /// When any stochastic variable parameter is out of its valid domain.
public ClosingStructure(string name, string id, Point2D location,
double storageStructureAreaMean, double storageStructureAreaCoefficientOfVariation,
double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation,
@@ -81,7 +81,7 @@
double failureProbabilityOpenStructure,
int identicalApertures,
double failureProbabilityReparation,
- ClosingStructureType inflowModel
+ ClosingStructureInflowModelType inflowModelType
)
: base(name, id, location, structureNormalOrientation)
{
@@ -134,7 +134,7 @@
FailureProbabilityOpenStructure = new RoundedDouble(2, failureProbabilityOpenStructure);
IdenticalApertures = identicalApertures;
FailureProbabilityReparation = new RoundedDouble(2, failureProbabilityReparation);
- InflowModel = inflowModel;
+ InflowModelType = inflowModelType;
}
///
@@ -203,8 +203,8 @@
public RoundedDouble FailureProbabilityReparation { get; private set; }
///
- /// Gets the type of closing structure.
+ /// Gets the type of closing structure inflow model.
///
- public ClosingStructureType InflowModel { get; private set; }
+ public ClosingStructureInflowModelType InflowModelType { get; private set; }
}
}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructureInflowModelType.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructureInflowModelType.cs (revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructureInflowModelType.cs (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -0,0 +1,51 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Utils.Attributes;
+using Ringtoets.ClosingStructures.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
+
+namespace Ringtoets.ClosingStructures.Data
+{
+ ///
+ /// Defines the types of the various inflow models.
+ ///
+ public enum ClosingStructureInflowModelType
+ {
+ ///
+ /// A vertical wall.
+ ///
+ [ResourcesDisplayName(typeof(Resources), "ClosingStructureInflowModelType_VerticalWall_DisplayName")]
+ VerticalWall,
+
+ ///
+ /// A low sill structure.
+ ///
+ [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), "StructureInflowModelType_LowSill_DisplayName")]
+ LowSill,
+
+ ///
+ /// A flooded culvert structure.
+ ///
+ [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), "StructureInflowModelType_FloodedCulvert_DisplayName")]
+ FloodedCulvert
+ }
+}
Fisheye: Tag 9e3639e810a22019da1a9fdf5aa5c433a43520c1 refers to a dead (removed) revision in file `Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructureType.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs
===================================================================
diff -u -ra79ad28aed9a5de0a80df09d9b7e65d45070b940 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision a79ad28aed9a5de0a80df09d9b7e65d45070b940)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresInput.cs (.../ClosingStructuresInput.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -160,9 +160,9 @@
public ClosingStructure ClosingStructure { get; set; }
///
- /// Gets or sets the type of closing structure.
+ /// Gets or sets the type of closing structure inflow model.
///
- public ClosingStructureType ClosingStructureType { get; set; }
+ public ClosingStructureInflowModelType InflowModelType { get; set; }
#endregion
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -82,6 +82,15 @@
}
///
+ /// Looks up a localized string similar to Verticale wand.
+ ///
+ public static string ClosingStructureInflowModelType_VerticalWall_DisplayName {
+ get {
+ return ResourceManager.GetString("ClosingStructureInflowModelType_VerticalWall_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to BSKW.
///
public static string ClosingStructuresFailureMechanism_Code {
@@ -98,14 +107,5 @@
return ResourceManager.GetString("ClosingStructuresFailureMechanism_DisplayName", resourceCulture);
}
}
-
- ///
- /// Looks up a localized string similar to Verticale wand.
- ///
- public static string ClosingStructureType_VerticalWall_DisplayName {
- get {
- return ResourceManager.GetString("ClosingStructureType_VerticalWall_DisplayName", resourceCulture);
- }
- }
}
}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx
===================================================================
diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -123,7 +123,7 @@
Kunstwerken - Betrouwbaarheid sluiting kunstwerk
-
+
Verticale wand
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj
===================================================================
diff -u -ra6e0409b281c46630100de22ec860d3a3d4d8fa5 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj (.../Ringtoets.ClosingStructures.Data.csproj) (revision a6e0409b281c46630100de22ec860d3a3d4d8fa5)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj (.../Ringtoets.ClosingStructures.Data.csproj) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -44,7 +44,7 @@
-
+
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -84,18 +84,18 @@
///
/// Looks up a localized string similar to Instroommodel van het kunstwerk..
///
- public static string ClosingStructureType_Description {
+ public static string ClosingStructureInflowModelType_Description {
get {
- return ResourceManager.GetString("ClosingStructureType_Description", resourceCulture);
+ return ResourceManager.GetString("ClosingStructureInflowModelType_Description", resourceCulture);
}
}
///
/// Looks up a localized string similar to Instroommodel.
///
- public static string ClosingStructureType_DisplayName {
+ public static string ClosingStructureInflowModelType_DisplayName {
get {
- return ResourceManager.GetString("ClosingStructureType_DisplayName", resourceCulture);
+ return ResourceManager.GetString("ClosingStructureInflowModelType_DisplayName", resourceCulture);
}
}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -117,10 +117,10 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
+
Instroommodel van het kunstwerk.
-
+
Instroommodel
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs
===================================================================
diff -u -rbce6cff2e43c85dc54ef227fa9159df27933eb15 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision bce6cff2e43c85dc54ef227fa9159df27933eb15)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/PropertyClasses/ClosingStructureProperties.cs (.../ClosingStructureProperties.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -42,7 +42,7 @@
private const int namePropertyIndex = 1;
private const int locationPropertyIndex = 2;
private const int structureNormalOrientationPropertyIndex = 3;
- private const int closingStructureTypePropertyIndex = 4;
+ private const int inflowModelTypePropertyIndex = 4;
private const int widthFlowAperturesPropertyIndex = 5;
private const int areaFlowAperturesPropertyIndex = 6;
private const int identicalAperturesPropertyIndex = 7;
@@ -94,16 +94,16 @@
}
}
- [PropertyOrder(closingStructureTypePropertyIndex)]
+ [PropertyOrder(inflowModelTypePropertyIndex)]
[TypeConverter(typeof(EnumTypeConverter))]
[ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")]
- [ResourcesDisplayName(typeof(Resources), "ClosingStructureType_DisplayName")]
- [ResourcesDescription(typeof(Resources), "ClosingStructureType_Description")]
- public ClosingStructureType InflowModel
+ [ResourcesDisplayName(typeof(Resources), "ClosingStructureInflowModelType_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "ClosingStructureInflowModelType_Description")]
+ public ClosingStructureInflowModelType InflowModelType
{
get
{
- return data.InflowModel;
+ return data.InflowModelType;
}
}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs
===================================================================
diff -u -r7718705f6072a15ac28cb112abb949ee280391a9 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision 7718705f6072a15ac28cb112abb949ee280391a9)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -118,19 +118,21 @@
rowData[StructureFilesKeywords.ClosingStructureParameterKeyword10].NumericalValue, GetStandardDeviation(rowData[StructureFilesKeywords.ClosingStructureParameterKeyword10], structureName),
rowData[StructureFilesKeywords.ClosingStructureParameterKeyword11].NumericalValue,
rowData[StructureFilesKeywords.ClosingStructureParameterKeyword12].NumericalValue,
- (int)rowData[StructureFilesKeywords.ClosingStructureParameterKeyword13].NumericalValue,
+ (int) rowData[StructureFilesKeywords.ClosingStructureParameterKeyword13].NumericalValue,
rowData[StructureFilesKeywords.ClosingStructureParameterKeyword14].NumericalValue,
- GetClosingStructureType(rowData[StructureFilesKeywords.ClosingStructureParameterKeyword15]));
+ GetClosingStructureInflowModelType(rowData[StructureFilesKeywords.ClosingStructureParameterKeyword15]));
}
- private static ClosingStructureType GetClosingStructureType(StructuresParameterRow structureParameterRow)
+ private static ClosingStructureInflowModelType GetClosingStructureInflowModelType(StructuresParameterRow structureParameterRow)
{
string keywordValue = structureParameterRow.AlphanumericValue.ToLower();
if (keywordValue == "verticalewand")
{
- return ClosingStructureType.VerticalWall;
+ return ClosingStructureInflowModelType.VerticalWall;
}
- return keywordValue == "lagedrempel" ? ClosingStructureType.LowSill : ClosingStructureType.FloodedCulvert;
+ return keywordValue == "lagedrempel"
+ ? ClosingStructureInflowModelType.LowSill
+ : ClosingStructureInflowModelType.FloodedCulvert;
}
}
}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs
===================================================================
diff -u -r8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision 8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructureTest.cs (.../ClosingStructureTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -52,7 +52,7 @@
654.321,
42,
987.654,
- ClosingStructureType.LowSill);
+ ClosingStructureInflowModelType.LowSill);
// Assert
Assert.IsInstanceOf(structure);
@@ -129,7 +129,7 @@
Assert.AreEqual(2, structure.FailureProbabilityReparation.NumberOfDecimalPlaces);
Assert.AreEqual(987.65, structure.FailureProbabilityReparation, structure.FailureProbabilityReparation.GetAccuracy());
- Assert.AreEqual(ClosingStructureType.LowSill, structure.InflowModel);
+ Assert.AreEqual(ClosingStructureInflowModelType.LowSill, structure.InflowModelType);
}
}
}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs
===================================================================
diff -u -r8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 8a877cfbf6e7570c646ea24ad5ebc98d3b3c0e47)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Data.Test/ClosingStructuresInputTest.cs (.../ClosingStructuresInputTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -93,24 +93,23 @@
AssertEqualValue(6.0, input.StormDuration.Mean);
AssertEqualValue(0.25, input.StormDuration.CoefficientOfVariation);
Assert.AreEqual(1.0, input.ProbabilityOpenStructureBeforeFlooding);
-
Assert.AreEqual(0, input.IdenticalApertures);
}
[Test]
- [TestCase(ClosingStructureType.VerticalWall)]
- [TestCase(ClosingStructureType.LowSill)]
- [TestCase(ClosingStructureType.FloodedCulvert)]
- public void ClosingStructureType_SetValue_ReturnSetValue(ClosingStructureType type)
+ [TestCase(ClosingStructureInflowModelType.VerticalWall)]
+ [TestCase(ClosingStructureInflowModelType.LowSill)]
+ [TestCase(ClosingStructureInflowModelType.FloodedCulvert)]
+ public void InflowModelType_SetValue_ReturnSetValue(ClosingStructureInflowModelType inflowModelType)
{
// Setup
var input = new ClosingStructuresInput();
// Call
- input.ClosingStructureType = type;
+ input.InflowModelType = inflowModelType;
// Assert
- Assert.AreEqual(type, input.ClosingStructureType);
+ Assert.AreEqual(inflowModelType, input.InflowModelType);
}
[Test]
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs
===================================================================
diff -u -ra93ba11191996bb57cebb49cb3cb1cdcf2e217f7 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision a93ba11191996bb57cebb49cb3cb1cdcf2e217f7)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/PropertyClasses/ClosingStructurePropertiesTest.cs (.../ClosingStructurePropertiesTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -36,7 +36,7 @@
private const int namePropertyIndex = 0;
private const int locationPropertyIndex = 1;
private const int structureNormalOrientationPropertyIndex = 2;
- private const int closingStructureTypePropertyIndex = 3;
+ private const int inflowModelTypePropertyIndex = 3;
private const int widthFlowAperturesPropertyIndex = 4;
private const int areaFlowAperturesPropertyIndex = 5;
private const int identicalAperturesPropertyIndex = 6;
@@ -70,7 +70,7 @@
1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9,
10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16,
17.17, 18.18, 19.19, 20.20, 21.21, 22, 23.23,
- ClosingStructureType.VerticalWall);
+ ClosingStructureInflowModelType.VerticalWall);
var properties = new ClosingStructureProperties();
// Call
@@ -80,7 +80,7 @@
Assert.AreEqual(structure.Name, properties.Name);
Assert.AreEqual(structure.Location, properties.Location);
Assert.AreEqual(structure.StructureNormalOrientation, properties.StructureNormalOrientation);
- Assert.AreEqual(structure.InflowModel, properties.InflowModel);
+ Assert.AreEqual(structure.InflowModelType, properties.InflowModelType);
Assert.AreEqual("Normaal", properties.WidthFlowApertures.DistributionType);
Assert.AreEqual(structure.WidthFlowApertures, properties.WidthFlowApertures.Data);
@@ -142,7 +142,7 @@
1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9,
10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16,
17.17, 18.18, 19.19, 20.20, 21.21, 22, 23.23,
- ClosingStructureType.VerticalWall);
+ ClosingStructureInflowModelType.VerticalWall);
// Call
var properties = new ClosingStructureProperties
@@ -180,11 +180,11 @@
Assert.AreEqual("Oriëntatie [°]", structureNormalOrientationProperty.DisplayName);
Assert.AreEqual("Oriëntatie van de normaal van het kunstwerk ten opzichte van het noorden.", structureNormalOrientationProperty.Description);
- PropertyDescriptor closingStructureTypeProperty = dynamicProperties[closingStructureTypePropertyIndex];
- Assert.IsInstanceOf(closingStructureTypeProperty.Converter);
- Assert.AreEqual(schematizationCategory, closingStructureTypeProperty.Category);
- Assert.AreEqual("Instroommodel", closingStructureTypeProperty.DisplayName);
- Assert.AreEqual("Instroommodel van het kunstwerk.", closingStructureTypeProperty.Description);
+ PropertyDescriptor inflowModelTypeProperty = dynamicProperties[inflowModelTypePropertyIndex];
+ Assert.IsInstanceOf(inflowModelTypeProperty.Converter);
+ Assert.AreEqual(schematizationCategory, inflowModelTypeProperty.Category);
+ Assert.AreEqual("Instroommodel", inflowModelTypeProperty.DisplayName);
+ Assert.AreEqual("Instroommodel van het kunstwerk.", inflowModelTypeProperty.Description);
PropertyDescriptor widthFlowAperturesProperty = dynamicProperties[widthFlowAperturesPropertyIndex];
Assert.IsInstanceOf(widthFlowAperturesProperty.Converter);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs
===================================================================
diff -u -rf1c9115205cc613a4b07f9865014785ec780da79 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs (.../ClosingStructureTreeNodeInfoTest.cs) (revision f1c9115205cc613a4b07f9865014785ec780da79)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructureTreeNodeInfoTest.cs (.../ClosingStructureTreeNodeInfoTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -154,7 +154,7 @@
21.21,
22,
23.23,
- ClosingStructureType.FloodedCulvert);
+ ClosingStructureInflowModelType.FloodedCulvert);
}
}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.17929
+// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -420,18 +420,18 @@
///
/// Looks up a localized string similar to Verdronken koker.
///
- public static string StructureType_FloodedCulvert_DisplayName {
+ public static string StructureInflowModelType_FloodedCulvert_DisplayName {
get {
- return ResourceManager.GetString("StructureType_FloodedCulvert_DisplayName", resourceCulture);
+ return ResourceManager.GetString("StructureInflowModelType_FloodedCulvert_DisplayName", resourceCulture);
}
}
///
/// Looks up a localized string similar to Lage drempel.
///
- public static string StructureType_LowSill_DisplayName {
+ public static string StructureInflowModelType_LowSill_DisplayName {
get {
- return ResourceManager.GetString("StructureType_LowSill_DisplayName", resourceCulture);
+ return ResourceManager.GetString("StructureInflowModelType_LowSill_DisplayName", resourceCulture);
}
}
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -231,10 +231,10 @@
Berekening
-
+
Verdronken koker
-
+
Lage drempel
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs
===================================================================
diff -u -r3e3087bd9c43ca5a3910438b3c9daf0defcb09bf -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 3e3087bd9c43ca5a3910438b3c9daf0defcb09bf)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructure.cs (.../HeightStructure.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -40,7 +40,7 @@
/// or is null , empty or consists of whitespace.
/// Thrown when is null.
/// When any stochastic variable parameter
- /// is out if its valid domain.
+ /// is out of its valid domain.
public HeightStructure(ConstructionProperties constructionProperties) : base(constructionProperties)
{
LevelCrestStructure = new NormalDistribution(2)
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj
===================================================================
diff -u -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj (.../Ringtoets.StabilityPointStructures.Data.csproj) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Ringtoets.StabilityPointStructures.Data.csproj (.../Ringtoets.StabilityPointStructures.Data.csproj) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -52,7 +52,7 @@
-
+
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs
===================================================================
diff -u -ra897a13f58674fa253d6502c42f0b1c7a762c160 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision a897a13f58674fa253d6502c42f0b1c7a762c160)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructure.cs (.../StabilityPointStructure.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -82,11 +82,11 @@
/// The coefficient of variation of the stability properties of the quadratic model of the stability point structure.
/// The mean of the area of the flow aperture of the stability point structure.
/// The standard deviation of the area of the flow aperture of the stability point structure.
- /// The type of stability point structure.
+ /// The type of stability point structure inflow model.
/// Thrown when or is null
/// , empty or consists of whitespace.
/// Thrown when is null.
- /// When any stochastic variable parameter is out if its valid domain.
+ /// When any stochastic variable parameter is out of its valid domain.
public StabilityPointStructure(string name, string id, Point2D location,
double structureNormalOrientation,
double storageStructureAreaMean, double storageStructureAreaCoefficientOfVariation,
@@ -113,7 +113,7 @@
double stabilityLinearModelMean, double stabilityLinearModelCoefficientOfVariation,
double stabilityQuadraticModelMean, double stabilityQuadraticModelCoefficientOfVariation,
double areaFlowAperturesMean, double areaFlowAperturesStandardDeviation,
- StabilityPointStructureType inflowModel
+ StabilityPointStructureInflowModelType inflowModelType
)
: base(name, id, location, structureNormalOrientation)
{
@@ -217,7 +217,7 @@
Mean = (RoundedDouble) areaFlowAperturesMean,
StandardDeviation = (RoundedDouble) areaFlowAperturesStandardDeviation
};
- InflowModel = inflowModel;
+ InflowModelType = inflowModelType;
}
///
@@ -341,8 +341,8 @@
public LogNormalDistribution AreaFlowApertures { get; private set; }
///
- /// Gets the type of stability point structure.
+ /// Gets the type of stability point structure inflow model.
///
- public StabilityPointStructureType InflowModel { get; private set; }
+ public StabilityPointStructureInflowModelType InflowModelType { get; private set; }
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructureInflowModelType.cs
===================================================================
diff -u
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructureInflowModelType.cs (revision 0)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructureInflowModelType.cs (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -0,0 +1,44 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Utils.Attributes;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
+
+namespace Ringtoets.StabilityPointStructures.Data
+{
+ ///
+ /// Defines the types of the various inflow models.
+ ///
+ public enum StabilityPointStructureInflowModelType
+ {
+ ///
+ /// A low sill structure.
+ ///
+ [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), "StructureInflowModelType_LowSill_DisplayName")]
+ LowSill,
+
+ ///
+ /// A flooded culvert structure.
+ ///
+ [ResourcesDisplayName(typeof(RingtoetsCommonDataResources), "StructureInflowModelType_FloodedCulvert_DisplayName")]
+ FloodedCulvert
+ }
+}
Fisheye: Tag 9e3639e810a22019da1a9fdf5aa5c433a43520c1 refers to a dead (removed) revision in file `Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructureType.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs
===================================================================
diff -u -r7b02f05192ce7e2394f0ed0d727a71d2abdf8a41 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 7b02f05192ce7e2394f0ed0d727a71d2abdf8a41)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresInput.cs (.../StabilityPointStructuresInput.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -231,9 +231,9 @@
public StabilityPointStructure StabilityPointStructure { get; set; }
///
- /// Gets or sets the type of stability point structure.
+ /// Gets or sets the type of stability point structure inflow model.
///
- public StabilityPointStructureType StabilityPointStructureType { get; set; }
+ public StabilityPointStructureInflowModelType InflowModelType { get; set; }
///
/// Gets or sets the type of load schematization to use for the calculations.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresImporter.cs
===================================================================
diff -u -r7718705f6072a15ac28cb112abb949ee280391a9 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresImporter.cs (.../StabilityPointStructuresImporter.cs) (revision 7718705f6072a15ac28cb112abb949ee280391a9)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/StabilityPointStructuresImporter.cs (.../StabilityPointStructuresImporter.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -131,14 +131,16 @@
rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword23].NumericalValue, GetCoefficientOfVariation(rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword23], structureName),
rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword24].NumericalValue, GetCoefficientOfVariation(rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword24], structureName),
rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword25].NumericalValue, GetStandardDeviation(rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword25], structureName),
- GetStabilityPointStructureType(rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword26])
+ GetStabilityPointStructureInflowModelType(rowData[StructureFilesKeywords.StabilityPointStructureParameterKeyword26])
);
}
- private static StabilityPointStructureType GetStabilityPointStructureType(StructuresParameterRow structureParameterRow)
+ private static StabilityPointStructureInflowModelType GetStabilityPointStructureInflowModelType(StructuresParameterRow structureParameterRow)
{
string keywordValue = structureParameterRow.AlphanumericValue.ToLower();
- return keywordValue == "lagedrempel" ? StabilityPointStructureType.LowSill : StabilityPointStructureType.FloodedCulvert;
+ return keywordValue == "lagedrempel"
+ ? StabilityPointStructureInflowModelType.LowSill
+ : StabilityPointStructureInflowModelType.FloodedCulvert;
}
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs
===================================================================
diff -u -r7b02f05192ce7e2394f0ed0d727a71d2abdf8a41 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision 7b02f05192ce7e2394f0ed0d727a71d2abdf8a41)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructureTest.cs (.../StabilityPointStructureTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -64,7 +64,7 @@
789.012, 0.789,
890.123, 0.890,
901.234, 0.901,
- StabilityPointStructureType.FloodedCulvert
+ StabilityPointStructureInflowModelType.FloodedCulvert
);
// Assert
@@ -202,7 +202,7 @@
Assert.AreEqual(2, areaFlowApertures.StandardDeviation.NumberOfDecimalPlaces);
Assert.AreEqual(0.90, areaFlowApertures.StandardDeviation, areaFlowApertures.StandardDeviation.GetAccuracy());
- Assert.AreEqual(StabilityPointStructureType.FloodedCulvert, structure.InflowModel);
+ Assert.AreEqual(StabilityPointStructureInflowModelType.FloodedCulvert, structure.InflowModelType);
}
}
}
\ No newline at end of file
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs
===================================================================
diff -u -r7b02f05192ce7e2394f0ed0d727a71d2abdf8a41 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 7b02f05192ce7e2394f0ed0d727a71d2abdf8a41)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Data.Test/StabilityPointStructuresInputTest.cs (.../StabilityPointStructuresInputTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -124,18 +124,18 @@
# region Calculation inputs
[Test]
- [TestCase(StabilityPointStructureType.LowSill)]
- [TestCase(StabilityPointStructureType.FloodedCulvert)]
- public void StabilityPointStructureType_SetValue_ReturnSetValue(StabilityPointStructureType type)
+ [TestCase(StabilityPointStructureInflowModelType.LowSill)]
+ [TestCase(StabilityPointStructureInflowModelType.FloodedCulvert)]
+ public void InflowModelType_SetValue_ReturnSetValue(StabilityPointStructureInflowModelType inflowModelType)
{
// Setup
var input = new StabilityPointStructuresInput();
// Call
- input.StabilityPointStructureType = type;
+ input.InflowModelType = inflowModelType;
// Assert
- Assert.AreEqual(type, input.StabilityPointStructureType);
+ Assert.AreEqual(inflowModelType, input.InflowModelType);
}
[Test]
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs
===================================================================
diff -u -r44837ec463259677b2bc84d05e020de9fb5b782c -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision 44837ec463259677b2bc84d05e020de9fb5b782c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/PropertyClasses/StabilityPointStructurePropertiesTest.cs (.../StabilityPointStructurePropertiesTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -128,7 +128,7 @@
789.012, 0.789,
890.123, 0.890,
901.234, 0.901,
- StabilityPointStructureType.FloodedCulvert
+ StabilityPointStructureInflowModelType.FloodedCulvert
);
}
}
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs
===================================================================
diff -u -r44837ec463259677b2bc84d05e020de9fb5b782c -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs (.../StabilityPointStructureTreeNodeInfoTest.cs) (revision 44837ec463259677b2bc84d05e020de9fb5b782c)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructureTreeNodeInfoTest.cs (.../StabilityPointStructureTreeNodeInfoTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -131,7 +131,7 @@
789.012, 0.789,
890.123, 0.890,
901.234, 0.901,
- StabilityPointStructureType.FloodedCulvert
+ StabilityPointStructureInflowModelType.FloodedCulvert
);
}
}
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb70abd70f1cd326d1a753c5879a065149ac2ae84 -r9e3639e810a22019da1a9fdf5aa5c433a43520c1
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresContextTreeNodeInfoTest.cs (.../StabilityPointStructuresContextTreeNodeInfoTest.cs) (revision b70abd70f1cd326d1a753c5879a065149ac2ae84)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/TreeNodeInfos/StabilityPointStructuresContextTreeNodeInfoTest.cs (.../StabilityPointStructuresContextTreeNodeInfoTest.cs) (revision 9e3639e810a22019da1a9fdf5aa5c433a43520c1)
@@ -270,7 +270,7 @@
789.012, 0.789,
890.123, 0.890,
901.234, 0.901,
- StabilityPointStructureType.FloodedCulvert
+ StabilityPointStructureInflowModelType.FloodedCulvert
);
}
}