Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SoilProfileEntityReadExtensions.cs =================================================================== diff -u -r5d924a3334b0532730e8ea4bd9e97a5d48a72344 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SoilProfileEntityReadExtensions.cs (.../SoilProfileEntityReadExtensions.cs) (revision 5d924a3334b0532730e8ea4bd9e97a5d48a72344) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/SoilProfileEntityReadExtensions.cs (.../SoilProfileEntityReadExtensions.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -56,8 +56,7 @@ var pipingSoilProfile = new PipingSoilProfile(entity.Name, entity.Bottom.ToNullAsNaN(), layers, - (SoilProfileType) entity.SourceType, - -1); + (SoilProfileType) entity.SourceType); collector.Read(entity, pipingSoilProfile); return pipingSoilProfile; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -2167,7 +2167,7 @@ TestDelegate test = () => registry.Register(null, new PipingSoilProfile("name", 0, new[] { new PipingSoilLayer(1) - }, SoilProfileType.SoilProfile1D, -1)); + }, SoilProfileType.SoilProfile1D)); // Assert string paramName = Assert.Throws(test).ParamName; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs =================================================================== diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs (.../PipingSoilProfileCreateExtensionsTest.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingSoilProfileCreateExtensionsTest.cs (.../PipingSoilProfileCreateExtensionsTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -57,7 +57,7 @@ new PipingSoilLayer(bottom + 1), new PipingSoilLayer(bottom + 2) }; - var soilProfile = new PipingSoilProfile(testName, bottom, layers, SoilProfileType.SoilProfile1D, -1); + var soilProfile = new PipingSoilProfile(testName, bottom, layers, SoilProfileType.SoilProfile1D); var registry = new PersistenceRegistry(); // Call @@ -80,7 +80,7 @@ new PipingSoilLayer(1), new PipingSoilLayer(2) }; - var soilProfile = new PipingSoilProfile(testName, 0, layers, SoilProfileType.SoilProfile1D, -1); + var soilProfile = new PipingSoilProfile(testName, 0, layers, SoilProfileType.SoilProfile1D); var registry = new PersistenceRegistry(); // Call Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder1D.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder1D.cs (.../SoilProfileBuilder1D.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder1D.cs (.../SoilProfileBuilder1D.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -34,19 +34,16 @@ private readonly Collection layers; private readonly string name; private readonly double bottom; - private readonly long soilProfileId; /// /// Creates a new instance of . /// /// The name of the profile. /// The bottom level of the profile. - /// Identifier of the profile. - internal SoilProfileBuilder1D(string name, double bottom, long soilProfileId) + internal SoilProfileBuilder1D(string name, double bottom) { this.name = name; this.bottom = bottom; - this.soilProfileId = soilProfileId; layers = new Collection(); } @@ -59,7 +56,7 @@ { try { - return new PipingSoilProfile(name, bottom, layers, SoilProfileType.SoilProfile1D, soilProfileId); + return new PipingSoilProfile(name, bottom, layers, SoilProfileType.SoilProfile1D); } catch (ArgumentException e) { Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Builders/SoilProfileBuilder2D.cs (.../SoilProfileBuilder2D.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -36,7 +36,6 @@ private readonly ICollection layers = new Collection(); private readonly double atX; private readonly string profileName; - private readonly long soilProfileId; private double bottom; @@ -46,10 +45,9 @@ /// /// The name for the constructed by the . /// The x position from which to obtain a 1D profile. - /// The identifier of the profile in the database. /// Thrown when can not be used to determine intersections with /// (is ). - internal SoilProfileBuilder2D(string profileName, double atX, long soilProfileId) + internal SoilProfileBuilder2D(string profileName, double atX) { if (double.IsNaN(atX)) { @@ -59,7 +57,6 @@ this.profileName = profileName; this.atX = atX; bottom = double.MaxValue; - this.soilProfileId = soilProfileId; } /// @@ -73,7 +70,7 @@ { try { - return new PipingSoilProfile(profileName, bottom, layers, SoilProfileType.SoilProfile2D, soilProfileId); + return new PipingSoilProfile(profileName, bottom, layers, SoilProfileType.SoilProfile2D); } catch (ArgumentException e) { @@ -89,7 +86,7 @@ /// Thrown when either: /// /// the 's geometry contains vertical segments at the - /// X-coordinate given for the construction of the . + /// X-coordinate given for the construction of the . /// any of the distributions of the stochastic parameters for is not defined /// as lognormal or is shifted when it should not be /// Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingSoilProfileTransformer.cs =================================================================== diff -u -r763e4e54f2b5478ddebfc09be8c8d1da541e1a15 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingSoilProfileTransformer.cs (.../PipingSoilProfileTransformer.cs) (revision 763e4e54f2b5478ddebfc09be8c8d1da541e1a15) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingSoilProfileTransformer.cs (.../PipingSoilProfileTransformer.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -105,7 +105,7 @@ bottom = Math.Min(bottom, newBottom); } - return new PipingSoilProfile(profileName, bottom, layers, SoilProfileType.SoilProfile2D, 0); + return new PipingSoilProfile(profileName, bottom, layers, SoilProfileType.SoilProfile2D); } private static PipingSoilProfile CreatePipingSoilProfile(SoilProfile1D soilProfile1D) @@ -115,8 +115,7 @@ return new PipingSoilProfile(soilProfile1D.Name, soilProfile1D.Bottom, layers.ToArray(), - SoilProfileType.SoilProfile1D, - 0); + SoilProfileType.SoilProfile1D); } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilProfile.cs =================================================================== diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilProfile.cs (.../PipingSoilProfile.cs) (revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilProfile.cs (.../PipingSoilProfile.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -34,32 +34,26 @@ private PipingSoilLayer[] layers; /// - /// Creates a new instance of , with the given , and . + /// Creates a new instance of , with the given , + /// and . /// A new collection is created for and used in the . /// /// The name of the profile. /// The bottom level of the profile. /// The collection of layers that should be part of the profile. /// The type of soil profile used as data source /// to build this instance. - /// Identifier of the profile. /// Thrown when contains no layers. /// Thrown when is null. - public PipingSoilProfile(string name, double bottom, IEnumerable layers, SoilProfileType sourceProfileType, long pipingSoilProfileId) + public PipingSoilProfile(string name, double bottom, IEnumerable layers, SoilProfileType sourceProfileType) { Name = name; Bottom = bottom; Layers = layers; SoilProfileType = sourceProfileType; - PipingSoilProfileId = pipingSoilProfileId; } - + /// - /// Gets the database identifier of the . - /// - public long PipingSoilProfileId { get; } - - /// /// Gets the bottom level of the . /// public double Bottom { get; } Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingInputTest.cs (.../DerivedPipingInputTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -180,7 +180,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -207,7 +207,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -311,7 +311,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -338,7 +338,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -470,7 +470,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -527,7 +527,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -554,7 +554,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -675,7 +675,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -699,7 +699,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -727,7 +727,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -761,7 +761,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -802,7 +802,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -851,7 +851,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -889,7 +889,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -919,7 +919,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -955,7 +955,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call LogNormalDistribution result = derivedInput.SaturatedVolumicWeightOfCoverageLayer; @@ -1024,7 +1024,7 @@ 0.0, new PipingSoilProfile("", -2.0, new[] { new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DarcyPermeability; @@ -1049,7 +1049,7 @@ PermeabilityCoefficientOfVariation = 0.3, PermeabilityMean = 0 } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DarcyPermeability; @@ -1080,7 +1080,7 @@ PermeabilityCoefficientOfVariation = 0.3, PermeabilityMean = 2.4 } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DarcyPermeability; @@ -1117,7 +1117,7 @@ PermeabilityCoefficientOfVariation = coefficientOfVariation, PermeabilityMean = mean2 } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DarcyPermeability; @@ -1146,7 +1146,7 @@ PermeabilityMean = permeabilityMean, PermeabilityCoefficientOfVariation = permeabilityCoefficientOfVariation } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DarcyPermeability; @@ -1179,7 +1179,7 @@ PermeabilityMean = 12.5, PermeabilityCoefficientOfVariation = 2.3 } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DarcyPermeability; @@ -1247,7 +1247,7 @@ 0.0, new PipingSoilProfile("", -2.0, new[] { new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DiameterD70; @@ -1275,7 +1275,7 @@ DiameterD70Mean = diameterD70Mean, DiameterD70CoefficientOfVariation = diameterD70CoefficientOfVariation } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DiameterD70; @@ -1308,7 +1308,7 @@ DiameterD70Mean = 12.5, DiameterD70CoefficientOfVariation = 2.3 } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call VariationCoefficientLogNormalDistribution result = derivedInput.DiameterD70; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -904,7 +904,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -972,7 +972,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -998,7 +998,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -1079,7 +1079,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -1105,7 +1105,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -1186,7 +1186,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call @@ -1212,7 +1212,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileExtensionsTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileExtensionsTest.cs (.../PipingSoilProfileExtensionsTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingSoilProfileExtensionsTest.cs (.../PipingSoilProfileExtensionsTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -161,9 +161,9 @@ } }; - private PipingSoilProfile CreateTestProfile(PipingSoilLayer[] layers) + private static PipingSoilProfile CreateTestProfile(PipingSoilLayer[] layers) { - return new PipingSoilProfile(string.Empty, 0.0, layers, SoilProfileType.SoilProfile1D, 0); + return new PipingSoilProfile(string.Empty, 0.0, layers, SoilProfileType.SoilProfile1D); } #region GetTopmostConsecutiveAquiferLayerThicknessBelowLevel Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs (.../PipingStochasticSoilModelTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilModelTest.cs (.../PipingStochasticSoilModelTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -129,12 +129,12 @@ // Setup const string profileName = "A"; var expectedUpdatedProfile = new PipingStochasticSoilProfile(0.2, - new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D, -5)); + new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D)); PipingStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedUpdatedProfile); PipingStochasticSoilModel otherModel = CreateEmptyModel(); otherModel.StochasticSoilProfiles.Add(new PipingStochasticSoilProfile(0.2, - new PipingSoilProfile(profileName, -1, CreateLayers(), SoilProfileType.SoilProfile1D, -5))); + new PipingSoilProfile(profileName, -1, CreateLayers(), SoilProfileType.SoilProfile1D))); // Call PipingStochasticSoilModelProfileDifference difference = model.Update(otherModel); @@ -156,7 +156,7 @@ { // Setup const string profileName = "A"; - var soilProfile = new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D, -5); + var soilProfile = new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D); var expectedUpdatedProfile = new PipingStochasticSoilProfile(0.2, soilProfile); PipingStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedUpdatedProfile); @@ -181,7 +181,7 @@ { // Setup const string profileName = "A"; - var soilProfile = new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D, -5); + var soilProfile = new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D); var expectedRemovedProfile = new PipingStochasticSoilProfile(0.2, soilProfile); PipingStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedRemovedProfile); @@ -205,10 +205,11 @@ { // Setup const string profileName = "A"; - var soilProfile = new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D, -5); + var soilProfile = new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile1D); var expectedRemovedProfile = new PipingStochasticSoilProfile(0.2, soilProfile); - var newProfile = new PipingStochasticSoilProfile(0.2, - new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile2D, -5)); + var newProfile = new PipingStochasticSoilProfile( + 0.2, + new PipingSoilProfile(profileName, -2, CreateLayers(), SoilProfileType.SoilProfile2D)); PipingStochasticSoilModel model = CreateEmptyModel(); model.StochasticSoilProfiles.Add(expectedRemovedProfile); @@ -250,10 +251,11 @@ otherModel.Geometry.Add(otherPointA); otherModel.Geometry.Add(otherPointB); - var otherStochasticProfileA = new PipingStochasticSoilProfile(0.7, new PipingSoilProfile(equalProfileName, -1, new[] - { - new PipingSoilLayer(0) - }, SoilProfileType.SoilProfile1D, -1)); + var otherStochasticProfileA = new PipingStochasticSoilProfile( + 0.7, new PipingSoilProfile(equalProfileName, -1, new[] + { + new PipingSoilLayer(0) + }, SoilProfileType.SoilProfile1D)); var otherStochasticProfileB = new PipingStochasticSoilProfile(0.3, new TestPipingSoilProfile("other profile name")); otherModel.StochasticSoilProfiles.Add(otherStochasticProfileA); otherModel.StochasticSoilProfiles.Add(otherStochasticProfileB); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs (.../PipingStochasticSoilProfileTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/SoilProfile/PipingStochasticSoilProfileTest.cs (.../PipingStochasticSoilProfileTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -25,7 +25,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Piping.Data.SoilProfile; -using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Primitives; @@ -265,7 +264,7 @@ PermeabilityCoefficientOfVariation = random.NextDouble(), PermeabilityMean = random.NextDouble() } - }, random.NextEnumValue(), random.Next()); + }, random.NextEnumValue()); } private static string GetRandomName(Random random) Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs (.../PipingCalculationScenarioFactory.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs (.../PipingCalculationScenarioFactory.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -160,7 +160,7 @@ PermeabilityCoefficientOfVariation = 0.5, PermeabilityMean = 1.0 } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); var surfaceLine = new PipingSurfaceLine(); var firstCharacteristicPointLocation = new Point3D(0.2, 0.0, bottom + 3 * top / 4); var secondCharacteristicPointLocation = new Point3D(0.3, 0.0, bottom + 2 * top / 4); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingInputFactory.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingInputFactory.cs (.../PipingInputFactory.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingInputFactory.cs (.../PipingInputFactory.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -58,7 +58,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); return new PipingInput(new GeneralPipingInput()) { @@ -88,7 +88,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); return new PipingInput(new GeneralPipingInput()) { @@ -127,7 +127,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); var input = new PipingInput(new GeneralPipingInput()) { SurfaceLine = surfaceLine, @@ -165,7 +165,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); var input = new PipingInput(new GeneralPipingInput()) { SurfaceLine = surfaceLine, Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingTestDataGenerator.cs (.../PipingTestDataGenerator.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -152,7 +152,7 @@ 0, new PipingSoilProfile("W1-6_0_1D1", 0, new[] { new PipingSoilLayer(0) - }, SoilProfileType.SoilProfile1D, 0)), + }, SoilProfileType.SoilProfile1D)), PhreaticLevelExit = { Mean = (RoundedDouble) 0, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs =================================================================== diff -u -r6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision 6f1ebc70aa1b4b5cf7242b4f4c94f61ba79a5788) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataFactoryTest.cs (.../PipingChartDataFactoryTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -93,7 +93,7 @@ Color = Color.Aquamarine }); - var profile = new PipingSoilProfile("name", -1.0, layers, SoilProfileType.SoilProfile1D, 0); + var profile = new PipingSoilProfile("name", -1.0, layers, SoilProfileType.SoilProfile1D); // Call ChartMultipleAreaData data = PipingChartDataFactory.CreateSoilLayerChartData(soilLayerIndex, profile); @@ -156,7 +156,7 @@ new[] { new PipingSoilLayer(3.2) - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call PipingChartDataFactory.UpdateSoilProfileChartDataName(chartData, soilProfile); @@ -176,7 +176,7 @@ new PipingSoilLayer(0), new PipingSoilLayer(1) }; - var profile = new PipingSoilProfile("name", -1.0, layers, SoilProfileType.SoilProfile1D, 0); + var profile = new PipingSoilProfile("name", -1.0, layers, SoilProfileType.SoilProfile1D); // Call TestDelegate test = () => PipingChartDataFactory.CreateSoilLayerChartData(soilLayerIndex, profile); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataPointsFactoryTest.cs =================================================================== diff -u -rd6fe8399e8398224cf1bda9259052232d85b85a4 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataPointsFactoryTest.cs (.../PipingChartDataPointsFactoryTest.cs) (revision d6fe8399e8398224cf1bda9259052232d85b85a4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingChartDataPointsFactoryTest.cs (.../PipingChartDataPointsFactoryTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -425,7 +425,7 @@ var soilProfile = new PipingSoilProfile("name", 2.0, new[] { new PipingSoilLayer(3.2) - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); PipingSurfaceLine surfaceLine = GetSurfaceLineWithGeometry(); // Call @@ -457,7 +457,7 @@ var soilProfile = new PipingSoilProfile("name", 2.0, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, null); @@ -481,7 +481,7 @@ var soilProfile = new PipingSoilProfile("name", 2.0, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, surfaceLine).ToList(); @@ -511,7 +511,7 @@ var soilProfile = new PipingSoilProfile("name", 2.0, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, surfaceLine); @@ -537,7 +537,7 @@ var soilProfile = new PipingSoilProfile("name", bottom, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, surfaceLine).ToList(); @@ -575,7 +575,7 @@ var soilProfile = new PipingSoilProfile("name", bottom, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, surfaceLine).ToList(); @@ -611,7 +611,7 @@ var soilProfile = new PipingSoilProfile("name", bottom, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, surfaceLine).ToList(); @@ -646,7 +646,7 @@ var soilProfile = new PipingSoilProfile("name", bottom, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, surfaceLine).ToList(); @@ -681,7 +681,7 @@ var soilProfile = new PipingSoilProfile("name", bottom, new[] { soilLayer - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call IEnumerable areas = PipingChartDataPointsFactory.CreateSoilLayerAreas(soilLayer, soilProfile, surfaceLine).ToList(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -63,14 +63,14 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1)); + }, SoilProfileType.SoilProfile1D)); var soilProfile2 = new PipingStochasticSoilProfile( 0.7, new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2)); + }, SoilProfileType.SoilProfile1D)); var soilModel = new PipingStochasticSoilModel("A") { @@ -121,13 +121,13 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1); + }, SoilProfileType.SoilProfile1D); var soilProfile2 = new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2); + }, SoilProfileType.SoilProfile1D); var soilModel = new PipingStochasticSoilModel("A") { @@ -222,13 +222,13 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1); + }, SoilProfileType.SoilProfile1D); var soilProfile2 = new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2); + }, SoilProfileType.SoilProfile1D); var soilModel = new PipingStochasticSoilModel("A") { @@ -275,15 +275,15 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1) + }, SoilProfileType.SoilProfile1D) ); var soilProfile2 = new PipingStochasticSoilProfile( 1.0, new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2) + }, SoilProfileType.SoilProfile1D) ); const double y = 1.1; @@ -449,14 +449,14 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1) + }, SoilProfileType.SoilProfile1D) ); var soilProfile2 = new PipingStochasticSoilProfile(0.7, new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2) + }, SoilProfileType.SoilProfile1D) ); var soilModel = new PipingStochasticSoilModel("A") @@ -583,13 +583,13 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1); + }, SoilProfileType.SoilProfile1D); var soilProfile2 = new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2); + }, SoilProfileType.SoilProfile1D); var soilModel = new PipingStochasticSoilModel("A") { @@ -657,15 +657,15 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1) + }, SoilProfileType.SoilProfile1D) ); var soilProfile2 = new PipingStochasticSoilProfile( 1.0, new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2) + }, SoilProfileType.SoilProfile1D) ); const double y = 1.1; @@ -753,15 +753,15 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1) + }, SoilProfileType.SoilProfile1D) ); var soilProfile2 = new PipingStochasticSoilProfile( 1.0, new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2) + }, SoilProfileType.SoilProfile1D) ); const double y = 1.1; @@ -876,15 +876,15 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1) + }, SoilProfileType.SoilProfile1D) ); var soilProfile2 = new PipingStochasticSoilProfile( 1.0, new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2) + }, SoilProfileType.SoilProfile1D) ); const double y = 1.1; @@ -995,13 +995,13 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1); + }, SoilProfileType.SoilProfile1D); var soilProfile2 = new PipingSoilProfile("Profile 2", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2); + }, SoilProfileType.SoilProfile1D); var soilModel = new PipingStochasticSoilModel("A") { @@ -1067,19 +1067,19 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1); + }, SoilProfileType.SoilProfile1D); var soilProfile2 = new PipingSoilProfile("Profile 1", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2); + }, SoilProfileType.SoilProfile1D); var soilProfile3 = new PipingSoilProfile("Profile 1", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2); + }, SoilProfileType.SoilProfile1D); var soilModel = new PipingStochasticSoilModel("A") { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -464,7 +464,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0) + }, SoilProfileType.SoilProfile1D) ); var stochasticSoilModel = new PipingStochasticSoilModel("StochasticSoilModelName") { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs (.../PipingStochasticSoilProfilePropertiesTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingStochasticSoilProfilePropertiesTest.cs (.../PipingStochasticSoilProfilePropertiesTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -92,7 +92,7 @@ } }; - var soilProfile = new PipingSoilProfile(expectedName, -5.0, layers, SoilProfileType.SoilProfile1D, 0); + var soilProfile = new PipingSoilProfile(expectedName, -5.0, layers, SoilProfileType.SoilProfile1D); var stochasticSoilProfile = new PipingStochasticSoilProfile(probability, soilProfile); // Call Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -1636,7 +1636,7 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1)); + }, SoilProfileType.SoilProfile1D)); var stochasticSoilModelA = new PipingStochasticSoilModel("Model A") { @@ -1653,7 +1653,7 @@ new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2)) + }, SoilProfileType.SoilProfile1D)) } }; @@ -1663,7 +1663,7 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1)); + }, SoilProfileType.SoilProfile1D)); var stochasticSoilModelE = new PipingStochasticSoilModel("Model E") { @@ -1695,13 +1695,13 @@ new PipingSoilLayer(-5.0), new PipingSoilLayer(-2.0), new PipingSoilLayer(1.0) - }, SoilProfileType.SoilProfile1D, 1)), + }, SoilProfileType.SoilProfile1D)), new PipingStochasticSoilProfile(0.7, new PipingSoilProfile("Profile 4", -8.0, new[] { new PipingSoilLayer(-4.0), new PipingSoilLayer(0.0), new PipingSoilLayer(4.0) - }, SoilProfileType.SoilProfile1D, 2)) + }, SoilProfileType.SoilProfile1D)) } }, stochasticSoilModelE Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -168,8 +168,7 @@ new PipingSoilLayer(2.0), new PipingSoilLayer(0) }, - SoilProfileType.SoilProfile1D, - 1)) + SoilProfileType.SoilProfile1D)) } }; @@ -466,7 +465,7 @@ new PipingSoilLayer(0), new PipingSoilLayer(2), new PipingSoilLayer(3) - }, SoilProfileType.SoilProfile1D, 1)); + }, SoilProfileType.SoilProfile1D)); var calculation = new PipingCalculationScenario(new GeneralPipingInput()) { @@ -666,7 +665,7 @@ new PipingSoilLayer(1), new PipingSoilLayer(3), new PipingSoilLayer(5) - }, SoilProfileType.SoilProfile1D, 1)); + }, SoilProfileType.SoilProfile1D)); } private static PipingSurfaceLine GetSurfaceLineWithGeometry() Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder1DTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder1DTest.cs (.../SoilProfileBuilder1DTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder1DTest.cs (.../SoilProfileBuilder1DTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -36,7 +36,7 @@ { // Setup const string profileName = "SomeProfile"; - var builder = new SoilProfileBuilder1D(profileName, 0.0, 0); + var builder = new SoilProfileBuilder1D(profileName, 0.0); // Call TestDelegate test = () => builder.Build(); @@ -53,8 +53,7 @@ var random = new Random(22); double bottom = random.NextDouble(); double top = random.NextDouble(); - const long pipingSoilProfileId = 1234L; - var builder = new SoilProfileBuilder1D(profileName, bottom, pipingSoilProfileId); + var builder = new SoilProfileBuilder1D(profileName, bottom); builder.Add(new PipingSoilLayer(top) { IsAquifer = true @@ -67,7 +66,6 @@ Assert.AreEqual(profileName, soilProfile.Name); Assert.AreEqual(1, soilProfile.Layers.Count()); Assert.AreEqual(SoilProfileType.SoilProfile1D, soilProfile.SoilProfileType); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); Assert.AreEqual(top, soilProfile.Layers.ToArray()[0].Top); Assert.AreEqual(bottom, soilProfile.Bottom); } @@ -81,9 +79,8 @@ double bottom = random.NextDouble(); double top = bottom + random.NextDouble(); double top2 = bottom + random.NextDouble(); - const long pipingSoilProfileId = 1234L; - var builder = new SoilProfileBuilder1D(profileName, bottom, pipingSoilProfileId); + var builder = new SoilProfileBuilder1D(profileName, bottom); builder.Add(new PipingSoilLayer(top) { IsAquifer = true @@ -102,7 +99,6 @@ top2 }, soilProfile.Layers.Select(l => l.Top)); Assert.AreEqual(bottom, soilProfile.Bottom); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs =================================================================== diff -u -r5906f61fff270a7526253bea07dfecdf680898ed -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 5906f61fff270a7526253bea07dfecdf680898ed) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -41,7 +41,7 @@ const string name = "name"; // Call - TestDelegate test = () => new SoilProfileBuilder2D(name, double.NaN, 0); + TestDelegate test = () => new SoilProfileBuilder2D(name, double.NaN); // Assert var exception = Assert.Throws(test); @@ -53,7 +53,7 @@ public void Constructor_WithNameValidX_DoesNotThrow() { // Call - TestDelegate test = () => new SoilProfileBuilder2D("name", 0.0, 0); + TestDelegate test = () => new SoilProfileBuilder2D("name", 0.0); // Assert Assert.DoesNotThrow(test); @@ -65,7 +65,7 @@ // Setup const string profileName = "SomeProfile"; const double atX = 0.0; - var builder = new SoilProfileBuilder2D(profileName, atX, 0); + var builder = new SoilProfileBuilder2D(profileName, atX); var soilLayer = new SoilLayer2D { @@ -95,7 +95,7 @@ { // Setup const string profileName = "SomeProfile"; - var builder = new SoilProfileBuilder2D(profileName, 0.0, 0); + var builder = new SoilProfileBuilder2D(profileName, 0.0); // Call TestDelegate test = () => builder.Build(); @@ -109,8 +109,7 @@ { // Setup const string profileName = "SomeProfile"; - const long pipingSoilProfileId = 1234L; - var builder = new SoilProfileBuilder2D(profileName, 0.0, pipingSoilProfileId); + var builder = new SoilProfileBuilder2D(profileName, 0.0); var firstPoint = new Point2D(-0.5, 1.0); var secondPoint = new Point2D(0.5, 1.0); var thirdPoint = new Point2D(0.5, -1.0); @@ -136,16 +135,14 @@ Assert.AreEqual(1.0, soilProfile.Layers.ToArray()[0].Top); Assert.AreEqual(-1.0, soilProfile.Bottom); Assert.AreEqual(SoilProfileType.SoilProfile2D, soilProfile.SoilProfileType); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); } [Test] public void Build_WithMultipleLayersOnlyOuterLoop_ReturnsProfileWithBottomAndALayers() { // Setup const string profileName = "SomeProfile"; - const long pipingSoilProfileId = 1234L; - var builder = new SoilProfileBuilder2D(profileName, 1.0, pipingSoilProfileId); + var builder = new SoilProfileBuilder2D(profileName, 1.0); builder.Add(new SoilLayer2D { OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, @@ -204,16 +201,14 @@ 8.0 }, soilProfile.Layers.Select(rl => rl.Top)); Assert.AreEqual(1.0, soilProfile.Bottom); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); } [Test] public void Build_WithLayerFilledWithOtherLayer_ReturnsProfileWithBottomAndALayers() { // Setup const string profileName = "SomeProfile"; - const long pipingSoilProfileId = 1234L; - var builder = new SoilProfileBuilder2D(profileName, 2.0, pipingSoilProfileId); + var builder = new SoilProfileBuilder2D(profileName, 2.0); List loopHole = Segment2DLoopCollectionHelper.CreateFromString(string.Join(Environment.NewLine, "5", ".....", @@ -251,7 +246,6 @@ 2.0 }, soilProfile.Layers.Select(rl => rl.Top)); Assert.AreEqual(0.0, soilProfile.Bottom); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationImporterTest.cs (.../PipingCalculationConfigurationImporterTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -592,7 +592,7 @@ var stochasticSoilProfile = new PipingStochasticSoilProfile(0, new PipingSoilProfile("Ondergrondschematisatie", 0, new[] { new PipingSoilLayer(0) - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); PipingStochasticSoilModel stochasticSoilModel = PipingStochasticSoilModelTestFactory.CreatePipingStochasticSoilModel("Ondergrondmodel"); stochasticSoilModel.StochasticSoilProfiles.Add(stochasticSoilProfile); Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -57,7 +57,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); // Call PipingInput input = invalidPipingCalculation.InputParameters; @@ -100,7 +100,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); var input = new PipingInput(new GeneralPipingInput()) { @@ -143,7 +143,7 @@ { IsAquifer = false } - }, SoilProfileType.SoilProfile1D, 0)); + }, SoilProfileType.SoilProfile1D)); var input = new PipingInput(new GeneralPipingInput()) { Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs =================================================================== diff -u -rd6fe8399e8398224cf1bda9259052232d85b85a4 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs (.../PipingCalculatorInputTest.cs) (revision d6fe8399e8398224cf1bda9259052232d85b85a4) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorInputTest.cs (.../PipingCalculatorInputTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -75,7 +75,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call var input = new PipingCalculatorInput( Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs =================================================================== diff -u -raa49537188229065df91b1a931f088c32115702a -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision aa49537188229065df91b1a931f088c32115702a) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingCalculatorTest.cs (.../PipingCalculatorTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -418,7 +418,7 @@ { IsAquifer = true } - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); var input = new PipingCalculatorInput(properties); @@ -441,7 +441,7 @@ properties.SoilProfile = new PipingSoilProfile(string.Empty, -1.0, new[] { new PipingSoilLayer(0) - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); var input = new PipingCalculatorInput(properties); @@ -611,7 +611,7 @@ }, new PipingSoilLayer(2), new PipingSoilLayer(-1) - }, SoilProfileType.SoilProfile1D, 1234L); + }, SoilProfileType.SoilProfile1D); } private static PipingSurfaceLine CreateValidSurfaceLine() Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingProfileCreatorTest.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingProfileCreatorTest.cs (.../PipingProfileCreatorTest.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingProfileCreatorTest.cs (.../PipingProfileCreatorTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -39,7 +39,6 @@ var random = new Random(22); double expectedTop = random.NextDouble(); double expectedBottom = expectedTop - random.NextDouble(); - const long pipingSoilProfileId = 1234L; var layers = new[] { @@ -48,7 +47,7 @@ IsAquifer = true } }; - var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D, pipingSoilProfileId); + var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D); // Call PipingProfile actual = PipingProfileCreator.Create(soilProfile); @@ -64,7 +63,6 @@ PipingLayer pipingLayer = actual.Layers.First(); Assert.IsTrue(pipingLayer.IsAquifer); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); } [Test] @@ -76,7 +74,6 @@ double expectedTopB = expectedTopA - random.NextDouble(); double expectedTopC = expectedTopB - random.NextDouble(); double expectedBottom = expectedTopC - random.NextDouble(); - const long pipingSoilProfileId = 1234L; var layers = new[] { new PipingSoilLayer(expectedTopA) @@ -87,7 +84,7 @@ new PipingSoilLayer(expectedTopC) }; - var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D, pipingSoilProfileId); + var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D); // Call PipingProfile actual = PipingProfileCreator.Create(soilProfile); @@ -108,7 +105,6 @@ expectedTopC }, actual.Layers.Select(l => l.TopLevel)); Assert.AreEqual(expectedBottom, actual.BottomLevel); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); } [Test] @@ -120,7 +116,6 @@ double expectedTopB = random.NextDouble() + expectedTopA; double expectedTopC = random.NextDouble() + expectedTopB; double expectedBottom = expectedTopA - random.NextDouble(); - const long pipingSoilProfileId = 1234L; var layers = new[] { new PipingSoilLayer(expectedTopA) @@ -130,7 +125,7 @@ new PipingSoilLayer(expectedTopB), new PipingSoilLayer(expectedTopC) }; - var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D, pipingSoilProfileId); + var soilProfile = new PipingSoilProfile(string.Empty, expectedBottom, layers, SoilProfileType.SoilProfile1D); // Precondition CollectionAssert.AreNotEqual(layers, layers.OrderByDescending(l => l.Top), "Layer collection should not be in descending order by the Top property."); @@ -157,7 +152,6 @@ expectedTopA }, actual.Layers.Select(l => l.TopLevel)); Assert.AreEqual(expectedBottom, actual.BottomLevel); - Assert.AreEqual(pipingSoilProfileId, soilProfile.PipingSoilProfileId); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/PipingSoilProfileTestFactory.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/PipingSoilProfileTestFactory.cs (.../PipingSoilProfileTestFactory.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/PipingSoilProfileTestFactory.cs (.../PipingSoilProfileTestFactory.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -68,7 +68,7 @@ { IsAquifer = true } - }, soilProfileType, 0L); + }, soilProfileType); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingSoilProfile.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingSoilProfile.cs (.../TestPipingSoilProfile.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/TestPipingSoilProfile.cs (.../TestPipingSoilProfile.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -76,6 +76,6 @@ { IsAquifer = true } - }, soilProfileType, 0) {} + }, soilProfileType) {} } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs (.../PipingStochasticSoilModelUpdateDataStrategyTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingStochasticSoilModelUpdateDataStrategyTest.cs (.../PipingStochasticSoilModelUpdateDataStrategyTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -492,8 +492,7 @@ profile.SoilProfile.Name, profile.SoilProfile.Bottom - 0.2, profile.SoilProfile.Layers, - profile.SoilProfile.SoilProfileType, - profile.SoilProfile.PipingSoilProfileId)); + profile.SoilProfile.SoilProfileType)); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilProfileTest.cs =================================================================== diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/PipingSoilProfileTest.cs (.../PipingSoilProfileTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -32,39 +32,34 @@ [TestFixture] public class PipingSoilProfileTest { - private static readonly Random profileIdRandom = new Random(32); - [Test] - [TestCase(SoilProfileType.SoilProfile1D)] - [TestCase(SoilProfileType.SoilProfile2D)] - public void Constructor_WithNameBottomLayersAndAquifer_ReturnsInstanceWithPropsAndEquivalentLayerCollection(SoilProfileType type) + public void Constructor_WithNameBottomLayersAndAquifer_ReturnsInstanceWithPropsAndEquivalentLayerCollection() { // Setup const string name = "Profile"; var random = new Random(22); double bottom = random.NextDouble(); + var type = random.NextEnumValue(); var layers = new Collection { new PipingSoilLayer(bottom) }; - const long pipingSoilProfileId = 1234L; // Call - var profile = new PipingSoilProfile(name, bottom, layers, type, pipingSoilProfileId); + var profile = new PipingSoilProfile(name, bottom, layers, type); // Assert Assert.AreNotSame(layers, profile.Layers); Assert.AreEqual(name, profile.Name); Assert.AreEqual(bottom, profile.Bottom); Assert.AreEqual(type, profile.SoilProfileType); - Assert.AreEqual(pipingSoilProfileId, profile.PipingSoilProfileId); } [Test] public void Constructor_WithNameBottomLayersEmpty_ThrowsArgumentException() { // Call - TestDelegate test = () => new PipingSoilProfile(string.Empty, double.NaN, new Collection(), SoilProfileType.SoilProfile1D, 0); + TestDelegate test = () => new PipingSoilProfile(string.Empty, double.NaN, new Collection(), SoilProfileType.SoilProfile1D); // Assert const string expectedMessage = "Geen lagen gevonden voor de ondergrondschematisatie."; @@ -75,7 +70,7 @@ public void Constructor_WithNameBottomLayersNull_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new PipingSoilProfile(string.Empty, double.NaN, null, SoilProfileType.SoilProfile1D, 0); + TestDelegate test = () => new PipingSoilProfile(string.Empty, double.NaN, null, SoilProfileType.SoilProfile1D); // Assert const string expectedMessage = "Geen lagen gevonden voor de ondergrondschematisatie."; @@ -100,7 +95,7 @@ }); } - var profile = new PipingSoilProfile(string.Empty, bottom, equivalentLayers, SoilProfileType.SoilProfile1D, 0); + var profile = new PipingSoilProfile(string.Empty, bottom, equivalentLayers, SoilProfileType.SoilProfile1D); // Call PipingSoilLayer[] result = profile.Layers.ToArray(); @@ -124,7 +119,7 @@ }; // Call - TestDelegate test = () => new PipingSoilProfile(string.Empty, bottom, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); + TestDelegate test = () => new PipingSoilProfile(string.Empty, bottom, pipingSoilLayers, SoilProfileType.SoilProfile1D); // Assert const string expectedMessage = "Eén of meerdere lagen hebben een top onder de bodem van de ondergrondschematisatie."; @@ -142,7 +137,7 @@ new PipingSoilLayer(0.0), new PipingSoilLayer(1.1) }; - var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); + var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D); // Call double thickness = profile.GetLayerThickness(pipingSoilLayers[layerIndex]); @@ -160,7 +155,7 @@ new PipingSoilLayer(0.0), new PipingSoilLayer(1.1) }; - var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D, 0); + var profile = new PipingSoilProfile(string.Empty, 0.0, pipingSoilLayers, SoilProfileType.SoilProfile1D); // Call TestDelegate test = () => profile.GetLayerThickness(new PipingSoilLayer(1.1)); @@ -177,7 +172,7 @@ var profile = new PipingSoilProfile(null, 0.0, new[] { new PipingSoilLayer(0.0) - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call string text = profile.ToString(); @@ -195,7 +190,7 @@ var profile = new PipingSoilProfile(name, 0.0, new[] { new PipingSoilLayer(0.0) - }, SoilProfileType.SoilProfile1D, 0); + }, SoilProfileType.SoilProfile1D); // Call string text = profile.ToString(); @@ -254,7 +249,7 @@ var profile = new PipingSoilProfile("name", 0, new[] { CreateRandomLayer(new Random(21)) - }, SoilProfileType.SoilProfile1D, -1); + }, SoilProfileType.SoilProfile1D); // Call bool areEqual = profile.Equals(null); @@ -292,23 +287,23 @@ var profileH = new PipingSoilProfile(GetRandomName(random), -random.NextDouble(), new[] { CreateRandomLayer(random) - }, random.NextEnumValue(), random.Next()); + }, random.NextEnumValue()); random = new Random(seed); var profileI = new PipingSoilProfile(GetRandomName(random), -random.NextDouble(), new[] { CreateRandomLayer(random), CreateRandomLayer(random) - }, random.NextEnumValue(), random.Next()); + }, random.NextEnumValue()); var profileJ = new PipingSoilProfile("A", -3, new[] { new PipingSoilLayer(-2) - }, SoilProfileType.SoilProfile1D, 35); + }, SoilProfileType.SoilProfile1D); var profileK = new PipingSoilProfile("A", -3, new[] { new PipingSoilLayer(-2) - }, SoilProfileType.SoilProfile1D, 56); + }, SoilProfileType.SoilProfile1D); return new[] { @@ -348,7 +343,7 @@ return new PipingSoilProfile(name, bottom, new[] { new PipingSoilLayer(bottom + 1.0) - }, type, profileIdRandom.Next()); + }, type); } private static PipingSoilProfile CreateRandomProfile(int randomSeed) @@ -359,7 +354,7 @@ { layers.Add(CreateRandomLayer(random)); } - return new PipingSoilProfile(GetRandomName(random), -1.0 - random.NextDouble(), layers, random.NextEnumValue(), profileIdRandom.Next()); + return new PipingSoilProfile(GetRandomName(random), -1.0 - random.NextDouble(), layers, random.NextEnumValue()); } private static PipingSoilLayer CreateRandomLayer(Random random) @@ -390,8 +385,7 @@ : base(profile.Name, profile.Bottom, profile.Layers, - profile.SoilProfileType, - profile.PipingSoilProfileId) {} + profile.SoilProfileType) {} } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -rad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision ad0f4a7a0f8b9f065da77eda1a450ac3696b8f7f) @@ -355,7 +355,7 @@ topLayer, bottomLayer }, - SoilProfileType.SoilProfile1D, -1)); + SoilProfileType.SoilProfile1D)); testCalculation.Name = name; @@ -391,7 +391,7 @@ { aquitardLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); testCalculation.Name = name; @@ -435,7 +435,7 @@ { aquiferLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); testCalculation.Name = name; @@ -482,7 +482,7 @@ coverageLayerAboveSurfaceLine, bottomAquiferLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); testCalculation.Name = name; @@ -546,7 +546,7 @@ middleCoverageLayer, bottomAquiferLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); testCalculation.Name = name; @@ -607,7 +607,7 @@ completeLayer, incompletePipingSoilLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); testCalculation.Name = name; @@ -659,7 +659,7 @@ validLayer, coverageLayerInvalidD70 }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.Name = name; testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); @@ -720,7 +720,7 @@ completeLayer, incompletePipingSoilLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); testCalculation.Name = name; @@ -785,7 +785,7 @@ incompletePipingSoilLayer, completeLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); testCalculation.Name = name; @@ -834,7 +834,7 @@ coverageLayerInvalidSaturatedVolumicWeight, validLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.Name = name; testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile); @@ -894,7 +894,7 @@ middleCoverageLayerMissingParameter, bottomAquiferLayer }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D); testCalculation.Name = name; testCalculation.InputParameters.StochasticSoilProfile = new PipingStochasticSoilProfile(0.0, profile);