Index: Ringtoets.sln =================================================================== diff -u -r050f90d86c3b1cb918422bb20e6dd51c0d879170 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets.sln (.../Ringtoets.sln) (revision 050f90d86c3b1cb918422bb20e6dd51c0d879170) +++ Ringtoets.sln (.../Ringtoets.sln) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -1717,12 +1717,24 @@ EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.MacroStabilityInwards.Primitives.TestUtil", "Ringtoets\MacroStabilityInwards\test\Ringtoets.MacroStabilityInwards.Primitives.TestUtil\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.csproj", "{1DF4EE8D-0EF5-4FCC-A40E-CB8B82080FDF}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test", "Ringtoets\MacroStabilityInwards\test\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test\Ringtoets.MacroStabilityInwards.Primitives.TestUtil.Test.csproj", "{C80AD710-0F84-40CE-9567-10CBE332E589}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Primitives.TestUtil", "Ringtoets\Piping\test\Ringtoets.Piping.Primitives.TestUtil\Ringtoets.Piping.Primitives.TestUtil.csproj", "{6F568E38-592A-4F99-A901-86B74C4F24D2}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Primitives.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Primitives.TestUtil.Test\Ringtoets.Piping.Primitives.TestUtil.Test.csproj", "{AF88C45B-6C4B-40E3-9B12-83F0FDCAB623}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r604dfe021f6161f8e5d107dd5821ba06390c5ecf -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 604dfe021f6161f8e5d107dd5821ba06390c5ecf) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -728,15 +728,6 @@ } /// - /// Looks up a localized string similar to Grensspanning. - /// - public static string PreconsolidationStress_Name { - get { - return ResourceManager.GetString("PreconsolidationStress_Name", resourceCulture); - } - } - - /// /// Looks up a localized string similar to Kans moet in het bereik {0} liggen.. /// public static string Probability_Must_be_in_Range_0_ { Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx =================================================================== diff -u -r604dfe021f6161f8e5d107dd5821ba06390c5ecf -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 604dfe021f6161f8e5d107dd5821ba06390c5ecf) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -387,7 +387,4 @@ Kruin buitentalud - - Grensspanning - \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r3ef29576f648d550db4fd66d986da3c2f0522b2d -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3ef29576f648d550db4fd66d986da3c2f0522b2d) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -1536,14 +1536,14 @@ } /// - /// Looks up a localized string similar to BEGIN TRANSACTION; - ///CREATE TABLE "TimeIntegrationSettings" ( - /// "LocationID" INTEGER NOT NULL, - /// "CalculationTypeID" INTEGER NOT NULL, - /// "TimeIntegrationSchemeID" INTEGER NOT NULL, - /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), - /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION - ///); + /// Looks up a localized string similar to BEGIN TRANSACTION; + ///CREATE TABLE "TimeIntegrationSettings" ( + /// "LocationID" INTEGER NOT NULL, + /// "CalculationTypeID" INTEGER NOT NULL, + /// "TimeIntegrationSchemeID" INTEGER NOT NULL, + /// CONSTRAINT timeintegrationsettings_pk PRIMARY KEY ("LocationID", "CalculationTypeID"), + /// CONSTRAINT calculationtypes_timeintegrationsettings_fk FOREIGN KEY ("CalculationTypeID") REFERENCES CalculationTypes ("CalculationTypeID") ON DELETE NO ACTION ON UPDATE NO ACTION + ///); ///CREATE TABLE "Numeri [rest of string was truncated]";. /// public static string settings_schema { @@ -1687,9 +1687,9 @@ /// /// Looks up a localized string similar to Is aquifer. /// - public static string SoilLayerProperties_IsAquifer_Name { + public static string SoilLayerProperties_IsAquifer_DisplayName { get { - return ResourceManager.GetString("SoilLayerProperties_IsAquifer_Name", resourceCulture); + return ResourceManager.GetString("SoilLayerProperties_IsAquifer_DisplayName", resourceCulture); } } Index: Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx =================================================================== diff -u -r56f49fd6924c36df10f9b41247ce9a1f5ea0c790 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 56f49fd6924c36df10f9b41247ce9a1f5ea0c790) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Properties/Resources.resx (.../Resources.resx) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -892,7 +892,7 @@ Parameter '{0}' is niet verschoven lognormaal verdeeld. - + Is aquifer Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/PreconsolidationStressReadValues.cs =================================================================== diff -u -rf23ce41a1dd004c56ab38179b6b28cd389edba36 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/PreconsolidationStressReadValues.cs (.../PreconsolidationStressReadValues.cs) (revision f23ce41a1dd004c56ab38179b6b28cd389edba36) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/PreconsolidationStressReadValues.cs (.../PreconsolidationStressReadValues.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -42,7 +42,7 @@ /// The to obtain /// the preconsolidation stress properties from. /// The profile name used for generating exception messages - /// if reading property vailes fails. + /// if reading property values fails. /// Thrown when any of the parameters /// are null. /// Thrown when the values in the database Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/PreconsolidationStressTableDefinitions.cs =================================================================== diff -u -rf23ce41a1dd004c56ab38179b6b28cd389edba36 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/PreconsolidationStressTableDefinitions.cs (.../PreconsolidationStressTableDefinitions.cs) (revision f23ce41a1dd004c56ab38179b6b28cd389edba36) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/Schema/PreconsolidationStressTableDefinitions.cs (.../PreconsolidationStressTableDefinitions.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -25,7 +25,7 @@ /// Defines the column and table names of the table 'PreconsolidationStresses' in /// the D-Soil model database. /// - public static class PreconsolidationStressTableDefinitions + internal static class PreconsolidationStressTableDefinitions { /// /// The name of the table. Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseQueryBuilder.cs =================================================================== diff -u -rf23ce41a1dd004c56ab38179b6b28cd389edba36 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision f23ce41a1dd004c56ab38179b6b28cd389edba36) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseQueryBuilder.cs (.../SoilDatabaseQueryBuilder.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -342,8 +342,8 @@ "SELECT " + "sp2d.SP2D_Name AS ProfileName, " + $"{StochasticSoilProfileTableDefinitions.SoilProfile2DId} AS {SoilProfileTableDefinitions.SoilProfileId}, " + - $"X AS {PreconsolidationStressTableDefinitions.PreconsolidationStressXCoordinate}, " + - $"Z AS {PreconsolidationStressTableDefinitions.PreconsolidationStressZCoordinate}, " + + $"ps.X AS {PreconsolidationStressTableDefinitions.PreconsolidationStressXCoordinate}, " + + $"ps.Z AS {PreconsolidationStressTableDefinitions.PreconsolidationStressZCoordinate}, " + $"s.ST_Dist_Type AS {PreconsolidationStressTableDefinitions.PreconsolidationStressDistributionType}, " + $"s.ST_Mean AS {PreconsolidationStressTableDefinitions.PreconsolidationStressMean}, " + $"s.ST_Variation AS {PreconsolidationStressTableDefinitions.PreconsolidationStressCoefficientOfVariation}, " + Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressReadValuesTest.cs =================================================================== diff -u -rf23ce41a1dd004c56ab38179b6b28cd389edba36 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressReadValuesTest.cs (.../PreconsolidationStressReadValuesTest.cs) (revision f23ce41a1dd004c56ab38179b6b28cd389edba36) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressReadValuesTest.cs (.../PreconsolidationStressReadValuesTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -34,7 +34,7 @@ public class PreconsolidationStressReadValuesTest { [Test] - public void PreconsolidationStressProperties_ReaderNull_ThrowsArgumentNullException() + public void PreconsolidationStressReadValues_ReaderNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new PreconsolidationStressReadValues(null, string.Empty); @@ -45,7 +45,7 @@ } [Test] - public void PreconsolidationStressProperties_ProfileNameNull_ThrowsArgumentNullException() + public void PreconsolidationStressReadValues_ProfileNameNull_ThrowsArgumentNullException() { // Setup var mockRepository = new MockRepository(); @@ -63,7 +63,7 @@ } [Test] - public void PreconsolidationStressProperties_WithReaderAndProfileName_SetProperties() + public void PreconsolidationStressReadValues_WithReaderAndProfileName_SetProperties() { // Setup var random = new Random(42); @@ -99,7 +99,7 @@ [Test] [TestCaseSource(nameof(PreconsolidationStressProperties))] - public void LayerProperties_ReaderThrowsInvalidCastException_ThrowsSoilProfileReadException(string columnName) + public void PreconsolidationStressReadValues_ReaderThrowsInvalidCastException_ThrowsSoilProfileReadException(string columnName) { // Setup const string path = "path"; Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseQueryBuilderTest.cs =================================================================== diff -u -r6c0f3118c979a3461ec52ffcc452e9d6ec2b1b76 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 6c0f3118c979a3461ec52ffcc452e9d6ec2b1b76) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -396,8 +396,8 @@ "SELECT " + "sp2d.SP2D_Name AS ProfileName, " + "SP2D_ID AS SoilProfileId, " + - "X AS PreconsolidationStressXCoordinate, " + - "Z AS PreconsolidationStressZCoordinate, " + + "ps.X AS PreconsolidationStressXCoordinate, " + + "ps.Z AS PreconsolidationStressZCoordinate, " + "s.ST_Dist_Type AS PreconsolidationStressDistributionType, " + "s.ST_Mean AS PreconsolidationStressMean, " + "s.ST_Variation AS PreconsolidationStressCoefficientOfVariation, " + Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs =================================================================== diff -u -r35bb3fb2239c0f3633155ccea59b2b3bad28f52d -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision 35bb3fb2239c0f3633155ccea59b2b3bad28f52d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactory.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -131,8 +131,8 @@ return props; } - private static MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine ToPreconsolidationStressUnderSurfaceLine - (MacroStabilityInwardsPreconsolidationStress preconsolidationStress) + private static MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine ToPreconsolidationStressUnderSurfaceLine( + MacroStabilityInwardsPreconsolidationStress preconsolidationStress) { var macroStabilityInwardsPreconsolidationStressUnderSurfaceLine = new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine( new MacroStabilityInwardsPreconsolidationStressUnderSurfaceLine.ConstructionProperties Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r4150f7f869d9e9275c32812579e771eb8aae8170 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4150f7f869d9e9275c32812579e771eb8aae8170) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -537,7 +537,7 @@ } /// - /// Looks up a localized string similar to Het quotiënt van de weerstandbiedende- en aadrijvende krachten langs een glijvlak.. + /// Looks up a localized string similar to Het quotiënt van de weerstandbiedende- en aandrijvende krachten langs een glijvlak.. /// public static string MacroStabilityInwardsOutputContext_FactorOfStability_Description { get { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx =================================================================== diff -u -r4150f7f869d9e9275c32812579e771eb8aae8170 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4150f7f869d9e9275c32812579e771eb8aae8170) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -551,7 +551,7 @@ Grensspanningen - Het quotiënt van de weerstandbiedende- en aadrijvende krachten langs een glijvlak. + Het quotiënt van de weerstandbiedende- en aandrijvende krachten langs een glijvlak. Stabiliteitsfactor [-] Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r9cdab8b57c9731d15b8bbcf494fc9ca27fcb5312 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 9cdab8b57c9731d15b8bbcf494fc9ca27fcb5312) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -1,25 +1,4 @@ -// Copyright (C) Stichting Deltares 2017. All rights reserved. -// -// This file is part of Ringtoets. -// -// Ringtoets is free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program. If not, see . -// -// All names, logos, and references to "Deltares" are registered trademarks of -// Stichting Deltares and remain full property of Stichting Deltares at all times. -// All rights reserved. - -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------ // // This code was generated by a tool. // Runtime Version:4.0.30319.42000 @@ -246,6 +225,15 @@ } /// + /// Looks up a localized string similar to Grensspanning. + /// + public static string PreconsolidationStress_DisplayName { + get { + return ResourceManager.GetString("PreconsolidationStress_DisplayName", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Kan geen ondergrondmodellen lezen. Mogelijk bestaat de '{0}' tabel niet.. /// public static string SoilDatabaseConstraintsReader_VerifyConstraints_Can_not_read_StochasticSoilModel_Perhaps_table_missing { @@ -353,36 +341,36 @@ /// /// Looks up a localized string similar to Verzadigd gewicht. /// - public static string SoilLayerProperties_BelowPhreaticLevelDistribution_Description { + public static string SoilLayerProperties_BelowPhreaticLevelDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayerProperties_BelowPhreaticLevelDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayerProperties_BelowPhreaticLevelDistribution_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Cohesie. /// - public static string SoilLayerProperties_CohesionDistribution_Description { + public static string SoilLayerProperties_CohesionDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayerProperties_CohesionDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayerProperties_CohesionDistribution_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Wrijvingshoek. /// - public static string SoilLayerProperties_FrictionAngleDistribution_Description { + public static string SoilLayerProperties_FrictionAngleDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayerProperties_FrictionAngleDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayerProperties_FrictionAngleDistribution_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to POP. /// - public static string SoilLayerProperties_PopDistribution_Description { + public static string SoilLayerProperties_PopDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayerProperties_PopDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayerProperties_PopDistribution_DisplayName", resourceCulture); } } @@ -398,18 +386,18 @@ /// /// Looks up a localized string similar to Schuifsterkte ratio S. /// - public static string SoilLayerProperties_ShearStrengthRatioDistribution_Description { + public static string SoilLayerProperties_ShearStrengthRatioDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayerProperties_ShearStrengthRatioDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayerProperties_ShearStrengthRatioDistribution_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Sterkte toename exponent. /// - public static string SoilLayerProperties_StrengthIncreaseExponentDistribution_Description { + public static string SoilLayerProperties_StrengthIncreaseExponentDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayerProperties_StrengthIncreaseExponentDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayerProperties_StrengthIncreaseExponentDistribution_DisplayName", resourceCulture); } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx =================================================================== diff -u -r9cdab8b57c9731d15b8bbcf494fc9ca27fcb5312 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision 9cdab8b57c9731d15b8bbcf494fc9ca27fcb5312) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/Properties/Resources.resx (.../Resources.resx) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -243,22 +243,22 @@ Onverzadigd gewicht - + Cohesie - + Wrijvingshoek - + POP - + Schuifsterkte ratio S - + Sterkte toename exponent - + Verzadigd gewicht @@ -273,4 +273,7 @@ De laag bevat een ongeldige geometrie. + + Grensspanning + \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformer.cs =================================================================== diff -u -r604dfe021f6161f8e5d107dd5821ba06390c5ecf -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformer.cs (.../MacroStabilityInwardsPreconsolidationStressTransformer.cs) (revision 604dfe021f6161f8e5d107dd5821ba06390c5ecf) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformer.cs (.../MacroStabilityInwardsPreconsolidationStressTransformer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -23,7 +23,7 @@ using Ringtoets.Common.IO.Exceptions; using Ringtoets.Common.IO.SoilProfile; using Ringtoets.MacroStabilityInwards.Primitives; -using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; +using Ringtoets.MacroStabilityInwards.IO.Properties; namespace Ringtoets.MacroStabilityInwards.IO.SoilProfiles { @@ -54,8 +54,8 @@ } DistributionHelper.ValidateIsNonShiftedLogNormal(preconsolidationStress.PreconsolidationStressDistributionType, - preconsolidationStress.PreconsolidationStressShift, - RingtoetsCommonDataResources.PreconsolidationStress_Name); + preconsolidationStress.PreconsolidationStressShift, + Resources.PreconsolidationStress_DisplayName); try { Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs =================================================================== diff -u -r9cdab8b57c9731d15b8bbcf494fc9ca27fcb5312 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs (.../MacroStabilityInwardsSoilLayerTransformer.cs) (revision 9cdab8b57c9731d15b8bbcf494fc9ca27fcb5312) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfiles/MacroStabilityInwardsSoilLayerTransformer.cs (.../MacroStabilityInwardsSoilLayerTransformer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -147,7 +147,7 @@ catch (NotSupportedException) { throw new ImportedDataTransformException(string.Format(RingtoetsCommonIOResources.Transform_Invalid_value_ParameterName_0, - RingtoetsCommonIOResources.SoilLayerProperties_IsAquifer_Name)); + RingtoetsCommonIOResources.SoilLayerProperties_IsAquifer_DisplayName)); } } @@ -249,32 +249,32 @@ DistributionHelper.ValidateIsLogNormal( soilLayer.BelowPhreaticLevelDistributionType, - Resources.SoilLayerProperties_BelowPhreaticLevelDistribution_Description); + Resources.SoilLayerProperties_BelowPhreaticLevelDistribution_DisplayName); DistributionHelper.ValidateIsNonShiftedLogNormal( soilLayer.CohesionDistributionType, soilLayer.CohesionShift, - Resources.SoilLayerProperties_CohesionDistribution_Description); + Resources.SoilLayerProperties_CohesionDistribution_DisplayName); DistributionHelper.ValidateIsNonShiftedLogNormal( soilLayer.FrictionAngleDistributionType, soilLayer.FrictionAngleShift, - Resources.SoilLayerProperties_FrictionAngleDistribution_Description); + Resources.SoilLayerProperties_FrictionAngleDistribution_DisplayName); DistributionHelper.ValidateIsNonShiftedLogNormal( soilLayer.ShearStrengthRatioDistributionType, soilLayer.ShearStrengthRatioShift, - Resources.SoilLayerProperties_ShearStrengthRatioDistribution_Description); + Resources.SoilLayerProperties_ShearStrengthRatioDistribution_DisplayName); DistributionHelper.ValidateIsNonShiftedLogNormal( soilLayer.StrengthIncreaseExponentDistributionType, soilLayer.StrengthIncreaseExponentShift, - Resources.SoilLayerProperties_StrengthIncreaseExponentDistribution_Description); + Resources.SoilLayerProperties_StrengthIncreaseExponentDistribution_DisplayName); DistributionHelper.ValidateIsNonShiftedLogNormal( soilLayer.PopDistributionType, soilLayer.PopShift, - Resources.SoilLayerProperties_PopDistribution_Description); + Resources.SoilLayerProperties_PopDistribution_DisplayName); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj =================================================================== diff -u -rf79fd1627089fd5c8887fd7c19ca5e75df6db29d -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision f79fd1627089fd5c8887fd7c19ca5e75df6db29d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Primitives/Ringtoets.MacroStabilityInwards.Primitives.csproj (.../Ringtoets.MacroStabilityInwards.Primitives.csproj) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -79,6 +79,7 @@ {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98} Core.Common.Utils + False {d4200f43-3f72-4f42-af0a-8ced416a38ec} Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs =================================================================== diff -u -r8f603e2036a1d07da2dfd2288f9de86abccb2e55 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision 8f603e2036a1d07da2dfd2288f9de86abccb2e55) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/SoilProfile/MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs (.../MacroStabilityInwardsSoilProfileUnderSurfaceLineFactoryTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -407,7 +407,7 @@ } [Test] - public void SoilProfile1DCreate_Always_ReturnsEmptyPreconsolidationStresses() + public void SoilProfile1DCreate_ValidSoilProfile1D_ReturnsEmptyPreconsolidationStresses() { // Setup var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs =================================================================== diff -u -r4150f7f869d9e9275c32812579e771eb8aae8170 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs (.../MacroStabilityInwardsOutputContextPropertiesTest.cs) (revision 4150f7f869d9e9275c32812579e771eb8aae8170) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs (.../MacroStabilityInwardsOutputContextPropertiesTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -153,7 +153,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(stabilityFactorProperty, macroStabilityInwardsCategory, "Stabiliteitsfactor [-]", - "Het quotiënt van de weerstandbiedende- en aadrijvende krachten langs een glijvlak.", + "Het quotiënt van de weerstandbiedende- en aandrijvende krachten langs een glijvlak.", true); PropertyDescriptor requiredProbabilityProperty = dynamicProperties[1]; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsPreconsolidationStressPropertiesTest.cs =================================================================== diff -u -rf9a05eac5abbe32393ec1ceee14b61cd9ed6bb23 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsPreconsolidationStressPropertiesTest.cs (.../MacroStabilityInwardsPreconsolidationStressPropertiesTest.cs) (revision f9a05eac5abbe32393ec1ceee14b61cd9ed6bb23) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsPreconsolidationStressPropertiesTest.cs (.../MacroStabilityInwardsPreconsolidationStressPropertiesTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -25,6 +25,7 @@ using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using NUnit.Framework; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; using Ringtoets.MacroStabilityInwards.Primitives; @@ -63,14 +64,18 @@ Assert.IsInstanceOf>(properties); Assert.AreSame(stress, properties.Data); - Assert.AreEqual(new RoundedDouble(2, stress.XCoordinate), properties.XCoordinate); - Assert.AreEqual(new RoundedDouble(2, stress.ZCoordinate), properties.ZCoordinate); + Assert.AreEqual(2, properties.XCoordinate.NumberOfDecimalPlaces); + Assert.AreEqual(stress.XCoordinate, properties.XCoordinate, properties.XCoordinate.GetAccuracy()); + Assert.AreEqual(2, properties.ZCoordinate.NumberOfDecimalPlaces); + Assert.AreEqual(stress.ZCoordinate, properties.ZCoordinate, properties.ZCoordinate.GetAccuracy()); Assert.IsInstanceOf(properties.PreconsolidationStress); - Assert.AreEqual(new RoundedDouble(2, stress.PreconsolidationStressMean), - properties.PreconsolidationStress.Mean); - Assert.AreEqual(new RoundedDouble(2, stress.PreconsolidationStressCoefficientOfVariation), - properties.PreconsolidationStress.CoefficientOfVariation); + Assert.AreEqual(2, properties.PreconsolidationStress.Mean.NumberOfDecimalPlaces); + Assert.AreEqual(stress.PreconsolidationStressMean, properties.PreconsolidationStress.Mean, + properties.PreconsolidationStress.Mean.GetAccuracy()); + Assert.AreEqual(2, properties.PreconsolidationStress.Mean.NumberOfDecimalPlaces); + Assert.AreEqual(stress.PreconsolidationStressCoefficientOfVariation, properties.PreconsolidationStress.CoefficientOfVariation, + properties.PreconsolidationStress.CoefficientOfVariation.GetAccuracy()); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs =================================================================== diff -u -r0e505095fa8231799f2e4f1d609a106c122144c3 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs (.../MacroStabilityInwardsPreconsolidationStressTransformerTest.cs) (revision 0e505095fa8231799f2e4f1d609a106c122144c3) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfiles/MacroStabilityInwardsPreconsolidationStressTransformerTest.cs (.../MacroStabilityInwardsPreconsolidationStressTransformerTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -126,27 +126,31 @@ yield return new TestCaseData(new PreconsolidationStress { + XCoordinate = double.NaN, ZCoordinate = zCoordinate, PreconsolidationStressMean = preconsolidationStressMean, PreconsolidationStressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation }, "X-coördinaat").SetName("Invalid XCoordinate"); yield return new TestCaseData(new PreconsolidationStress { XCoordinate = xCoordinate, + ZCoordinate = double.NaN, PreconsolidationStressMean = preconsolidationStressMean, PreconsolidationStressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation }, "Z-coördinaat").SetName("Invalid ZCoordinate"); yield return new TestCaseData(new PreconsolidationStress { XCoordinate = xCoordinate, ZCoordinate = zCoordinate, + PreconsolidationStressMean = double.NaN, PreconsolidationStressCoefficientOfVariation = preconsolidationStressCoefficientOfVariation }, "gemiddelde").SetName("Invalid Mean"); yield return new TestCaseData(new PreconsolidationStress { XCoordinate = xCoordinate, ZCoordinate = zCoordinate, - PreconsolidationStressMean = preconsolidationStressMean + PreconsolidationStressMean = preconsolidationStressMean, + PreconsolidationStressCoefficientOfVariation = double.NaN }, "variatiecoëfficient").SetName("Invalid Coefficient of Variation"); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs =================================================================== diff -u -r564d08f23d1931635a55e1aa9240320dfdbfda6a -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 564d08f23d1931635a55e1aa9240320dfdbfda6a) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -201,27 +201,27 @@ /// /// Looks up a localized string similar to Verzadigd gewicht. /// - public static string SoilLayer_BelowPhreaticLevelDistribution_Description { + public static string SoilLayer_BelowPhreaticLevelDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayer_BelowPhreaticLevelDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayer_BelowPhreaticLevelDistribution_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Korrelgrootte. /// - public static string SoilLayer_DiameterD70Distribution_Description { + public static string SoilLayer_DiameterD70Distribution_DisplayName { get { - return ResourceManager.GetString("SoilLayer_DiameterD70Distribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayer_DiameterD70Distribution_DisplayName", resourceCulture); } } /// /// Looks up a localized string similar to Doorlatendheid. /// - public static string SoilLayer_PermeabilityDistribution_Description { + public static string SoilLayer_PermeabilityDistribution_DisplayName { get { - return ResourceManager.GetString("SoilLayer_PermeabilityDistribution_Description", resourceCulture); + return ResourceManager.GetString("SoilLayer_PermeabilityDistribution_DisplayName", resourceCulture); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx =================================================================== diff -u -r564d08f23d1931635a55e1aa9240320dfdbfda6a -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision 564d08f23d1931635a55e1aa9240320dfdbfda6a) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -126,13 +126,13 @@ De segmenten van de geometrie van de laag vormen geen lus. - + Verzadigd gewicht - + Korrelgrootte - + Doorlatendheid Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs =================================================================== diff -u -r604dfe021f6161f8e5d107dd5821ba06390c5ecf -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs (.../PipingSoilLayerTransformer.cs) (revision 604dfe021f6161f8e5d107dd5821ba06390c5ecf) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfiles/PipingSoilLayerTransformer.cs (.../PipingSoilLayerTransformer.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -126,15 +126,15 @@ { DistributionHelper.ValidateIsLogNormal( soilLayer.BelowPhreaticLevelDistributionType, - Resources.SoilLayer_BelowPhreaticLevelDistribution_Description); + Resources.SoilLayer_BelowPhreaticLevelDistribution_DisplayName); DistributionHelper.ValidateIsNonShiftedLogNormal( soilLayer.DiameterD70DistributionType, soilLayer.DiameterD70Shift, - Resources.SoilLayer_DiameterD70Distribution_Description); + Resources.SoilLayer_DiameterD70Distribution_DisplayName); DistributionHelper.ValidateIsNonShiftedLogNormal( soilLayer.PermeabilityDistributionType, soilLayer.PermeabilityShift, - Resources.SoilLayer_PermeabilityDistribution_Description); + Resources.SoilLayer_PermeabilityDistribution_DisplayName); } /// @@ -248,7 +248,7 @@ catch (NotSupportedException) { throw new ImportedDataTransformException(string.Format(RingtoetsCommonIOResources.Transform_Invalid_value_ParameterName_0, - RingtoetsCommonIOResources.SoilLayerProperties_IsAquifer_Name)); + RingtoetsCommonIOResources.SoilLayerProperties_IsAquifer_DisplayName)); } } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs =================================================================== diff -u -rb0b8bffcbb871a42e6c8b282fe20858d6a738dbc -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs (.../PipingOutputContextPropertiesTest.cs) (revision b0b8bffcbb871a42e6c8b282fe20858d6a738dbc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputContextPropertiesTest.cs (.../PipingOutputContextPropertiesTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -29,7 +29,6 @@ using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; using Ringtoets.Piping.Forms.PropertyClasses; -using Ringtoets.Piping.KernelWrapper.TestUtil; namespace Ringtoets.Piping.Forms.Test.PropertyClasses { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs =================================================================== diff -u -r6cf604a94300560817de70fd42d09baa5b22c3a6 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision 6cf604a94300560817de70fd42d09baa5b22c3a6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -36,7 +36,6 @@ using Ringtoets.Piping.Data.SoilProfile; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.Views; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Primitives.TestUtil; namespace Ringtoets.Piping.Forms.Test.Views Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r6cf604a94300560817de70fd42d09baa5b22c3a6 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 6cf604a94300560817de70fd42d09baa5b22c3a6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -47,7 +47,6 @@ using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Piping.KernelWrapper.TestUtil; using Ringtoets.Piping.Primitives; using Ringtoets.Piping.Primitives.TestUtil; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs =================================================================== diff -u -r6cf604a94300560817de70fd42d09baa5b22c3a6 -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs (.../PipingSoilProfileTestFactory.cs) (revision 6cf604a94300560817de70fd42d09baa5b22c3a6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.TestUtil/PipingSoilProfileTestFactory.cs (.../PipingSoilProfileTestFactory.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) @@ -31,9 +31,9 @@ /// /// set to ; /// set to 0.0; - /// set to a collection with a single + /// set to a collection with a single /// with set to 0.0; - /// set to . + /// set to . /// /// /// The name to set for the . @@ -48,9 +48,9 @@ /// /// set to "name"; /// set to 0.0; - /// set to a collection with a single + /// set to a collection with a single /// with set to 0.0; - /// set to . + /// set to . /// /// /// The created . @@ -64,7 +64,7 @@ /// /// set to ; /// set to 0.0; - /// set to a collection with a single + /// set to a collection with a single /// with set to 0.0; /// set to . ///