Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModel.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModel.cs (.../StochasticSoilModel.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/StochasticSoilModel.cs (.../StochasticSoilModel.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -39,12 +39,10 @@ /// /// Database identifier of the stochastic soil model. /// Name of the segment soil model. - /// Name of the segment soil model segment. - public StochasticSoilModel(long id, string name, string segmentName) + public StochasticSoilModel(long id, string name) { Id = id; Name = name; - SegmentName = segmentName; Geometry = new List(); StochasticSoilProfiles = new List(); } @@ -60,11 +58,6 @@ public string Name { get; private set; } /// - /// /// Gets the name of the segment soil model segment. - /// - public string SegmentName { get; private set; } - - /// /// Gets the list of geometry points. /// public List Geometry { get; } @@ -95,7 +88,6 @@ Id = fromModel.Id; Name = fromModel.Name; - SegmentName = fromModel.SegmentName; Geometry.Clear(); foreach (Point2D point in fromModel.Geometry) { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -231,8 +231,7 @@ { long stochasticSoilModelId = Convert.ToInt64(dataReader[StochasticSoilModelTableColumns.StochasticSoilModelId]); string stochasticSoilModelName = Convert.ToString(dataReader[StochasticSoilModelTableColumns.StochasticSoilModelName]); - string segmentName = Convert.ToString(dataReader[SegmentTableColumns.SegmentName]); - return new StochasticSoilModel(stochasticSoilModelId, stochasticSoilModelName, segmentName); + return new StochasticSoilModel(stochasticSoilModelId, stochasticSoilModelName); } private Point2D ReadSegmentPoint() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelCollectionTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelCollectionTest.cs (.../StochasticSoilModelCollectionTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelCollectionTest.cs (.../StochasticSoilModelCollectionTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -40,26 +40,26 @@ protected override IEnumerable UniqueElements() { - yield return new StochasticSoilModel(5, "Model A", "segmentA"); - yield return new StochasticSoilModel(6, "Model B", "segmentA"); + yield return new StochasticSoilModel(5, "Model A"); + yield return new StochasticSoilModel(6, "Model B"); } protected override IEnumerable SingleNonUniqueElements() { const string someName = "Soil model"; - yield return new StochasticSoilModel(5, someName, "segmentA"); - yield return new StochasticSoilModel(6, someName, "segmentB"); + yield return new StochasticSoilModel(5, someName); + yield return new StochasticSoilModel(6, someName); } protected override IEnumerable MultipleNonUniqueElements() { const string someName = "Soil model"; const string someOtherName = "Other soil model"; - yield return new StochasticSoilModel(5, someName, "segmentA"); - yield return new StochasticSoilModel(6, someName, "segmentB"); - yield return new StochasticSoilModel(7, someOtherName, "segmentC"); - yield return new StochasticSoilModel(8, someOtherName, "segmentD"); - yield return new StochasticSoilModel(9, someOtherName, "segmentE"); + yield return new StochasticSoilModel(5, someName); + yield return new StochasticSoilModel(6, someName); + yield return new StochasticSoilModel(7, someOtherName); + yield return new StochasticSoilModel(8, someOtherName); + yield return new StochasticSoilModel(9, someOtherName); } protected override void AssertSingleNonUniqueElements(ArgumentException exception, IEnumerable itemsToAdd) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs (.../StochasticSoilModelExtensionsTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelExtensionsTest.cs (.../StochasticSoilModelExtensionsTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -55,7 +55,7 @@ public void IntersectsWithSurfaceLineGeometry_SurfaceLineNull_ThrowArgumentNullException() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -74,7 +74,7 @@ public void IntersectsWithSurfaceLineGeometry_SurfacelineIntersectingSoilModel_ReturnTrue() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -100,7 +100,7 @@ public void IntersectsWithSurfaceLineGeometry_SurfacelineNotIntersectingSoilModel_ReturnFalse() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelTest.cs (.../StochasticSoilModelTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/StochasticSoilModelTest.cs (.../StochasticSoilModelTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -39,13 +39,12 @@ public void Constructor_Always_ExpectedValues(long segmentSoilModelId, string segmentSoilModelName, string segmentName) { // Call - var stochasticSoilModel = new StochasticSoilModel(segmentSoilModelId, segmentSoilModelName, segmentName); + var stochasticSoilModel = new StochasticSoilModel(segmentSoilModelId, segmentSoilModelName); // Assert Assert.IsInstanceOf(stochasticSoilModel); Assert.AreEqual(segmentSoilModelId, stochasticSoilModel.Id); Assert.AreEqual(segmentSoilModelName, stochasticSoilModel.Name); - Assert.AreEqual(segmentName, stochasticSoilModel.SegmentName); CollectionAssert.IsEmpty(stochasticSoilModel.Geometry); CollectionAssert.IsEmpty(stochasticSoilModel.StochasticSoilProfiles); } @@ -56,8 +55,7 @@ // Setup const long expectedSegmentSoilModelId = 1234L; const string expectedSegmentSoilModelName = "someSegmentSoilModelName"; - const string expectedSegmentName = "someSegmentName"; - var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName, expectedSegmentName); + var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName); var point2D = new Point2D(1.0, 2.0); // Call @@ -66,7 +64,6 @@ // Assert Assert.AreEqual(expectedSegmentSoilModelId, stochasticSoilModel.Id); Assert.AreEqual(expectedSegmentSoilModelName, stochasticSoilModel.Name); - Assert.AreEqual(expectedSegmentName, stochasticSoilModel.SegmentName); Assert.AreEqual(1, stochasticSoilModel.Geometry.Count); Assert.AreEqual(point2D, stochasticSoilModel.Geometry[0]); } @@ -77,8 +74,7 @@ // Setup const long expectedSegmentSoilModelId = 1234L; const string expectedSegmentSoilModelName = "someSegmentSoilModelName"; - const string expectedSegmentName = "someSegmentName"; - var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName, expectedSegmentName); + var stochasticSoilModel = new StochasticSoilModel(expectedSegmentSoilModelId, expectedSegmentSoilModelName); var mockRepository = new MockRepository(); var stochasticSoilProfileProbabilityMock = mockRepository.StrictMock(1.0, null, null); @@ -90,7 +86,6 @@ // Assert Assert.AreEqual(expectedSegmentSoilModelId, stochasticSoilModel.Id); Assert.AreEqual(expectedSegmentSoilModelName, stochasticSoilModel.Name); - Assert.AreEqual(expectedSegmentName, stochasticSoilModel.SegmentName); Assert.AreEqual(1, stochasticSoilModel.StochasticSoilProfiles.Count); Assert.AreEqual(stochasticSoilProfileProbabilityMock, stochasticSoilModel.StochasticSoilProfiles[0]); mockRepository.VerifyAll(); @@ -100,7 +95,7 @@ public void Update_WithNullModel_ThrowsArgumentNullException() { // Setup - var model = new StochasticSoilModel(1234, "name", "segment"); + var model = new StochasticSoilModel(1234, "name"); // Call TestDelegate test = () => model.Update(null); @@ -114,7 +109,7 @@ public void Update_ModelWithUpdatedProperties_PropertiesUpdated() { // Setup - var model = new StochasticSoilModel(1234, "name", "segment"); + var model = new StochasticSoilModel(1234, "name"); model.Geometry.AddRange(new[] { new Point2D(1, 2), @@ -123,13 +118,12 @@ const int expectedId = 1236; const string expectedName = "otherName"; - const string expectedSegmentName = "otherSegmentName"; var expectedGeometry = new[] { new Point2D(4, 2) }; - var otherModel = new StochasticSoilModel(expectedId, expectedName, expectedSegmentName); + var otherModel = new StochasticSoilModel(expectedId, expectedName); otherModel.Geometry.AddRange(expectedGeometry); // Call @@ -138,7 +132,6 @@ // Assert Assert.AreEqual(expectedId, model.Id); Assert.AreEqual(expectedName, model.Name); - Assert.AreEqual(expectedSegmentName, model.SegmentName); CollectionAssert.AreEqual(expectedGeometry, model.Geometry); CollectionAssert.IsEmpty(difference.AddedProfiles); @@ -317,8 +310,7 @@ model.StochasticSoilProfiles.Add(stochasticProfileB); const string otherName = "other name"; - const string otherSegmentName = "other segment"; - var otherModel = new StochasticSoilModel(41, otherName, otherSegmentName); + var otherModel = new StochasticSoilModel(41, otherName); var otherPointA = new Point2D(2, 0); var otherPointB = new Point2D(3, 0); @@ -344,7 +336,6 @@ // Assert Assert.AreEqual(otherName, model.Name); - Assert.AreEqual(otherSegmentName, model.SegmentName); Assert.AreSame(otherPointA, model.Geometry[0]); Assert.AreSame(otherPointB, model.Geometry[1]); Assert.AreEqual(2, model.StochasticSoilProfiles.Count); @@ -410,7 +401,7 @@ public void ToString_WithName_ReturnsName(string name) { // Setup - var stochasticSoilModel = new StochasticSoilModel(1, name, "segmentName"); + var stochasticSoilModel = new StochasticSoilModel(1, name); // Call & Assert Assert.AreEqual(name, stochasticSoilModel.ToString()); @@ -426,7 +417,7 @@ private StochasticSoilModel CreateEmptyModel() { - var model = new StochasticSoilModel(1234, "name", "segment"); + var model = new StochasticSoilModel(1234, "name"); return model; } } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestStochasticSoilModelTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestStochasticSoilModelTest.cs (.../TestStochasticSoilModelTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/TestStochasticSoilModelTest.cs (.../TestStochasticSoilModelTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -36,7 +36,6 @@ // Assert Assert.IsInstanceOf(model); Assert.IsEmpty(model.Name); - Assert.IsEmpty(model.SegmentName); Assert.AreEqual(2, model.StochasticSoilProfiles.Count); CollectionAssert.AreEquivalent(new[] { @@ -58,7 +57,6 @@ // Assert Assert.IsInstanceOf(model); Assert.AreEqual(name, model.Name); - Assert.IsEmpty(model.SegmentName); Assert.AreEqual(2, model.StochasticSoilProfiles.Count); CollectionAssert.AreEquivalent(new[] { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestStochasticSoilModel.cs (.../TestStochasticSoilModel.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -33,7 +33,7 @@ /// Creates a new instance of . /// /// The name of the stochastic soil model. - public TestStochasticSoilModel(string name) : base(0, name, string.Empty) + public TestStochasticSoilModel(string name) : base(0, name) { StochasticSoilProfiles.AddRange(new[] { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -135,8 +135,8 @@ }; var stochasticSoilModels = new[] { - new StochasticSoilModel(1, "StochasticSoilModelName1", "StochasticSoilModelSegmentName1"), - new StochasticSoilModel(2, "StochasticSoilModelName2", "StochasticSoilModelSegmentName2") + new StochasticSoilModel(1, "StochasticSoilModelName1"), + new StochasticSoilModel(2, "StochasticSoilModelName2") }; stochasticSoilModels[0].Geometry.AddRange(pointsOne); stochasticSoilModels[1].Geometry.AddRange(pointsTwo); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/MacroStabilityInwardsCalculationConfigurationHelperTest.cs (.../MacroStabilityInwardsCalculationConfigurationHelperTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -60,7 +60,7 @@ }, SoilProfileType.SoilProfile1D, 2) }; - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -114,7 +114,7 @@ new MacroStabilityInwardsSoilLayer(4.0) }, SoilProfileType.SoilProfile1D, 2); - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -170,7 +170,7 @@ public void GetStochasticSoilModelsForSurfaceLine_NoSoilProfiles_ReturnEmpty() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -216,7 +216,7 @@ new MacroStabilityInwardsSoilLayer(4.0) }, SoilProfileType.SoilProfile1D, 2); - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -277,7 +277,7 @@ }; const double y = 1.1; - var soilModel1 = new StochasticSoilModel(1, "A", "B"); + var soilModel1 = new StochasticSoilModel(1, "A"); soilModel1.Geometry.AddRange(new[] { new Point2D(1.0, y), @@ -288,7 +288,7 @@ soilProfile1 }); - var soilModel2 = new StochasticSoilModel(1, "A", "B"); + var soilModel2 = new StochasticSoilModel(1, "A"); soilModel2.Geometry.AddRange(new[] { new Point2D(3.0, y), @@ -447,7 +447,7 @@ }, SoilProfileType.SoilProfile1D, 2) }; - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -509,7 +509,7 @@ public void GenerateCalculationItemsStructure_NoSoilProfiles_LogWarning() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -573,7 +573,7 @@ new MacroStabilityInwardsSoilLayer(4.0) }, SoilProfileType.SoilProfile1D, 2); - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -655,7 +655,7 @@ }; const double y = 1.1; - var soilModel1 = new StochasticSoilModel(1, "A", "B"); + var soilModel1 = new StochasticSoilModel(1, "A"); soilModel1.Geometry.AddRange(new[] { new Point2D(1.0, y), @@ -666,7 +666,7 @@ soilProfile1 }); - var soilModel2 = new StochasticSoilModel(1, "A", "B"); + var soilModel2 = new StochasticSoilModel(1, "A"); soilModel2.Geometry.AddRange(new[] { new Point2D(3.0, y), @@ -748,7 +748,7 @@ }; const double y = 1.1; - var soilModel1 = new StochasticSoilModel(1, "A", "B"); + var soilModel1 = new StochasticSoilModel(1, "A"); soilModel1.Geometry.AddRange(new[] { new Point2D(1.0, y), @@ -760,7 +760,7 @@ soilProfile2 }); - var soilModel2 = new StochasticSoilModel(1, "A", "B"); + var soilModel2 = new StochasticSoilModel(1, "A"); soilModel2.Geometry.AddRange(new[] { new Point2D(3.0, y), @@ -869,7 +869,7 @@ }; const double y = 1.1; - var soilModel1 = new StochasticSoilModel(1, "A", "B"); + var soilModel1 = new StochasticSoilModel(1, "A"); soilModel1.Geometry.AddRange(new[] { new Point2D(1.0, y), @@ -881,7 +881,7 @@ soilProfile2 }); - var soilModel2 = new StochasticSoilModel(1, "A", "B"); + var soilModel2 = new StochasticSoilModel(1, "A"); soilModel2.Geometry.AddRange(new[] { new Point2D(3.0, y), @@ -977,7 +977,7 @@ new MacroStabilityInwardsSoilLayer(4.0) }, SoilProfileType.SoilProfile1D, 2); - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -1056,7 +1056,7 @@ new MacroStabilityInwardsSoilLayer(4.0) }, SoilProfileType.SoilProfile1D, 2); - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs (.../MacroStabilityInwardsInputContextPropertiesTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -303,7 +303,7 @@ } }, SoilProfileType.SoilProfile1D, 0) }; - var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); + var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); HydraulicBoundaryLocation testHydraulicBoundaryLocation = TestHydraulicBoundaryLocation.CreateDesignWaterLevelCalculated(0.0); @@ -736,7 +736,7 @@ { SoilProfile = new TestMacroStabilityInwardsSoilProfile() }; - var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); + var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); @@ -781,7 +781,7 @@ { SoilProfile = new TestMacroStabilityInwardsSoilProfile() }; - var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); + var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(soilProfile); var calculationItem = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()) { @@ -836,14 +836,14 @@ { SoilProfile = new TestMacroStabilityInwardsSoilProfile() }; - var stochasticSoilModel1 = new StochasticSoilModel(0, "StochasticSoilModel1Name", "StochasticSoilModelSegment1Name"); + var stochasticSoilModel1 = new StochasticSoilModel(0, "StochasticSoilModel1Name"); stochasticSoilModel1.StochasticSoilProfiles.Add(stochasticSoilProfile1); var stochasticSoilProfile2 = new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 0) { SoilProfile = new TestMacroStabilityInwardsSoilProfile() }; - var stochasticSoilModel2 = new StochasticSoilModel(0, "StochasticSoilModel2Name", "StochasticSoilModelSegment2Name"); + var stochasticSoilModel2 = new StochasticSoilModel(0, "StochasticSoilModel2Name"); stochasticSoilModel1.StochasticSoilProfiles.Add(stochasticSoilProfile2); var inputParameters = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) @@ -946,7 +946,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var soilModels = new[] { - new StochasticSoilModel(1, "A", "B") + new StochasticSoilModel(1, "A") { Geometry = { @@ -958,7 +958,7 @@ new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) } }, - new StochasticSoilModel(2, "C", "D") + new StochasticSoilModel(2, "C") { Geometry = { @@ -970,7 +970,7 @@ new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2) } }, - new StochasticSoilModel(3, "E", "F") + new StochasticSoilModel(3, "E") { Geometry = { @@ -1048,7 +1048,7 @@ mocks.ReplayAll(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var model = new StochasticSoilModel(1, "A", "B") + var model = new StochasticSoilModel(1, "A") { StochasticSoilProfiles = { @@ -1484,7 +1484,7 @@ private static StochasticSoilModel ValidStochasticSoilModel(double xMin, double xMax) { - var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName"); + var stochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName"); stochasticSoilModel.StochasticSoilProfiles.Add(new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1234) { SoilProfile = new TestMacroStabilityInwardsSoilProfile() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs =================================================================== diff -u -r6a241363ac2d257e8012cb6336d66a8e9e350b8d -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 6a241363ac2d257e8012cb6336d66a8e9e350b8d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -53,7 +53,7 @@ public void GetProperties_WithData_ReturnExpectedValues() { // Setup - var stochasticSoilModel = new StochasticSoilModel(1324, "Name", "SegmentName"); + var stochasticSoilModel = new StochasticSoilModel(1324, "Name"); stochasticSoilModel.Geometry.Add(new Point2D(1.0, 2.0)); var soilProfile = new MacroStabilityInwardsSoilProfile("MacroStabilityInwardsSoilProfile", 0, new List { @@ -83,7 +83,7 @@ public void Constructor_Always_PropertiesHaveExpectedAttributesValues() { // Setup - var stochasticSoilModel = new StochasticSoilModel(1324, "Name", "SegmentName"); + var stochasticSoilModel = new StochasticSoilModel(1324, "Name"); stochasticSoilModel.Geometry.Add(new Point2D(1.0, 2.0)); var soilProfile = new MacroStabilityInwardsSoilProfile("MacroStabilityInwardsSoilProfile", 0, new List { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilModelSelectionEditorTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -58,7 +58,7 @@ var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { - StochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName", "StochasticSoilModelSegmentName") + StochasticSoilModel = new StochasticSoilModel(0, "StochasticSoilModelName") }; var inputContext = new MacroStabilityInwardsInputContext(input, calculationItem, @@ -106,7 +106,7 @@ { SoilProfile = new TestMacroStabilityInwardsSoilProfile() }; - var stochasticSoilModel = new StochasticSoilModel(0, "Model", string.Empty) + var stochasticSoilModel = new StochasticSoilModel(0, "Model") { Geometry = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/UITypeEditors/MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs (.../MacroStabilityInwardsInputContextStochasticSoilProfileSelectionEditorTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -109,7 +109,7 @@ { SoilProfile = new TestMacroStabilityInwardsSoilProfile() }; - var stochasticSoilModel = new StochasticSoilModel(0, "Model", string.Empty) + var stochasticSoilModel = new StochasticSoilModel(0, "Model") { Geometry = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -143,7 +143,7 @@ public void StochasticSoilModel_AlwaysOnChange_NotifyObserverCalculationPropertyChangedOutputCleared() { // Setup - var newModel = new StochasticSoilModel(0, "test", "test"); + var newModel = new StochasticSoilModel(0, "test"); var newValue = new DataGridViewComboBoxItemWrapper(newModel); var calculation = new MacroStabilityInwardsCalculationScenario(new GeneralMacroStabilityInwardsInput()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r38499aa6936706c30ac12e481233d3f13545dd8b -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 38499aa6936706c30ac12e481233d3f13545dd8b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -1444,7 +1444,7 @@ }, SoilProfileType.SoilProfile1D, 1) }; - var stochasticSoilModelA = new StochasticSoilModel(1, "Model A", "Model B") + var stochasticSoilModelA = new StochasticSoilModel(1, "Model A") { Geometry = { @@ -1475,7 +1475,7 @@ }, SoilProfileType.SoilProfile1D, 1) }; - var stochasticSoilModelE = new StochasticSoilModel(1, "Model E", "Model F") + var stochasticSoilModelE = new StochasticSoilModel(1, "Model E") { Geometry = { @@ -1490,7 +1490,7 @@ failureMechanism.StochasticSoilModels.AddRange(new[] { stochasticSoilModelA, - new StochasticSoilModel(1, "Model C", "Model D") + new StochasticSoilModel(1, "Model C") { Geometry = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs =================================================================== diff -u -r4b8ab1201eba50035392ce074fa1cc5da25ff4a7 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 4b8ab1201eba50035392ce074fa1cc5da25ff4a7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -254,13 +254,13 @@ ReferenceLine = referenceLine }; - var stochasticSoilModel1 = new StochasticSoilModel(0, "name1", ""); + var stochasticSoilModel1 = new StochasticSoilModel(0, "name1"); stochasticSoilModel1.Geometry.AddRange(new[] { new Point2D(1.0, 2.0), new Point2D(1.1, 2.2) }); - var stochasticSoilModel2 = new StochasticSoilModel(0, "name2", ""); + var stochasticSoilModel2 = new StochasticSoilModel(0, "name2"); stochasticSoilModel2.Geometry.AddRange(new[] { new Point2D(3.0, 4.0), @@ -684,7 +684,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var failureMechanismContext = new MacroStabilityInwardsFailureMechanismContext(failureMechanism, new ObservableTestAssessmentSectionStub()); - var stochasticSoilModel = new StochasticSoilModel(0, "", ""); + var stochasticSoilModel = new StochasticSoilModel(0, ""); stochasticSoilModel.Geometry.AddRange(new[] { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r064078c50aa1cba72004f98318c5f7cc2f7ac6f1 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 064078c50aa1cba72004f98318c5f7cc2f7ac6f1) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationExporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationExporterTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -79,7 +79,7 @@ calculation2.Name = "PK001_0002 W1-6_4_1D1"; calculation2.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_SCH_17", 0, 0); calculation2.InputParameters.SurfaceLine.Name = "PK001_0002"; - calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Macrostabiliteit", string.Empty); + calculation2.InputParameters.StochasticSoilModel = new StochasticSoilModel(1, "PK001_0002_Macrostabiliteit"); calculation2.InputParameters.StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) { SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_4_1D1", 0, new[] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -rf03b47d0d73983de35188874a094ae07f1ea13fa -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision f03b47d0d73983de35188874a094ae07f1ea13fa) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Configurations/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -169,7 +169,7 @@ new Point3D(2.5, 1.0, 1.0), new Point3D(5.0, 1.0, 0.0) }); - var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel", "Segment"); + var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel"); stochasticSoilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -219,7 +219,7 @@ new Point3D(3.0, 0.0, 1.0), new Point3D(3.0, -5.0, 0.0) }); - var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel", "Segment"); + var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel"); stochasticSoilModel.Geometry.AddRange(new[] { new Point2D(1.0, 0.0), @@ -303,7 +303,7 @@ }, SoilProfileType.SoilProfile1D, 0) }; - var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel", "Segment"); + var stochasticSoilModel = new StochasticSoilModel(1, "Ondergrondmodel"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); stochasticSoilModel.Geometry.AddRange(new[] { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -314,7 +314,6 @@ }; Assert.AreEqual(expectedNrOfModels, nrOfModels); - CollectionAssert.AreEqual(expectedSegmentAndModelNames, readModels.Select(m => m.SegmentName)); CollectionAssert.AreEqual(expectedSegmentAndModelNames, readModels.Select(m => m.Name)); CollectionAssert.AreEqual(expectedModelIds, readModels.Select(m => m.Id)); CollectionAssert.AreEqual(expectedSegmentPointCount, readModels.Select(m => m.Geometry.Count)); @@ -371,7 +370,6 @@ }; Assert.AreEqual(expectedNrOfModels, nrOfModels); - CollectionAssert.AreEqual(expectedSegmentAndModelNames, readModels.Select(m => m.SegmentName)); CollectionAssert.AreEqual(expectedSegmentAndModelNames, readModels.Select(m => m.Name)); CollectionAssert.AreEqual(expectedModelIds, readModels.Select(m => m.Id)); CollectionAssert.AreEqual(expectedSegmentPointCount, readModels.Select(m => m.Geometry.Count)); @@ -472,7 +470,6 @@ }; Assert.AreEqual(2, readModels.Count); - CollectionAssert.AreEqual(expectedSegmentAndModelNames, readModels.Select(m => m.SegmentName)); CollectionAssert.AreEqual(expectedSegmentAndModelNames, readModels.Select(m => m.Name)); CollectionAssert.AreEqual(expectedModelIds, readModels.Select(m => m.Id)); CollectionAssert.AreEqual(expectedSegmentPointCount, readModels.Select(m => m.Geometry.Count)); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtil/MacroStabilityInwardsTestDataGenerator.cs =================================================================== diff -u -r064078c50aa1cba72004f98318c5f7cc2f7ac6f1 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 064078c50aa1cba72004f98318c5f7cc2f7ac6f1) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -134,7 +134,7 @@ { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "PUNT_KAT_18", 0, 0), SurfaceLine = surfaceline, - StochasticSoilModel = new StochasticSoilModel(1, "PK001_0001_Macrostabiliteit", string.Empty), + StochasticSoilModel = new StochasticSoilModel(1, "PK001_0001_Macrostabiliteit"), StochasticSoilProfile = new StochasticSoilProfile(0, SoilProfileType.SoilProfile1D, 0) { SoilProfile = new MacroStabilityInwardsSoilProfile("W1-6_0_1D1", 0, new[] @@ -217,7 +217,7 @@ surfaceline1, surfaceline2 }, "some/path/to/surfacelines"); - var stochasticSoilModel1 = new StochasticSoilModel(1, "A", "B") + var stochasticSoilModel1 = new StochasticSoilModel(1, "A") { Geometry = { @@ -229,7 +229,7 @@ new StochasticSoilProfile(1.0, SoilProfileType.SoilProfile1D, 1) } }; - var stochasticSoilModel2 = new StochasticSoilModel(2, "C", "D") + var stochasticSoilModel2 = new StochasticSoilModel(2, "C") { Geometry = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r64349951de884b464e77654a723f26176c9a202c -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 64349951de884b464e77654a723f26176c9a202c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -630,7 +630,7 @@ var soilModels = new[] { - new StochasticSoilModel(1, "A", "B") + new StochasticSoilModel(1, "A") { Geometry = { @@ -642,7 +642,7 @@ new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) } }, - new StochasticSoilModel(2, "C", "D") + new StochasticSoilModel(2, "C") { Geometry = { @@ -699,7 +699,7 @@ // Setup var soilModels = new[] { - new StochasticSoilModel(1, "A", "B") + new StochasticSoilModel(1, "A") { Geometry = { @@ -711,7 +711,7 @@ new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) } }, - new StochasticSoilModel(2, "C", "D") + new StochasticSoilModel(2, "C") { Geometry = { @@ -723,7 +723,7 @@ new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 2) } }, - new StochasticSoilModel(3, "E", "F") + new StochasticSoilModel(3, "E") { Geometry = { @@ -788,7 +788,7 @@ public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilInputs() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B") + var soilModel = new StochasticSoilModel(1, "A") { Geometry = { @@ -846,7 +846,7 @@ public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilModelInput() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B") + var soilModel = new StochasticSoilModel(1, "A") { Geometry = { @@ -935,7 +935,7 @@ var soilModels = new[] { - new StochasticSoilModel(1, "A", "B") + new StochasticSoilModel(1, "A") { Geometry = { @@ -947,7 +947,7 @@ new StochasticSoilProfile(0.2, SoilProfileType.SoilProfile1D, 1) } }, - new StochasticSoilModel(2, "C", "D") + new StochasticSoilModel(2, "C") { Geometry = { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -r64349951de884b464e77654a723f26176c9a202c -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision 64349951de884b464e77654a723f26176c9a202c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/StochasticSoilModelUpdateDataStrategyTest.cs (.../StochasticSoilModelUpdateDataStrategyTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -489,7 +489,7 @@ /// A new . private StochasticSoilModel CreateSimpleModel(string modelName, params string[] profileNames) { - var model = new StochasticSoilModel(-1, modelName, "segment name"); + var model = new StochasticSoilModel(-1, modelName); foreach (string profileName in profileNames) { model.StochasticSoilProfiles.Add( Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelCollectionContextTreeNodeInfoTest.cs (.../StochasticSoilModelCollectionContextTreeNodeInfoTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -159,7 +159,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.StochasticSoilModels.AddRange(new[] { - new StochasticSoilModel(0, "Name", "Name") + new StochasticSoilModel(0, "Name") }, "path"); var stochasticSoilModelCollectionContext = new StochasticSoilModelCollectionContext( @@ -198,7 +198,7 @@ SoilProfile = soilProfile2 }; - var stochasticSoilModel = new StochasticSoilModel(0, "Name", "Name"); + var stochasticSoilModel = new StochasticSoilModel(0, "Name"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile1); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile2); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/StochasticSoilModelTreeNodeInfoTest.cs (.../StochasticSoilModelTreeNodeInfoTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -82,7 +82,7 @@ { // Setup const string name = "test test 123"; - var model = new StochasticSoilModel(1, name, "a"); + var model = new StochasticSoilModel(1, name); // Call string text = info.Text(model); @@ -95,7 +95,7 @@ public void Image_Always_ReturnsSetImage() { // Setup - var model = new StochasticSoilModel(1, "A", "B"); + var model = new StochasticSoilModel(1, "A"); // Call Image image = info.Image(model); @@ -123,7 +123,7 @@ }, SoilProfileType.SoilProfile1D, 0) }; - var stochasticSoilModel = new StochasticSoilModel(0, "Name", "Name"); + var stochasticSoilModel = new StochasticSoilModel(0, "Name"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile1); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile2); @@ -143,7 +143,7 @@ public void ContextMenuStrip_Always_CallsBuilder() { // Setup - var model = new StochasticSoilModel(1, "A", "B"); + var model = new StochasticSoilModel(1, "A"); var mocks = new MockRepository(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs =================================================================== diff -u -r064078c50aa1cba72004f98318c5f7cc2f7ac6f1 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 064078c50aa1cba72004f98318c5f7cc2f7ac6f1) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -353,7 +353,7 @@ { // Setup MacroStabilityInwardsFailureMechanism failureMechanism = null; - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); // Call TestDelegate call = () => MacroStabilityInwardsDataSynchronizationService.RemoveStochasticSoilModel(failureMechanism, soilModel); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputServiceTest.cs (.../MacroStabilityInwardsInputServiceTest.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -32,7 +32,7 @@ public void SetMatchingStochasticSoilModel_SurfaceLineOverlappingSingleSoilModel_SetsSoilModel() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); // Call @@ -50,8 +50,8 @@ { // Setup var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()); - var soilModel1 = new StochasticSoilModel(1, "A", "B"); - var soilModel2 = new StochasticSoilModel(2, "C", "D"); + var soilModel1 = new StochasticSoilModel(1, "A"); + var soilModel2 = new StochasticSoilModel(2, "C"); // Call MacroStabilityInwardsInputService.SetMatchingStochasticSoilModel(input, new[] @@ -68,14 +68,14 @@ public void SetMatchingStochasticSoilModel_CurrentSoilModelNotInOverlappingMultipleSoilModels_ClearsModel() { // Setup - var nonOverlappingSoilModel = new StochasticSoilModel(1, "A", "B"); + var nonOverlappingSoilModel = new StochasticSoilModel(1, "A"); var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) { StochasticSoilModel = nonOverlappingSoilModel }; - var soilModel1 = new StochasticSoilModel(1, "A", "B"); - var soilModel2 = new StochasticSoilModel(2, "C", "D"); + var soilModel1 = new StochasticSoilModel(1, "A"); + var soilModel2 = new StochasticSoilModel(2, "C"); // Call MacroStabilityInwardsInputService.SetMatchingStochasticSoilModel(input, new[] @@ -94,7 +94,7 @@ // Setup var soilProfile = new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1); - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.StochasticSoilProfiles.Add(soilProfile); var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) @@ -113,7 +113,7 @@ public void SyncStochasticSoilProfileWithStochasticSoilModel_MultipleStochasticSoilProfilesInStochasticSoilModel_DoesNotSetStochasticSoilProfile() { // Setup - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.StochasticSoilProfiles.AddRange(new[] { new StochasticSoilProfile(0.0, SoilProfileType.SoilProfile1D, 1), @@ -137,7 +137,7 @@ // Setup var soilProfile = new StochasticSoilProfile(0.3, SoilProfileType.SoilProfile1D, 1); - var soilModel = new StochasticSoilModel(1, "A", "B"); + var soilModel = new StochasticSoilModel(1, "A"); soilModel.StochasticSoilProfiles.Add(soilProfile); var input = new MacroStabilityInwardsInput(new GeneralMacroStabilityInwardsInput()) Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilModelReader.cs =================================================================== diff -u -r94242c0e8dc46889015a0cc34aee3e37786bb30a -r271c2fc54b79aa394b3d8d417f9dcd6d5675728e --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 94242c0e8dc46889015a0cc34aee3e37786bb30a) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/StochasticSoilModelReader.cs (.../StochasticSoilModelReader.cs) (revision 271c2fc54b79aa394b3d8d417f9dcd6d5675728e) @@ -231,7 +231,6 @@ { long stochasticSoilModelId = Convert.ToInt64(dataReader[StochasticSoilModelTableColumns.StochasticSoilModelId]); string stochasticSoilModelName = Convert.ToString(dataReader[StochasticSoilModelTableColumns.StochasticSoilModelName]); - string segmentName = Convert.ToString(dataReader[SegmentTableColumns.SegmentName]); return new StochasticSoilModel(stochasticSoilModelId, stochasticSoilModelName); }