Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs (.../ClosingStructuresCalculationConfigurationExporter.cs) (revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationExporter.cs (.../ClosingStructuresCalculationConfigurationExporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -57,7 +57,7 @@
if (input.Structure != null)
{
- calculationConfiguration.StructureName = input.Structure.Name;
+ calculationConfiguration.StructureId = input.Structure.Id;
calculationConfiguration.StructureNormalOrientation = input.StructureNormalOrientation;
calculationConfiguration.InflowModelType = (ConfigurationClosingStructureInflowModelType?) new ConfigurationClosingStructureInflowModelTypeConverter().ConvertFrom(input.InflowModelType);
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -114,7 +114,7 @@
Name = readCalculation.Name
};
- if (TrySetStructure(readCalculation.StructureName, calculation)
+ if (TrySetStructure(readCalculation.StructureId, calculation)
&& TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
&& TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation)
&& TrySetStochasts(readCalculation, calculation)
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -107,7 +107,7 @@
IdenticalApertures = calculationElement.GetIntegerValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.IdenticalApertures),
ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
- StructureName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
+ StructureId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
WaveReduction = GetWaveReductionParameters(calculationElement),
AreaFlowApertures = calculationElement.GetStochastConfiguration(ClosingStructuresConfigurationSchemaIdentifiers.AreaFlowAperturesStochastName),
DrainCoefficient = calculationElement.GetStochastConfiguration(ClosingStructuresConfigurationSchemaIdentifiers.DrainCoefficientStochastName),
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationExporterTest.cs (.../ClosingStructuresCalculationConfigurationExporterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -125,7 +125,7 @@
InputParameters =
{
HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation("Locatie1"),
- Structure = new TestClosingStructure("kunstwerk1"),
+ Structure = new TestClosingStructure("kunstwerk1", "kunstwerk1"),
ForeshoreProfile = new TestForeshoreProfile("profiel1"),
FailureProbabilityStructureWithErosion = 1e-4,
StructureNormalOrientation = (RoundedDouble) 67.1,
@@ -245,7 +245,7 @@
Name = "with structure",
InputParameters =
{
- Structure = new TestClosingStructure("kunstwerk1")
+ Structure = new TestClosingStructure("kunstwerk1", "kunstwerk1")
}
};
}
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationImporterTest.cs (.../ClosingStructuresCalculationConfigurationImporterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -676,7 +676,7 @@
[TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml",
"De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")]
[TestCase("validConfigurationUnknownStructure.xml",
- "Het kunstwerk 'unknown' bestaat niet.")]
+ "Het kunstwerk met ID 'unknown' bestaat niet.")]
public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage)
{
// Setup
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -305,7 +305,7 @@
var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
@@ -339,7 +339,7 @@
var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.AreEqual(67.1, calculation.StructureNormalOrientation);
- Assert.AreEqual("kunstwerk1", calculation.StructureName);
+ Assert.AreEqual("kunstwerk1", calculation.StructureId);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.AreEqual(0.002, calculation.FactorStormDurationOpenStructure);
@@ -397,7 +397,7 @@
var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsTrue(double.IsNegativeInfinity(calculation.StructureNormalOrientation.Value));
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsTrue(double.IsPositiveInfinity(calculation.FactorStormDurationOpenStructure.Value));
@@ -453,7 +453,7 @@
var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNaN(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNaN(calculation.FactorStormDurationOpenStructure);
@@ -509,7 +509,7 @@
var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
@@ -560,7 +560,7 @@
var calculation = (ClosingStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs (.../ClosingStructuresCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs (.../ClosingStructuresCalculationConfigurationWriterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -108,7 +108,7 @@
return new ClosingStructuresCalculationConfiguration("Berekening 1")
{
HydraulicBoundaryLocationName = "Locatie1",
- StructureName = "kunstwerk1",
+ StructureId = "kunstwerk1",
ForeshoreProfileId = "profiel1",
FailureProbabilityStructureWithErosion = 1e-4,
StructureNormalOrientation = 67.1,
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationStochastAssignerTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationStochastAssignerTest.cs (.../ClosingStructuresCalculationStochastAssignerTest.cs) (revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationStochastAssignerTest.cs (.../ClosingStructuresCalculationStochastAssignerTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -93,7 +93,7 @@
// Setup
var configuration = new ClosingStructuresCalculationConfiguration("name")
{
- StructureName = "some structure"
+ StructureId = "some structure"
};
modify(configuration);
@@ -118,7 +118,7 @@
// Setup
var configuration = new ClosingStructuresCalculationConfiguration("name")
{
- StructureName = "some structure"
+ StructureId = "some structure"
};
configuration.DrainCoefficient = new StochastConfiguration();
configuration.DrainCoefficient.Mean = 8.1;
@@ -154,7 +154,7 @@
// Setup
var configuration = new ClosingStructuresCalculationConfiguration("name")
{
- StructureName = "some structure",
+ StructureId = "some structure",
LevelCrestStructureNotClosing = new StochastConfiguration
{
Mean = 1.1,
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs (.../StructureCalculationConfigurationWriter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs (.../StructureCalculationConfigurationWriter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -81,7 +81,7 @@
configuration.HydraulicBoundaryLocationName);
WriteElementWhenContentAvailable(writer,
ConfigurationSchemaIdentifiers.StructureElement,
- configuration.StructureName);
+ configuration.StructureId);
WriteElementWhenContentAvailable(writer,
ConfigurationSchemaIdentifiers.Orientation,
configuration.StructureNormalOrientation);
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs (.../StructuresCalculationConfiguration.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs (.../StructuresCalculationConfiguration.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -41,9 +41,9 @@
}
///
- /// Gets or sets the name of the structure.
+ /// Gets or sets the Id of the structure.
///
- public string StructureName { get; set; }
+ public string StructureId { get; set; }
///
/// Gets or sets the name of the hydraulic boundary location.
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs (.../StructuresCalculationStochastAssigner.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationStochastAssigner.cs (.../StructuresCalculationStochastAssigner.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -119,7 +119,7 @@
{
return ValidateBaseStochasts()
&& ValidateSpecificStochasts()
- && (Configuration.StructureName != null || GetStochastsForParameterValidation().All(ValidateNoParametersDefined));
+ && (Configuration.StructureId != null || GetStochastsForParameterValidation().All(ValidateNoParametersDefined));
}
private bool SetVariationCoefficientStochast(VariationCoefficientDefinition definition)
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs
===================================================================
diff -u -r4954f3a3c5eab3aff1b2d4c5a58364f06fe4bbd2 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4954f3a3c5eab3aff1b2d4c5a58364f06fe4bbd2)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -216,7 +216,7 @@
}
///
- /// Looks up a localized string similar to Het kunstwerk '{0}' bestaat niet..
+ /// Looks up a localized string similar to Het kunstwerk met ID '{0}' bestaat niet..
///
public static string CalculationConfigurationImporter_ReadStructure_Structure_0_does_not_exist {
get {
@@ -1415,14 +1415,14 @@
}
///
- /// Looks up a localized string similar to BEGIN TRANSACTION;
- ///CREATE TABLE "TimeIntegrationSettings" (
- /// "LocationID" INTEGER NOT NULL,
- /// "CalculationTypeID" INTEGER NOT NULL,
- /// "TimeIntegrationSchemeID" INTEGER NOT NULL,
- /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"),
- /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION
- ///);
+ /// Looks up a localized string similar to BEGIN TRANSACTION;
+ ///CREATE TABLE "TimeIntegrationSettings" (
+ /// "LocationID" INTEGER NOT NULL,
+ /// "CalculationTypeID" INTEGER NOT NULL,
+ /// "TimeIntegrationSchemeID" INTEGER NOT NULL,
+ /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"),
+ /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION
+ ///);
///CREATE TABLE "Numeri [rest of string was truncated]";.
///
public static string settings_schema {
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx
===================================================================
diff -u -r4954f3a3c5eab3aff1b2d4c5a58364f06fe4bbd2 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 4954f3a3c5eab3aff1b2d4c5a58364f06fe4bbd2)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -551,7 +551,7 @@
De locatie met hydraulische randvoorwaarden '{0}' bestaat niet.
- Het kunstwerk '{0}' bestaat niet.
+ Het kunstwerk met ID '{0}' bestaat niet.
{0} importeren afgebroken. Geen data ingelezen.
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs (.../StructureCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs (.../StructureCalculationConfigurationWriterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -144,7 +144,7 @@
VariationCoefficient = 1.2
},
StructureNormalOrientation = 5.6,
- StructureName = "Kunstwerk",
+ StructureId = "Kunstwerk",
WaveReduction = new WaveReductionConfiguration
{
BreakWaterType = ConfigurationBreakWaterType.Caisson,
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs
===================================================================
diff -u -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Import/CalculationConfigurationImporterTest.cs (.../CalculationConfigurationImporterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -661,14 +661,14 @@
StructureBase profile = null;
var valid = true;
- const string structureName = "someName";
+ const string structureId = "someAwesomeId";
const string calculationName = "name";
// Call
- Action validate = () => valid = importer.PublicTryReadStructure(structureName, calculationName, Enumerable.Empty(), out profile);
+ Action validate = () => valid = importer.PublicTryReadStructure(structureId, calculationName, Enumerable.Empty(), out profile);
// Assert
- string expectedMessage = $"Het kunstwerk '{structureName}' bestaat niet. Berekening '{calculationName}' is overgeslagen.";
+ string expectedMessage = $"Het kunstwerk met ID '{structureId}' bestaat niet. Berekening '{calculationName}' is overgeslagen.";
TestHelper.AssertLogMessageWithLevelIsGenerated(validate, Tuple.Create(expectedMessage, LogLevelConstant.Error));
Assert.IsFalse(valid);
Assert.IsNull(profile);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs (.../StructureCalculationConfigurationTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs (.../StructureCalculationConfigurationTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -51,7 +51,7 @@
Assert.IsInstanceOf(configuration);
Assert.AreEqual(name, configuration.Name);
Assert.IsNull(configuration.ModelFactorSuperCriticalFlow);
- Assert.IsNull(configuration.StructureName);
+ Assert.IsNull(configuration.StructureId);
Assert.IsNull(configuration.HydraulicBoundaryLocationName);
Assert.IsNull(configuration.StormDuration);
Assert.IsNull(configuration.StructureNormalOrientation);
@@ -72,7 +72,7 @@
const string configurationName = "some name";
var configuration = new SimpleStructuresCalculationConfiguration(configurationName);
- const string structureName = "some structure";
+ const string structureId = "some structure";
const string hydraulicBoundaryLocationName = "some hydraulic boundary location";
const string foreshoreProfileName = "some foreshore profile";
@@ -93,7 +93,7 @@
configuration.Name = configurationName;
configuration.ModelFactorSuperCriticalFlow = modelFactorSuperCriticalFlow;
configuration.StormDuration = stormDuration;
- configuration.StructureName = structureName;
+ configuration.StructureId = structureId;
configuration.HydraulicBoundaryLocationName = hydraulicBoundaryLocationName;
configuration.StructureNormalOrientation = structureNormalOrientation;
configuration.AllowedLevelIncreaseStorage = allowedLevelIncreaseStorage;
@@ -109,7 +109,7 @@
Assert.AreEqual(configurationName, configuration.Name);
Assert.AreSame(modelFactorSuperCriticalFlow, configuration.ModelFactorSuperCriticalFlow);
Assert.AreSame(stormDuration, configuration.StormDuration);
- Assert.AreEqual(structureName, configuration.StructureName);
+ Assert.AreEqual(structureId, configuration.StructureId);
Assert.AreEqual(hydraulicBoundaryLocationName, configuration.HydraulicBoundaryLocationName);
Assert.AreEqual(structureNormalOrientation, configuration.StructureNormalOrientation);
Assert.AreSame(allowedLevelIncreaseStorage, configuration.AllowedLevelIncreaseStorage);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs (.../StructuresCalculationStochastAssignerTest.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructuresCalculationStochastAssignerTest.cs (.../StructuresCalculationStochastAssignerTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -244,7 +244,7 @@
var configuration = mocks.Stub(calculationName);
mocks.ReplayAll();
- configuration.StructureName = "some name";
+ configuration.StructureId = "some ID";
var calculation = new StructuresCalculation();
@@ -303,7 +303,7 @@
var configuration = mocks.Stub(calculationName);
mocks.ReplayAll();
- configuration.StructureName = "some name";
+ configuration.StructureId = "some ID";
var random = new Random(21);
double allowedLevelIncreaseStorageMean = setStandardDeviationStochastSuccessful ? random.NextDouble() : -1;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs (.../HeightStructuresCalculationConfigurationExporter.cs) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationExporter.cs (.../HeightStructuresCalculationConfigurationExporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -55,7 +55,7 @@
if (input.Structure != null)
{
- calculationConfiguration.StructureName = input.Structure.Name;
+ calculationConfiguration.StructureId = input.Structure.Name;
calculationConfiguration.StructureNormalOrientation = input.StructureNormalOrientation;
calculationConfiguration.FailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -113,7 +113,7 @@
Name = readCalculation.Name
};
- if (TrySetStructure(readCalculation.StructureName, calculation)
+ if (TrySetStructure(readCalculation.StructureId, calculation)
&& TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
&& TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation)
&& TrySetStochasts(readCalculation, calculation)
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -98,7 +98,7 @@
configuration.ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement);
configuration.HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement);
- configuration.StructureName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement);
+ configuration.StructureId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement);
configuration.WaveReduction = GetWaveReductionParameters(calculationElement);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationImporterTest.cs (.../HeightStructuresCalculationConfigurationImporterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -567,7 +567,7 @@
[TestCase("validConfigurationUnknownHydraulicBoundaryLocation.xml",
"De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.")]
[TestCase("validConfigurationUnknownStructure.xml",
- "Het kunstwerk 'unknown' bestaat niet.")]
+ "Het kunstwerk met ID 'unknown' bestaat niet.")]
public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage)
{
// Setup
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -231,7 +231,7 @@
var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
@@ -265,7 +265,7 @@
var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.AreEqual(67.1, calculation.StructureNormalOrientation);
- Assert.AreEqual("kunstwerk1", calculation.StructureName);
+ Assert.AreEqual("kunstwerk1", calculation.StructureId);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.AreEqual(1e-6, calculation.FailureProbabilityStructureWithErosion);
@@ -309,7 +309,7 @@
var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsTrue(double.IsNegativeInfinity(calculation.StructureNormalOrientation.Value));
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsTrue(double.IsNegativeInfinity(calculation.FailureProbabilityStructureWithErosion.Value));
@@ -353,7 +353,7 @@
var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNaN(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNaN(calculation.FailureProbabilityStructureWithErosion);
@@ -397,7 +397,7 @@
var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
@@ -437,7 +437,7 @@
var calculation = (HeightStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -108,7 +108,7 @@
return new HeightStructuresCalculationConfiguration("Berekening 1")
{
HydraulicBoundaryLocationName = "Locatie1",
- StructureName = "kunstwerk1",
+ StructureId = "kunstwerk1",
ForeshoreProfileId = "profiel1",
FailureProbabilityStructureWithErosion = 1e-6,
StructureNormalOrientation = 67.1,
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationStochastAssignerTest.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationStochastAssignerTest.cs (.../HeightStructuresCalculationStochastAssignerTest.cs) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationStochastAssignerTest.cs (.../HeightStructuresCalculationStochastAssignerTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -92,7 +92,7 @@
// Setup
var configuration = new HeightStructuresCalculationConfiguration("name")
{
- StructureName = "some structure"
+ StructureId = "some structure"
};
modify(configuration);
@@ -115,7 +115,7 @@
// Setup
var configuration = new HeightStructuresCalculationConfiguration("name")
{
- StructureName = "some structure",
+ StructureId = "some structure",
LevelCrestStructure = new StochastConfiguration
{
Mean = 1.1,
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationExporter.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationExporter.cs (.../StabilityPointStructuresCalculationConfigurationExporter.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationExporter.cs (.../StabilityPointStructuresCalculationConfigurationExporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -120,7 +120,7 @@
calculationConfiguration.StabilityLinearLoadModel = input.StabilityLinearLoadModel.ToStochastConfiguration();
calculationConfiguration.StabilityQuadraticLoadModel = input.StabilityQuadraticLoadModel.ToStochastConfiguration();
calculationConfiguration.StorageStructureArea = input.StorageStructureArea.ToStochastConfiguration();
- calculationConfiguration.StructureName = input.Structure.Name;
+ calculationConfiguration.StructureId = input.Structure.Id;
calculationConfiguration.StructureNormalOrientation = input.StructureNormalOrientation;
calculationConfiguration.ThresholdHeightOpenWeir = input.ThresholdHeightOpenWeir.ToStochastConfiguration();
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -118,7 +118,7 @@
Name = readCalculation.Name
};
- if (TrySetStructure(readCalculation.StructureName, calculation)
+ if (TrySetStructure(readCalculation.StructureId, calculation)
&& TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
&& TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation)
&& TrySetEvaluationLevel(readCalculation, calculation)
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -128,7 +128,7 @@
ShipVelocity = calculationElement.GetStochastConfiguration(StabilityPointStructuresConfigurationSchemaIdentifiers.ShipVelocityStochastName),
StabilityLinearLoadModel = calculationElement.GetStochastConfiguration(StabilityPointStructuresConfigurationSchemaIdentifiers.StabilityLinearLoadModelStochastName),
StabilityQuadraticLoadModel = calculationElement.GetStochastConfiguration(StabilityPointStructuresConfigurationSchemaIdentifiers.StabilityQuadraticLoadModelStochastName),
- StructureName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
+ StructureId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
StorageStructureArea = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StorageStructureAreaStochastName),
StormDuration = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.StormDurationStochastName),
StructureNormalOrientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation),
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationExporterTest.cs (.../StabilityPointStructuresCalculationConfigurationExporterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -127,7 +127,7 @@
Name = "with LoadSchematizationType set to Linear and InflowModelType to FloodedCulvert",
InputParameters =
{
- Structure = new TestStabilityPointStructure("kunstwerk1"),
+ Structure = new TestStabilityPointStructure("kunstwerk1", "kunstwerk1"),
LoadSchematizationType = LoadSchematizationType.Linear,
InflowModelType = StabilityPointStructureInflowModelType.FloodedCulvert
}
@@ -141,7 +141,7 @@
Name = "with LoadSchematizationType set to Qadratic and InflowModelType to LowSil",
InputParameters =
{
- Structure = new TestStabilityPointStructure("kunstwerk1"),
+ Structure = new TestStabilityPointStructure("kunstwerk1", "kunstwerk1"),
LoadSchematizationType = LoadSchematizationType.Quadratic,
InflowModelType = StabilityPointStructureInflowModelType.LowSill
}
@@ -155,7 +155,7 @@
Name = "with structure",
InputParameters =
{
- Structure = new TestStabilityPointStructure("kunstwerk1")
+ Structure = new TestStabilityPointStructure("kunstwerk1", "kunstwerk1")
}
};
}
@@ -207,7 +207,7 @@
InputParameters =
{
ForeshoreProfile = new TestForeshoreProfile("profiel1"),
- Structure = new TestStabilityPointStructure("kunstwerk1"),
+ Structure = new TestStabilityPointStructure("kunstwerk1", "kunstwerk1"),
AllowedLevelIncreaseStorage = new LogNormalDistribution
{
Mean = (RoundedDouble) 0.2,
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r6b18e2c0134c97e01ba13c518fb7a8efa7f42253 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision 6b18e2c0134c97e01ba13c518fb7a8efa7f42253)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationImporterTest.cs (.../StabilityPointStructuresCalculationConfigurationImporterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -1108,7 +1108,7 @@
"De locatie met hydraulische randvoorwaarden 'unknown' bestaat niet.",
TestName = "Import_UnknownData({0:80})")]
[TestCase("validConfigurationUnknownStructure.xml",
- "Het kunstwerk 'unknown' bestaat niet.",
+ "Het kunstwerk met ID 'unknown' bestaat niet.",
TestName = "Import_UnknownData({0:80})")]
public void Import_ValidConfigurationUnknownData_LogMessageAndContinueImport(string file, string expectedErrorMessage)
{
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -464,7 +464,7 @@
Assert.AreEqual(7, calculation.StructureNormalOrientation);
- Assert.AreEqual("kunstwerk1", calculation.StructureName);
+ Assert.AreEqual("kunstwerk1", calculation.StructureId);
Assert.AreEqual(1.2, calculation.ThresholdHeightOpenWeir.Mean);
Assert.AreEqual(0.1, calculation.ThresholdHeightOpenWeir.StandardDeviation);
@@ -499,7 +499,7 @@
Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
Assert.AreEqual(9.81, calculation.VolumicWeightWater);
- Assert.AreEqual("kunstwerk1", calculation.StructureName);
+ Assert.AreEqual("kunstwerk1", calculation.StructureId);
Assert.AreEqual(ConfigurationBreakWaterType.Dam, calculation.WaveReduction.BreakWaterType);
Assert.AreEqual(1.23, calculation.WaveReduction.BreakWaterHeight);
Assert.IsTrue(calculation.WaveReduction.UseBreakWater);
@@ -598,7 +598,7 @@
Assert.IsNull(calculation.ProbabilityCollisionSecondaryStructure);
Assert.IsNull(calculation.VolumicWeightWater);
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.VerticalDistance);
Assert.IsNull(calculation.WaveReduction);
@@ -676,7 +676,7 @@
Assert.IsNull(calculation.ProbabilityCollisionSecondaryStructure);
Assert.IsNull(calculation.VolumicWeightWater);
Assert.IsNull(calculation.StructureNormalOrientation);
- Assert.IsNull(calculation.StructureName);
+ Assert.IsNull(calculation.StructureId);
Assert.IsNull(calculation.VerticalDistance);
Assert.IsNull(calculation.WaveReduction);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs
===================================================================
diff -u -r7179946a6b62ebb33a90167c52af7c32f1100d73 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs (.../StabilityPointStructuresCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs (.../StabilityPointStructuresCalculationConfigurationWriterTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -208,7 +208,7 @@
Mean = 0.18,
VariationCoefficient = 0.28
},
- StructureName = "kunstwerk1",
+ StructureId = "kunstwerk1",
StructureNormalOrientation = 6.6,
StorageStructureArea = new StochastConfiguration
{
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationStochastAssignerTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationStochastAssignerTest.cs (.../StabilityPointStructuresCalculationStochastAssignerTest.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationStochastAssignerTest.cs (.../StabilityPointStructuresCalculationStochastAssignerTest.cs) (revision 9f8c8ff1cd49a1764ff3dde12eea6be35d9c34a7)
@@ -58,7 +58,7 @@
// Setup
var configuration = new StabilityPointStructuresCalculationConfiguration("name")
{
- StructureName = "some structure"
+ StructureId = "some structure"
};
configuration.DrainCoefficient = new StochastConfiguration();
configuration.DrainCoefficient.Mean = 8.1;
@@ -96,7 +96,7 @@
// Setup
var configuration = new StabilityPointStructuresCalculationConfiguration("name")
{
- StructureName = "some structure"
+ StructureId = "some structure"
};
configuration.FlowVelocityStructureClosable = new StochastConfiguration();
configuration.FlowVelocityStructureClosable.Mean = 8.1;
@@ -238,7 +238,7 @@
{
Mean = 11
},
- StructureName = "some structure"
+ StructureId = "some structure"
};
var calculation = new StructuresCalculation();
@@ -268,7 +268,7 @@
// Setup
var configuration = new StabilityPointStructuresCalculationConfiguration("name")
{
- StructureName = "some structure"
+ StructureId = "some structure"
};
updateConfiguration(configuration);