Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rf4c28926da2401b1fddbbe7f907fd663f0f5f4dc -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision f4c28926da2401b1fddbbe7f907fd663f0f5f4dc)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationImporter.cs (.../ClosingStructuresCalculationConfigurationImporter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -116,7 +116,7 @@
if (TrySetStructure(readCalculation.StructureName, calculation)
&& TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
- && TrySetForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
+ && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation)
&& TrySetStochasts(readCalculation, calculation)
&& TrySetOrientation(readCalculation, calculation)
&& TrySetFailureProbabilityStructureWithErosion(readCalculation, calculation)
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/Configurations/ClosingStructuresCalculationConfigurationReader.cs (.../ClosingStructuresCalculationConfigurationReader.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -105,7 +105,7 @@
FailureProbabilityReparation = calculationElement.GetDoubleValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.FailureProbabilityReparation),
ProbabilityOrFrequencyOpenStructureBeforeFlooding = calculationElement.GetDoubleValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.ProbabilityOrFrequencyOpenStructureBeforeFlooding),
IdenticalApertures = calculationElement.GetIntegerValueFromDescendantElement(ClosingStructuresConfigurationSchemaIdentifiers.IdenticalApertures),
- ForeshoreProfileName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
+ ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
StructureName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement),
WaveReduction = GetWaveReductionParameters(calculationElement),
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationReaderTest.cs (.../ClosingStructuresCalculationConfigurationReaderTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -307,7 +307,7 @@
Assert.IsNull(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Assert.IsNull(calculation.LevelCrestStructureNotClosing);
@@ -341,7 +341,7 @@
Assert.AreEqual(67.1, calculation.StructureNormalOrientation);
Assert.AreEqual("kunstwerk1", calculation.StructureName);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
- Assert.AreEqual("profiel1", calculation.ForeshoreProfileName);
+ Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.AreEqual(0.002, calculation.FactorStormDurationOpenStructure);
Assert.AreEqual(0.03, calculation.ProbabilityOrFrequencyOpenStructureBeforeFlooding);
Assert.AreEqual(0.22, calculation.FailureProbabilityOpenStructure);
@@ -399,7 +399,7 @@
Assert.IsTrue(double.IsNegativeInfinity(calculation.StructureNormalOrientation.Value));
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsTrue(double.IsPositiveInfinity(calculation.FactorStormDurationOpenStructure.Value));
Assert.IsTrue(double.IsPositiveInfinity(calculation.ProbabilityOrFrequencyOpenStructureBeforeFlooding.Value));
Assert.IsTrue(double.IsNegativeInfinity(calculation.FailureProbabilityOpenStructure.Value));
@@ -455,7 +455,7 @@
Assert.IsNaN(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNaN(calculation.FactorStormDurationOpenStructure);
Assert.IsNaN(calculation.ProbabilityOrFrequencyOpenStructureBeforeFlooding);
Assert.IsNaN(calculation.FailureProbabilityOpenStructure);
@@ -511,7 +511,7 @@
Assert.IsNull(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
- Assert.AreEqual("profiel1", calculation.ForeshoreProfileName);
+ Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Assert.IsNull(calculation.FailureProbabilityOpenStructure);
@@ -562,7 +562,7 @@
Assert.IsNull(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Assert.IsNull(calculation.FailureProbabilityOpenStructure);
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs
===================================================================
diff -u -rf88343c0590cb04c7135ce141872940e59325927 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs (.../ClosingStructuresCalculationConfigurationWriterTest.cs) (revision f88343c0590cb04c7135ce141872940e59325927)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.IO.Test/Configurations/ClosingStructuresCalculationConfigurationWriterTest.cs (.../ClosingStructuresCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -109,7 +109,7 @@
{
HydraulicBoundaryLocationName = "Locatie1",
StructureName = "kunstwerk1",
- ForeshoreProfileName = "profiel1",
+ ForeshoreProfileId = "profiel1",
FailureProbabilityStructureWithErosion = 1e-4,
StructureNormalOrientation = 67.1,
FactorStormDurationOpenStructure = 1.0,
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs (.../StructureCalculationConfigurationWriter.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Export/StructureCalculationConfigurationWriter.cs (.../StructureCalculationConfigurationWriter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -90,7 +90,7 @@
configuration.FailureProbabilityStructureWithErosion);
WriteElementWhenContentAvailable(writer,
ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement,
- configuration.ForeshoreProfileName);
+ configuration.ForeshoreProfileId);
WriteSpecificStructureParameters(configuration, writer);
}
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/ConfigurationValidationExtensions.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/ConfigurationValidationExtensions.cs (.../ConfigurationValidationExtensions.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/ConfigurationValidationExtensions.cs (.../ConfigurationValidationExtensions.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -67,7 +67,7 @@
{
log.LogCalculationConversionError(string.Format(
Resources.ReadForeshoreProfile_ForeshoreProfile_0_has_no_geometry_and_cannot_be_used,
- foreshoreProfile.Name),
+ foreshoreProfile.Id),
calculationName);
return false;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/WaveReductionConversionExtensions.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/WaveReductionConversionExtensions.cs (.../WaveReductionConversionExtensions.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Helpers/WaveReductionConversionExtensions.cs (.../WaveReductionConversionExtensions.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -56,7 +56,7 @@
return;
}
- configuration.ForeshoreProfileName = input.ForeshoreProfile?.Name;
+ configuration.ForeshoreProfileId = input.ForeshoreProfile?.Id;
configuration.WaveReduction = new WaveReductionConfiguration
{
UseForeshoreProfile = input.UseForeshore,
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/Import/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -220,20 +220,20 @@
}
///
- /// Tries to find the foreshore profile with the given
+ /// Tries to find the foreshore profile with the given
/// in the .
///
- /// The name of the foreshore profile to find.
+ /// The id of the foreshore profile to find.
/// Name of the calculation to assign the foreshore profile to.
/// The collection of to search in.
/// The foreshore profile with the name equal to
- /// if there was any.
- /// true if no is given, or when a foreshore profile with
- /// the name was found, false otherwise.
+ /// if there was any.
+ /// true if no is given, or when a foreshore profile with
+ /// the name was found, false otherwise.
/// Thrown when
/// or is null.
protected bool TryReadForeshoreProfile(
- string foreshoreProfileName,
+ string foreshoreProfileId,
string calculationName,
IEnumerable foreshoreProfiles,
out ForeshoreProfile foundForeshoreProfile)
@@ -249,15 +249,15 @@
foundForeshoreProfile = null;
- if (foreshoreProfileName != null)
+ if (foreshoreProfileId != null)
{
- ForeshoreProfile foreshoreProfile = foreshoreProfiles.FirstOrDefault(fp => fp.Name == foreshoreProfileName);
+ ForeshoreProfile foreshoreProfile = foreshoreProfiles.FirstOrDefault(fp => fp.Id == foreshoreProfileId);
if (foreshoreProfile == null)
{
Log.LogCalculationConversionError(string.Format(
Resources.CalculationConfigurationImporter_ReadForeshoreProfile_ForeshoreProfile_0_does_not_exist,
- foreshoreProfileName),
+ foreshoreProfileId),
calculationName);
return false;
Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs (.../StructuresCalculationConfiguration.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/StructuresCalculationConfiguration.cs (.../StructuresCalculationConfiguration.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -101,9 +101,9 @@
public WaveReductionConfiguration WaveReduction { get; set; }
///
- /// Gets or sets the name of the foreshore profile.
+ /// Gets or sets the id of the foreshore profile.
///
- public string ForeshoreProfileName { get; set; }
+ public string ForeshoreProfileId { get; set; }
///
/// Gets or sets the name of the calculation.
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs
===================================================================
diff -u -red4b032b9903f394deb9691c2c39a9f2122ab0f5 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs (.../TestForeshoreProfileTest.cs) (revision ed4b032b9903f394deb9691c2c39a9f2122ab0f5)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil.Test/TestForeshoreProfileTest.cs (.../TestForeshoreProfileTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -64,18 +64,18 @@
}
[Test]
- public void Constructor_WithName_ReturnForeshoreProfileWithGivenNameAndNoBreakWater()
+ public void Constructor_WithId_ReturnForeshoreProfileWithGivenNameAndNoBreakWater()
{
// Setup
- const string name = "test";
+ const string id = "test";
// Call
- ForeshoreProfile profile = new TestForeshoreProfile(name);
+ ForeshoreProfile profile = new TestForeshoreProfile(id);
// Assert
Assert.IsEmpty(profile.Geometry);
- Assert.AreEqual("id", profile.Id);
- Assert.AreEqual(name, profile.Name);
+ Assert.AreEqual(id, profile.Id);
+ Assert.AreEqual("name", profile.Name);
Assert.IsFalse(profile.HasBreakWater);
Assert.AreEqual(0.0, profile.X0);
Assert.AreEqual(0.0, profile.Orientation.Value);
@@ -103,23 +103,23 @@
}
[Test]
- public void Constructor_WithNameAndGeometry_ReturnForeshoreProfileWithGivenNameAndGeometry()
+ public void Constructor_WithIdAndGeometry_ReturnForeshoreProfileWithGivenNameAndGeometry()
{
// Setup
- const string name = "test";
+ const string id = "test";
var geometry = new[]
{
new Point2D(0, 0),
new Point2D(1, 1)
};
// Call
- ForeshoreProfile profile = new TestForeshoreProfile(name, geometry);
+ ForeshoreProfile profile = new TestForeshoreProfile(id, geometry);
// Assert
CollectionAssert.AreEqual(geometry, profile.Geometry);
- Assert.AreEqual("id", profile.Id);
- Assert.AreEqual(name, profile.Name);
+ Assert.AreEqual(id, profile.Id);
+ Assert.AreEqual("name", profile.Name);
Assert.IsFalse(profile.HasBreakWater);
Assert.AreEqual(0.0, profile.X0);
Assert.AreEqual(0.0, profile.Orientation.Value);
Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs
===================================================================
diff -u -red4b032b9903f394deb9691c2c39a9f2122ab0f5 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision ed4b032b9903f394deb9691c2c39a9f2122ab0f5)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -51,9 +51,9 @@
/// Creates a new instance of the with a given
/// name and no .
///
- /// Name of the profile.
- public TestForeshoreProfile(string profileName)
- : this("id", profileName, new Point2D(0, 0), null, Enumerable.Empty()) {}
+ /// Id of the profile.
+ public TestForeshoreProfile(string profileId)
+ : this(profileId, "name", new Point2D(0, 0), null, Enumerable.Empty()) {}
///
/// Creates a new instance of the with a given
@@ -70,10 +70,10 @@
/// Creates a new instance of the with a given
/// name and geometry.
///
- /// Name of the profile.
+ /// Name of the profile.
/// The geometry of the profile.
- public TestForeshoreProfile(string profileName, IEnumerable geometry)
- : this("id", profileName, new Point2D(0, 0), null, geometry) {}
+ public TestForeshoreProfile(string profileId, IEnumerable geometry)
+ : this(profileId, "name", new Point2D(0, 0), null, geometry) {}
///
/// Creates a new instance of with a specified .
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs (.../StructureCalculationConfigurationWriterTest.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/StructureCalculationConfigurationWriterTest.cs (.../StructureCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -126,7 +126,7 @@
Mean = 5.4,
StandardDeviation = 1.1
},
- ForeshoreProfileName = "Voorland",
+ ForeshoreProfileId = "Voorland",
HydraulicBoundaryLocationName = "Randvoorwaardelocatie",
ModelFactorSuperCriticalFlow = new StochastConfiguration
{
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/WaveReductionConversionExtensionsTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/WaveReductionConversionExtensionsTest.cs (.../WaveReductionConversionExtensionsTest.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/WaveReductionConversionExtensionsTest.cs (.../WaveReductionConversionExtensionsTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -76,7 +76,7 @@
configuration.SetConfigurationForeshoreProfileDependendProperties(structureInput);
// Assert
- Assert.IsNull(configuration.ForeshoreProfileName);
+ Assert.IsNull(configuration.ForeshoreProfileId);
Assert.IsNull(configuration.WaveReduction);
}
@@ -106,7 +106,7 @@
configuration.SetConfigurationForeshoreProfileDependendProperties(structureInput);
// Assert
- Assert.AreEqual("profile", configuration.ForeshoreProfileName);
+ Assert.AreEqual("id", configuration.ForeshoreProfileId);
WaveReductionConfiguration waveReduction = configuration.WaveReduction;
Assert.AreEqual(structureInput.UseBreakWater, waveReduction.UseBreakWater);
Assert.AreEqual(structureInput.UseForeshore, waveReduction.UseForeshoreProfile);
@@ -133,7 +133,7 @@
configuration.SetConfigurationForeshoreProfileDependendProperties(structureInput);
// Assert
- Assert.AreEqual(structureInput.ForeshoreProfile.Name, configuration.ForeshoreProfileName);
+ Assert.AreEqual(structureInput.ForeshoreProfile.Name, configuration.ForeshoreProfileId);
WaveReductionConfiguration waveReduction = configuration.WaveReduction;
Assert.AreEqual(structureInput.UseBreakWater, waveReduction.UseBreakWater);
Assert.AreEqual(structureInput.UseForeshore, waveReduction.UseForeshoreProfile);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs
===================================================================
diff -u -rb3b6c13cf736c134476b3db34281332d01ca86b1 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs (.../StructureCalculationConfigurationTest.cs) (revision b3b6c13cf736c134476b3db34281332d01ca86b1)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/StructureCalculationConfigurationTest.cs (.../StructureCalculationConfigurationTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -61,7 +61,7 @@
Assert.IsNull(configuration.CriticalOvertoppingDischarge);
Assert.IsNull(configuration.FailureProbabilityStructureWithErosion);
Assert.IsNull(configuration.WidthFlowApertures);
- Assert.IsNull(configuration.ForeshoreProfileName);
+ Assert.IsNull(configuration.ForeshoreProfileId);
Assert.IsNull(configuration.WaveReduction);
}
@@ -102,7 +102,7 @@
configuration.CriticalOvertoppingDischarge = criticalOvertoppingDischarge;
configuration.FailureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion;
configuration.WidthFlowApertures = widthFlowApertures;
- configuration.ForeshoreProfileName = foreshoreProfileName;
+ configuration.ForeshoreProfileId = foreshoreProfileName;
configuration.WaveReduction = waveReduction;
// Assert
@@ -118,7 +118,7 @@
Assert.AreSame(criticalOvertoppingDischarge, configuration.CriticalOvertoppingDischarge);
Assert.AreEqual(failureProbabilityStructureWithErosion, configuration.FailureProbabilityStructureWithErosion);
Assert.AreSame(widthFlowApertures, configuration.WidthFlowApertures);
- Assert.AreEqual(foreshoreProfileName, configuration.ForeshoreProfileName);
+ Assert.AreEqual(foreshoreProfileName, configuration.ForeshoreProfileId);
Assert.AreSame(waveReduction, configuration.WaveReduction);
}
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rf4c28926da2401b1fddbbe7f907fd663f0f5f4dc -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision f4c28926da2401b1fddbbe7f907fd663f0f5f4dc)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -115,7 +115,7 @@
if (TrySetStructure(readCalculation.StructureName, calculation)
&& TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
- && TrySetForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
+ && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation)
&& TrySetStochasts(readCalculation, calculation)
&& TrySetOrientation(readCalculation, calculation)
&& TrySetFailureProbabilityStructureWithErosion(readCalculation, calculation)
@@ -252,11 +252,11 @@
return false;
}
- private bool TrySetForeshoreProfile(string foreshoreProfileName, StructuresCalculation calculation)
+ private bool TrySetForeshoreProfile(string foreshoreProfileId, StructuresCalculation calculation)
{
ForeshoreProfile foreshoreProfile;
- if (TryReadForeshoreProfile(foreshoreProfileName, calculation.Name, availableForeshoreProfiles, out foreshoreProfile))
+ if (TryReadForeshoreProfile(foreshoreProfileId, calculation.Name, availableForeshoreProfiles, out foreshoreProfile))
{
calculation.InputParameters.ForeshoreProfile = foreshoreProfile;
return true;
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationReader.cs (.../HeightStructuresCalculationConfigurationReader.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -96,7 +96,7 @@
configuration.FailureProbabilityStructureWithErosion = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.FailureProbabilityStructureWithErosionElement);
configuration.StructureNormalOrientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation);
- configuration.ForeshoreProfileName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement);
+ configuration.ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement);
configuration.HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement);
configuration.StructureName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.StructureElement);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationReaderTest.cs (.../HeightStructuresCalculationConfigurationReaderTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -233,7 +233,7 @@
Assert.IsNull(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Assert.IsNull(calculation.LevelCrestStructure);
@@ -267,7 +267,7 @@
Assert.AreEqual(67.1, calculation.StructureNormalOrientation);
Assert.AreEqual("kunstwerk1", calculation.StructureName);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
- Assert.AreEqual("profiel1", calculation.ForeshoreProfileName);
+ Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.AreEqual(1e-6, calculation.FailureProbabilityStructureWithErosion);
Assert.AreEqual(4.3, calculation.LevelCrestStructure.Mean);
@@ -311,7 +311,7 @@
Assert.IsTrue(double.IsNegativeInfinity(calculation.StructureNormalOrientation.Value));
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsTrue(double.IsNegativeInfinity(calculation.FailureProbabilityStructureWithErosion.Value));
Assert.IsTrue(double.IsNegativeInfinity(calculation.LevelCrestStructure.Mean.Value));
@@ -355,7 +355,7 @@
Assert.IsNaN(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNaN(calculation.FailureProbabilityStructureWithErosion);
Assert.IsNaN(calculation.LevelCrestStructure.Mean);
@@ -399,7 +399,7 @@
Assert.IsNull(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
- Assert.AreEqual("profiel1", calculation.ForeshoreProfileName);
+ Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Assert.IsNull(calculation.LevelCrestStructure);
@@ -439,7 +439,7 @@
Assert.IsNull(calculation.StructureNormalOrientation);
Assert.IsNull(calculation.StructureName);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
Assert.IsNull(calculation.LevelCrestStructure.Mean);
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs
===================================================================
diff -u -r4bf59bb3506b840b284efe0c0f4431b7876e0e5b -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision 4bf59bb3506b840b284efe0c0f4431b7876e0e5b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/Configurations/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -109,7 +109,7 @@
{
HydraulicBoundaryLocationName = "Locatie1",
StructureName = "kunstwerk1",
- ForeshoreProfileName = "profiel1",
+ ForeshoreProfileId = "profiel1",
FailureProbabilityStructureWithErosion = 1e-6,
StructureNormalOrientation = 67.1,
WaveReduction = new WaveReductionConfiguration
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs
===================================================================
diff -u -red4b032b9903f394deb9691c2c39a9f2122ab0f5 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs (.../ForeshoreProfileTreeNodeInfoTest.cs) (revision ed4b032b9903f394deb9691c2c39a9f2122ab0f5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/ForeshoreProfileTreeNodeInfoTest.cs (.../ForeshoreProfileTreeNodeInfoTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -93,7 +93,7 @@
{
// Setup
const string profileName = "Random profile name";
- ForeshoreProfile foreshoreProfile = new TestForeshoreProfile(profileName);
+ ForeshoreProfile foreshoreProfile = new TestForeshoreProfile(profileName, "id");
// Call
string text = info.Text(foreshoreProfile);
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/ExportableWaveConditions.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/ExportableWaveConditions.cs (.../ExportableWaveConditions.cs) (revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/ExportableWaveConditions.cs (.../ExportableWaveConditions.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -67,7 +67,7 @@
LocationYCoordinate = waveConditionsInput.HydraulicBoundaryLocation.Location.Y;
if (waveConditionsInput.ForeshoreProfile != null)
{
- ForeshoreName = waveConditionsInput.ForeshoreProfile.Name;
+ ForeshoreId = waveConditionsInput.ForeshoreProfile.Id;
}
UseForeshore = waveConditionsInput.UseForeshore;
UseBreakWater = waveConditionsInput.UseBreakWater;
@@ -110,9 +110,9 @@
public CoverType CoverType { get; private set; }
///
- /// Gets the name of the foreshore.
+ /// Gets the id of the foreshore.
///
- public string ForeshoreName { get; private set; }
+ public string ForeshoreId { get; private set; }
///
/// Gets a value indicating whether a foreshore profile was used in the calculation.
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Writers/WaveConditionsCalculationConfigurationWriter.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Writers/WaveConditionsCalculationConfigurationWriter.cs (.../WaveConditionsCalculationConfigurationWriter.cs) (revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Writers/WaveConditionsCalculationConfigurationWriter.cs (.../WaveConditionsCalculationConfigurationWriter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -102,7 +102,7 @@
{
writer.WriteElementString(
WaveConditionsCalculationConfigurationSchemaIdentifiers.ForeshoreProfile,
- foreshoreProfile.Name);
+ foreshoreProfile.Id);
}
}
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Writers/WaveConditionsWriter.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Writers/WaveConditionsWriter.cs (.../WaveConditionsWriter.cs) (revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Writers/WaveConditionsWriter.cs (.../WaveConditionsWriter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -82,7 +82,7 @@
exportableWaveConditions.LocationName,
new RoundedDouble(3, exportableWaveConditions.LocationXCoordinate).ToString(null, CultureInfo.InvariantCulture),
new RoundedDouble(3, exportableWaveConditions.LocationYCoordinate).ToString(null, CultureInfo.InvariantCulture),
- exportableWaveConditions.ForeshoreName ?? string.Empty,
+ exportableWaveConditions.ForeshoreId ?? string.Empty,
exportableWaveConditions.UseBreakWater ? Resources.Yes : Resources.No,
exportableWaveConditions.UseForeshore ? Resources.Yes : Resources.No,
exportableWaveConditions.CoverType.Name,
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r0c889cff16b60d497640a21c3c9a2ede888dd263 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 0c889cff16b60d497640a21c3c9a2ede888dd263)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -557,7 +557,7 @@
var input = new WaveConditionsInput
{
- ForeshoreProfile = new TestForeshoreProfile(string.Empty)
+ ForeshoreProfile = new TestForeshoreProfile()
};
var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], locations);
@@ -590,7 +590,7 @@
var input = new WaveConditionsInput
{
- ForeshoreProfile = new TestForeshoreProfile(string.Empty)
+ ForeshoreProfile = new TestForeshoreProfile()
};
var calculation = new TestWaveConditionsCalculation();
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -141,7 +141,7 @@
Assert.AreEqual("hblName", exportableWaveConditions.LocationName);
Assert.AreEqual(1.0, exportableWaveConditions.LocationXCoordinate);
Assert.AreEqual(8.0, exportableWaveConditions.LocationYCoordinate);
- Assert.AreEqual("id", exportableWaveConditions.ForeshoreName);
+ Assert.AreEqual("id", exportableWaveConditions.ForeshoreId);
Assert.AreEqual(false, exportableWaveConditions.UseBreakWater);
Assert.AreEqual(true, exportableWaveConditions.UseForeshore);
Assert.AreEqual(CoverType.StoneCoverColumns, exportableWaveConditions.CoverType);
@@ -237,7 +237,7 @@
Assert.AreEqual("hblName", exportableWaveConditions.LocationName);
Assert.AreEqual(1.0, exportableWaveConditions.LocationXCoordinate);
Assert.AreEqual(8.0, exportableWaveConditions.LocationYCoordinate);
- Assert.AreEqual("id", exportableWaveConditions.ForeshoreName);
+ Assert.AreEqual("id", exportableWaveConditions.ForeshoreId);
Assert.AreEqual(false, exportableWaveConditions.UseBreakWater);
Assert.AreEqual(true, exportableWaveConditions.UseForeshore);
Assert.AreEqual(CoverType.Grass, exportableWaveConditions.CoverType);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -101,7 +101,7 @@
Assert.AreEqual("hblName", exportableWaveConditions.LocationName);
Assert.AreEqual(1.0, exportableWaveConditions.LocationXCoordinate);
Assert.AreEqual(8.0, exportableWaveConditions.LocationYCoordinate);
- Assert.AreEqual(null, exportableWaveConditions.ForeshoreName);
+ Assert.AreEqual(null, exportableWaveConditions.ForeshoreId);
Assert.AreEqual(useBreakWater, exportableWaveConditions.UseBreakWater);
Assert.AreEqual(useForeshore, exportableWaveConditions.UseForeshore);
Assert.AreEqual(CoverType.StoneCoverColumns, exportableWaveConditions.CoverType);
@@ -140,7 +140,7 @@
Assert.AreEqual("hblName", exportableWaveConditions.LocationName);
Assert.AreEqual(1.0, exportableWaveConditions.LocationXCoordinate);
Assert.AreEqual(8.0, exportableWaveConditions.LocationYCoordinate);
- Assert.AreEqual("profile", exportableWaveConditions.ForeshoreName);
+ Assert.AreEqual("profile", exportableWaveConditions.ForeshoreId);
Assert.AreEqual(useBreakWater, exportableWaveConditions.UseBreakWater);
Assert.AreEqual(useForeshore, exportableWaveConditions.UseForeshore);
Assert.AreEqual(CoverType.StoneCoverColumns, exportableWaveConditions.CoverType);
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs
===================================================================
diff -u -r0ee0d86b58275264171be7f91afa87b7edd0d67a -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 0ee0d86b58275264171be7f91afa87b7edd0d67a)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Importers/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -272,8 +272,8 @@
new Point2D(2, 2)
}, new BreakWater(BreakWaterType.Caisson, 0), new ForeshoreProfile.ConstructionProperties
{
- Id = "id",
- Name = "Voorlandprofiel"
+ Id = "Voorlandprofiel",
+ Name = "VoorlandProfielName"
});
var importer = new WaveConditionsCalculationConfigurationImporter(
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs
===================================================================
diff -u -rf4c28926da2401b1fddbbe7f907fd663f0f5f4dc -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision f4c28926da2401b1fddbbe7f907fd663f0f5f4dc)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationImporter.cs (.../StabilityPointStructuresCalculationConfigurationImporter.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -120,7 +120,7 @@
if (TrySetStructure(readCalculation.StructureName, calculation)
&& TrySetHydraulicBoundaryLocation(readCalculation.HydraulicBoundaryLocationName, calculation)
- && TrySetForeshoreProfile(readCalculation.ForeshoreProfileName, calculation)
+ && TrySetForeshoreProfile(readCalculation.ForeshoreProfileId, calculation)
&& TrySetEvaluationLevel(readCalculation, calculation)
&& TrySetFailureProbabilityRepairClosure(readCalculation, calculation)
&& TrySetFailureProbabilityStructureWithErosion(readCalculation, calculation)
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.IO/Configurations/StabilityPointStructuresCalculationConfigurationReader.cs (.../StabilityPointStructuresCalculationConfigurationReader.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -110,7 +110,7 @@
FailureProbabilityStructureWithErosion = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.FailureProbabilityStructureWithErosionElement),
FlowVelocityStructureClosable = calculationElement.GetStochastConfiguration(StabilityPointStructuresConfigurationSchemaIdentifiers.FlowVelocityStructureClosableStochastName),
FlowWidthAtBottomProtection = calculationElement.GetStochastConfiguration(ConfigurationSchemaIdentifiers.FlowWidthAtBottomProtectionStochastName),
- ForeshoreProfileName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
+ ForeshoreProfileId = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.ForeshoreProfileNameElement),
HydraulicBoundaryLocationName = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
InflowModelType = (ConfigurationStabilityPointStructuresInflowModelType?)
calculationElement.GetConvertedValueFromDescendantStringElement(
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationReaderTest.cs (.../StabilityPointStructuresCalculationConfigurationReaderTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -415,7 +415,7 @@
Assert.AreEqual(0.0001, calculation.FailureProbabilityStructureWithErosion);
- Assert.AreEqual("profiel1", calculation.ForeshoreProfileName);
+ Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.AreEqual(15.2, calculation.FlowWidthAtBottomProtection.Mean);
Assert.AreEqual(0.1, calculation.FlowWidthAtBottomProtection.StandardDeviation);
@@ -496,7 +496,7 @@
var calculation = (StabilityPointStructuresCalculationConfiguration) readConfigurationItems[0];
Assert.AreEqual(0.01, calculation.FactorStormDurationOpenStructure);
- Assert.AreEqual("profiel1", calculation.ForeshoreProfileName);
+ Assert.AreEqual("profiel1", calculation.ForeshoreProfileId);
Assert.AreEqual("Locatie1", calculation.HydraulicBoundaryLocationName);
Assert.AreEqual(9.81, calculation.VolumicWeightWater);
Assert.AreEqual("kunstwerk1", calculation.StructureName);
@@ -590,7 +590,7 @@
Assert.IsNull(calculation.FactorStormDurationOpenStructure);
Assert.IsNull(calculation.FailureProbabilityRepairClosure);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.InflowModelType);
Assert.IsNull(calculation.LevellingCount);
@@ -668,7 +668,7 @@
Assert.IsNull(calculation.FactorStormDurationOpenStructure);
Assert.IsNull(calculation.FailureProbabilityRepairClosure);
Assert.IsNull(calculation.FailureProbabilityStructureWithErosion);
- Assert.IsNull(calculation.ForeshoreProfileName);
+ Assert.IsNull(calculation.ForeshoreProfileId);
Assert.IsNull(calculation.HydraulicBoundaryLocationName);
Assert.IsNull(calculation.InflowModelType);
Assert.IsNull(calculation.LevellingCount);
Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs
===================================================================
diff -u -rff948d4633181ead2677ab35467a93b4118c6751 -r7179946a6b62ebb33a90167c52af7c32f1100d73
--- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs (.../StabilityPointStructuresCalculationConfigurationWriterTest.cs) (revision ff948d4633181ead2677ab35467a93b4118c6751)
+++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.IO.Test/Configurations/StabilityPointStructuresCalculationConfigurationWriterTest.cs (.../StabilityPointStructuresCalculationConfigurationWriterTest.cs) (revision 7179946a6b62ebb33a90167c52af7c32f1100d73)
@@ -157,7 +157,7 @@
Mean = 0.09,
StandardDeviation = 0.19
},
- ForeshoreProfileName = "profiel1",
+ ForeshoreProfileId = "profiel1",
HydraulicBoundaryLocationName = "Locatie1",
InflowModelType = ConfigurationStabilityPointStructuresInflowModelType.FloodedCulvert,
InsideWaterLevel = new StochastConfiguration