Index: Core/Components/src/Core.Components.OxyPlot.Forms/Extent.cs =================================================================== diff -u -r2d704a409d762d8fb54d2f8be285246861019ea0 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Core/Components/src/Core.Components.OxyPlot.Forms/Extent.cs (.../Extent.cs) (revision 2d704a409d762d8fb54d2f8be285246861019ea0) +++ Core/Components/src/Core.Components.OxyPlot.Forms/Extent.cs (.../Extent.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -113,7 +113,7 @@ /// /// Assigns new values to the properties in such a way - /// that the the new values include both the + /// that the new values include both the /// and the . /// /// The other extent to include in Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/IStochasticSoilModelMechanismFilter.cs =================================================================== diff -u -r4d2b702d8a5e4570ee53fa499f8f5fa196acdb98 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/IStochasticSoilModelMechanismFilter.cs (.../IStochasticSoilModelMechanismFilter.cs) (revision 4d2b702d8a5e4570ee53fa499f8f5fa196acdb98) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/IStochasticSoilModelMechanismFilter.cs (.../IStochasticSoilModelMechanismFilter.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -24,7 +24,7 @@ namespace Ringtoets.Common.IO.SoilProfile { /// - /// Interface to define if a is valid for the calling + /// Interface to define whether a is valid for the calling /// failure mechanism. /// public interface IStochasticSoilModelMechanismFilter Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/IStochasticSoilModelUpdateModelStrategy.cs =================================================================== diff -u -rb78437864e9677d66dc309d766b0e706c8af0c1f -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/IStochasticSoilModelUpdateModelStrategy.cs (.../IStochasticSoilModelUpdateModelStrategy.cs) (revision b78437864e9677d66dc309d766b0e706c8af0c1f) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/IStochasticSoilModelUpdateModelStrategy.cs (.../IStochasticSoilModelUpdateModelStrategy.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -42,7 +42,7 @@ /// Thrown when applying the strategy failed. /// is set with the more detailed /// exception. - /// A of updated instances. + /// An of updated instances. IEnumerable UpdateModelWithImportedData(IEnumerable stochasticSoilModels, string sourceFilePath); } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs =================================================================== diff -u -r933fdbe926cc6b1e5e48c431aa9aee035b5ff3d9 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs (.../LayerProperties.cs) (revision 933fdbe926cc6b1e5e48c431aa9aee035b5ff3d9) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/LayerProperties.cs (.../LayerProperties.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -186,7 +186,7 @@ public double? PermeabilityShift { get; } /// - /// Gets the mean of the distribution for the the Darcy-speed with which water flows through the aquifer layer. + /// Gets the mean of the distribution for the Darcy-speed with which water flows through the aquifer layer. /// [m/s] /// public double? PermeabilityMean { get; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerBase.cs =================================================================== diff -u -recd4d4b6e6b86aea559e4dee86f46850ee1477bf -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerBase.cs (.../SoilLayerBase.cs) (revision ecd4d4b6e6b86aea559e4dee86f46850ee1477bf) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerBase.cs (.../SoilLayerBase.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -146,7 +146,7 @@ public double PermeabilityShift { get; set; } /// - /// Gets or sets the mean of the distribution for the the Darcy-speed with which water flows through the aquifer layer. + /// Gets or sets the mean of the distribution for the Darcy-speed with which water flows through the aquifer layer. /// [m/s] /// public double PermeabilityMean { get; set; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerConstants.cs =================================================================== diff -u -r17e4a03119d9331cfcbe5b2e3e3255d7d05b74bb -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerConstants.cs (.../SoilLayerConstants.cs) (revision 17e4a03119d9331cfcbe5b2e3e3255d7d05b74bb) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilLayerConstants.cs (.../SoilLayerConstants.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -27,7 +27,7 @@ public static class SoilLayerConstants { /// - /// The value of the distribution parameter when the the distribution is lognormal. + /// The value of the distribution parameter when the distribution is lognormal. /// public const long LogNormalDistributionValue = 3; } Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporter.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporter.cs (.../StochasticSoilModelImporter.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -51,7 +51,7 @@ private IEnumerable updatedInstances; /// - /// Creates a new instance of the class. + /// Creates a new instance of . /// /// The import target. /// The path to the file to import from. @@ -226,7 +226,7 @@ /// is not valid to be transformed. /// Thrown when transforming a stochastic /// soil model failed. - private ReadResult GetTransformedStochasticSoilModels(ICollection stochasticSoilModels) + private ReadResult GetTransformedStochasticSoilModels(IEnumerable stochasticSoilModels) { var transformedStochasticSoilModels = new List(); var stochasticSoilModelNumber = 1; Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporterConfiguration.cs =================================================================== diff -u -ra5f97617cc03e3535d369676ae09179c82947b17 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporterConfiguration.cs (.../StochasticSoilModelImporterConfiguration.cs) (revision a5f97617cc03e3535d369676ae09179c82947b17) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/StochasticSoilModelImporterConfiguration.cs (.../StochasticSoilModelImporterConfiguration.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -67,7 +67,7 @@ public IStochasticSoilModelTransformer Transformer { get; } /// - /// Gets the failure mechanism filter to verify the the stochastic soil model is valid + /// Gets the failure mechanism filter to verify the stochastic soil model is valid /// for the failure mechanism. /// public IStochasticSoilModelMechanismFilter MechanismFilter { get; } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterConfigurationTest.cs =================================================================== diff -u -rd260b14be6ed75ac4cbead8e515a60e66d771526 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterConfigurationTest.cs (.../StochasticSoilModelImporterConfigurationTest.cs) (revision d260b14be6ed75ac4cbead8e515a60e66d771526) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterConfigurationTest.cs (.../StochasticSoilModelImporterConfigurationTest.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -53,12 +53,13 @@ [Test] public void Constructor_TransformerNull_ThrowsArgumentNullException() { - // Call + // Setup var mocks = new MockRepository(); var filter = mocks.Stub(); var strategy = mocks.Stub>(); mocks.ReplayAll(); + // Call TestDelegate test = () => new StochasticSoilModelImporterConfiguration(null, filter, strategy); // Assert @@ -70,12 +71,13 @@ [Test] public void Constructor_FilterNull_ThrowsArgumentNullException() { - // Call + // Setup var mocks = new MockRepository(); var transformer = mocks.Stub>(); var strategy = mocks.Stub>(); mocks.ReplayAll(); + // Setup TestDelegate test = () => new StochasticSoilModelImporterConfiguration(transformer, null, strategy); // Assert @@ -87,12 +89,13 @@ [Test] public void Constructor_UpdateStrategyNull_ThrowsArgumentNullException() { - // Call + // Setup var mocks = new MockRepository(); var transformer = mocks.Stub>(); var filter = mocks.Stub(); mocks.ReplayAll(); + // Call TestDelegate test = () => new StochasticSoilModelImporterConfiguration(transformer, filter, null); // Assert Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelImporterTest.cs (.../StochasticSoilModelImporterTest.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -26,6 +26,7 @@ using Core.Common.Base; using Core.Common.Base.IO; using Core.Common.TestUtil; +using Core.Common.Utils.Builders; using log4net.Core; using NUnit.Framework; using Rhino.Mocks; @@ -41,7 +42,7 @@ [TestFixture] public class StochasticSoilModelImporterTest { - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "StochasticSoilModelReader"); + private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Common.IO, "StochasticSoilModelImporter"); private MockRepository mocks; private IStochasticSoilModelTransformer transformer; @@ -83,30 +84,6 @@ } [Test] - public void Constructor_FilePathNull_ThrowsArgumentNullException() - { - // Setup - var messageProvider = mocks.Stub(); - var filter = mocks.Stub(); - var updateStrategy = mocks.Stub>(); - mocks.ReplayAll(); - - var collection = new TestStochasticSoilModelCollection(); - var configuration = new StochasticSoilModelImporterConfiguration(transformer, filter, updateStrategy); - - // Call - TestDelegate call = () => new StochasticSoilModelImporter( - collection, - null, - messageProvider, - configuration); - - // Assert - string parameter = Assert.Throws(call).ParamName; - Assert.AreEqual("filePath", parameter); - } - - [Test] public void Constructor_MessageProviderNull_ThrowsArgumentNullException() { // Setup @@ -210,8 +187,9 @@ Assert.AreEqual(1, messages.Count()); Tuple expectedLog = messages.ElementAt(0); - StringAssert.EndsWith($"{string.Empty} {Environment.NewLine}Het bestand wordt overgeslagen.", - expectedLog.Item1); + string fileReadMessage = new FileReaderErrorMessageBuilder(validFilePath).Build("het bestand bestaat niet."); + Assert.AreEqual($"{fileReadMessage} {Environment.NewLine}Het bestand wordt overgeslagen.", + expectedLog.Item1); Assert.AreEqual(Level.Error, expectedLog.Item2); Assert.IsInstanceOf(expectedLog.Item3); }); @@ -266,10 +244,8 @@ [Test] [TestCase(FailureMechanismType.Piping, 3)] [TestCase(FailureMechanismType.Stability, 3)] - [TestCase(FailureMechanismType.None, 0)] - public void Import_ImportingToValidTargetWithValidFile_ImportSoilModelToCollection( - FailureMechanismType failureMechanismType, - int nrOfFailureMechanismSpecificModelsInDatabase) + public void Import_VariousFailureMechanismTypes_ShowProgressAndUpdatesCollection(FailureMechanismType failureMechanismType, + int nrOfFailureMechanismSpecificModelsInDatabase) { // Setup string validFilePath = Path.Combine(testDataPath, "complete.soil"); @@ -284,24 +260,23 @@ .WhenCalled(invocation => { FilterFailureMechanismSpecificModel(invocation, failureMechanismType); }) .Repeat .Times(totalNrOfStochasticSoilModelInDatabase); + var messageProvider = mocks.StrictMock(); + messageProvider.Expect(mp => mp.GetAddDataToModelProgressText()) + .Return(expectedAddDataText); + var updateStrategy = mocks.StrictMock>(); + updateStrategy.Expect(u => u.UpdateModelWithImportedData(null, null)) + .IgnoreArguments() + .WhenCalled(invocation => + { + var soilModels = (IEnumerable) invocation.Arguments[0]; + var filePath = (string) invocation.Arguments[1]; - if (nrOfFailureMechanismSpecificModelsInDatabase > 0) - { - messageProvider.Expect(mp => mp.GetAddDataToModelProgressText()) - .Return(expectedAddDataText); + Assert.AreEqual(nrOfFailureMechanismSpecificModelsInDatabase, soilModels.Count()); + Assert.AreEqual(validFilePath, filePath); + }); - updateStrategy.Expect(u => u.UpdateModelWithImportedData(null, null)).IgnoreArguments().WhenCalled(invocation => - { - var soilModels = (IEnumerable) invocation.Arguments[0]; - var filePath = (string) invocation.Arguments[1]; - - Assert.AreEqual(nrOfFailureMechanismSpecificModelsInDatabase, soilModels.Count()); - Assert.AreEqual(validFilePath, filePath); - }); - } - mocks.ReplayAll(); var importer = new StochasticSoilModelImporter( @@ -338,10 +313,7 @@ "Valideren van ingelezen data.", i, nrOfFailureMechanismSpecificModelsInDatabase)); } - if (nrOfFailureMechanismSpecificModelsInDatabase > 0) - { - expectedProgressMessages.Add(new ProgressNotification(expectedAddDataText, 1, 1)); - } + expectedProgressMessages.Add(new ProgressNotification(expectedAddDataText, 1, 1)); Assert.AreEqual(expectedProgressMessages.Count, progressChangeNotifications.Count); for (var i = 0; i < expectedProgressMessages.Count; i++) { @@ -354,30 +326,21 @@ } [Test] - public void Import_ImportingToValidTargetWithValidFileTwice_ReadAnotherTime() + public void Import_ImportingFailureMechanismTypeNotInDatabase_ShowProgressAndDoesNotUpdateCollection() { // Setup string validFilePath = Path.Combine(testDataPath, "complete.soil"); const int totalNrOfStochasticSoilModelInDatabase = 6; - var messageProvider = mocks.Stub(); var filter = mocks.StrictMock(); filter.Expect(f => f.IsValidForFailureMechanism(null)) .IgnoreArguments() - .Return(true) + .Return(false) + .WhenCalled(invocation => { FilterFailureMechanismSpecificModel(invocation, FailureMechanismType.None); }) .Repeat - .Times(totalNrOfStochasticSoilModelInDatabase * 2); + .Times(totalNrOfStochasticSoilModelInDatabase); + var messageProvider = mocks.StrictMock(); var updateStrategy = mocks.StrictMock>(); - updateStrategy.Expect(u => u.UpdateModelWithImportedData(null, null)) - .IgnoreArguments() - .WhenCalled(invocation => - { - var soilModels = (IEnumerable) invocation.Arguments[0]; - var filePath = (string) invocation.Arguments[1]; - - Assert.AreEqual(totalNrOfStochasticSoilModelInDatabase, soilModels.Count()); - Assert.AreEqual(validFilePath, filePath); - }).Repeat.Twice(); mocks.ReplayAll(); var importer = new StochasticSoilModelImporter( @@ -393,63 +356,35 @@ importer.SetProgressChanged((description, step, steps) => progressChangeNotifications.Add(new ProgressNotification(description, step, steps))); - var importResult = false; - importer.Import(); - // Call - Action call = () => importResult = importer.Import(); + bool importResult = importer.Import(); // Assert - TestHelper.AssertLogMessagesCount(call, 0); - Assert.AreEqual(totalNrOfStochasticSoilModelInDatabase * 2 * 2 + 4, progressChangeNotifications.Count); - Assert.IsTrue(importResult); - } - [Test] - public void Import_CancelBeforeReadingSoilModels_CancelsImportAndLogs() - { - // Setup - const string cancelledLogMessage = "Operation Cancelled"; - var messageProvider = mocks.StrictMock(); - messageProvider.Expect(mp => mp.GetCancelledLogMessageText("Stochastische ondergrondmodellen")) - .Return(cancelledLogMessage); - var updateStrategy = mocks.StrictMock>(); - var filter = mocks.StrictMock(); - mocks.ReplayAll(); - - string validFilePath = Path.Combine(testDataPath, "complete.soil"); - - var importer = new StochasticSoilModelImporter( - new TestStochasticSoilModelCollection(), - validFilePath, - messageProvider, - new StochasticSoilModelImporterConfiguration( - transformer, - filter, - updateStrategy)); - - importer.SetProgressChanged((description, step, steps) => + var expectedProgressMessages = new List { - if (description.Contains("Inlezen van de D-Soil Model database.")) - { - importer.Cancel(); - } - }); + new ProgressNotification("Inlezen van de D-Soil Model database.", 1, 1) + }; + for (var i = 1; i <= totalNrOfStochasticSoilModelInDatabase; i++) + { + expectedProgressMessages.Add(new ProgressNotification( + "Inlezen van de stochastische ondergrondmodellen.", i, totalNrOfStochasticSoilModelInDatabase)); + } - var importResult = true; - - // Call - Action call = () => importResult = importer.Import(); - - // Assert - Tuple expectedLogMessage = Tuple.Create(cancelledLogMessage, LogLevelConstant.Info); - TestHelper.AssertLogMessageWithLevelIsGenerated(call, expectedLogMessage, 1); - Assert.IsFalse(importResult); + Assert.AreEqual(expectedProgressMessages.Count, progressChangeNotifications.Count); + for (var i = 0; i < expectedProgressMessages.Count; i++) + { + ProgressNotification notification = expectedProgressMessages[i]; + ProgressNotification actualNotification = progressChangeNotifications[i]; + Assert.AreEqual(notification.Text, actualNotification.Text); + Assert.AreEqual(notification.CurrentStep, actualNotification.CurrentStep); + Assert.AreEqual(notification.TotalSteps, actualNotification.TotalSteps); + } } [Test] - public void Import_CancelWhenReadingSoilModels_CancelsImportAndLogs() + public void Import_CancelWhileReadingSoilModels_CancelsImportAndLogs() { // Setup const string cancelledLogMessage = "Operation Cancelled"; @@ -575,7 +510,7 @@ } [Test] - public void Import_CancelWhenAddingDataToModel_ImportCompletedSuccessfullyNonetheless() + public void Import_CancelWhileAddingDataToModel_ContinuesImportAndLogs() { // Setup string validFilePath = Path.Combine(testDataPath, "complete.soil"); @@ -628,7 +563,7 @@ } [Test] - public void Import_ReadingStochsaticSoilModelThrowsException_StopsImportAndLogs() + public void Import_ReadingStochaticSoilModelThrowsException_StopsImportAndLogs() { // Setup var messageProvider = mocks.StrictMock(); @@ -727,8 +662,17 @@ var messageProvider = mocks.StrictMock(); messageProvider.Expect(mp => mp.GetAddDataToModelProgressText()) .Return(expectedAddDataProgressText); + + var transformedModel = mocks.Stub(); + + transformer.Expect(t => t.Transform(Arg.Is.NotNull)) + .Return(transformedModel); + var updateStrategy = mocks.StrictMock>(); - updateStrategy.Expect(u => u.UpdateModelWithImportedData(Arg.List.ContainsAll(stochasticSoilModelCollection), + updateStrategy.Expect(u => u.UpdateModelWithImportedData(Arg.List.ContainsAll(new[] + { + transformedModel + }), Arg.Is.Equal(validFilePath))); var filter = mocks.StrictMock(); filter.Expect(f => f.IsValidForFailureMechanism(null)) @@ -802,7 +746,7 @@ } [Test] - public void Import_AddingDataUpdateDataException_StopsImportAndLogs() + public void Import_UpdateDataExceptionThrownWhenAddingData_StopsImportAndLogs() { // Setup const string exceptionMessage = "Some exception message."; Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelImporter/complete.soil =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelImporter/incorrectProbability.soil =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelImporter/invalidSegmentPoint.soil =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelImporter/modelWithoutProfile.soil =================================================================== diff -u Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/SoilLayer2DTestFactory.cs =================================================================== diff -u -r204f3c2e56db6902a8340afb8237815c695b6f6e -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/SoilLayer2DTestFactory.cs (.../SoilLayer2DTestFactory.cs) (revision 204f3c2e56db6902a8340afb8237815c695b6f6e) +++ Ringtoets/Common/test/Ringtoets.Common.IO.TestUtil/SoilLayer2DTestFactory.cs (.../SoilLayer2DTestFactory.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -32,10 +32,10 @@ public static class SoilLayer2DTestFactory { /// - /// Creates a new instance of that can be used for testing. + /// Creates a new instance of . /// /// The inner loops of the , - /// for which each of the segments are connected to the next + /// for which each of the segments are connected to the next. /// The outer loop of the , /// for which each of the segments are connected to the next. /// The created . Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModel.cs =================================================================== diff -u -r4d2b702d8a5e4570ee53fa499f8f5fa196acdb98 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModel.cs (.../PipingStochasticSoilModel.cs) (revision 4d2b702d8a5e4570ee53fa499f8f5fa196acdb98) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModel.cs (.../PipingStochasticSoilModel.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -121,7 +121,7 @@ } foreach (PipingStochasticSoilProfile profileToRemove in StochasticSoilProfiles.Where( - sp => !newSoilProfiles.Any(newSp => IsSame(newSp, sp.SoilProfile))).ToArray()) + sp => !newSoilProfiles.Any(newSp => IsSame(newSp, sp.SoilProfile)))) { StochasticSoilProfiles.Remove(profileToRemove); removedProfiles.Add(profileToRemove); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModelCollection.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModelCollection.cs (.../PipingStochasticSoilModelCollection.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilModelCollection.cs (.../PipingStochasticSoilModelCollection.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -26,14 +26,18 @@ namespace Ringtoets.Piping.Data.SoilProfile { /// - /// A collection of . The names of the elements are - /// unique within the collection. + /// A collection of . + /// The names of the elements are unique within + /// the collection. /// public class PipingStochasticSoilModelCollection : ObservableUniqueItemCollectionWithSourcePath { - public PipingStochasticSoilModelCollection() : base(model => model.Name, - RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor, - Resources.UniqueFeature_Name_FeatureDescription) - { } + /// + /// Creates a new instance of . + /// + public PipingStochasticSoilModelCollection() + : base(model => model.Name, + RingtoetsCommonDataResources.StochasticSoilModelCollection_TypeDescriptor, + Resources.UniqueFeature_Name_FeatureDescription) {} } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilProfile.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilProfile.cs (.../PipingStochasticSoilProfile.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/SoilProfile/PipingStochasticSoilProfile.cs (.../PipingStochasticSoilProfile.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -50,7 +50,7 @@ { throw new ArgumentNullException(nameof(soilProfile)); } - + Probability = probability; SoilProfile = soilProfile; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs =================================================================== diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -128,7 +128,7 @@ public RoundedDouble DiameterD70CoefficientOfVariation { get; } /// - /// Gets the mean of the distribution for the the Darcy-speed with which water flows through the aquifer layer. + /// Gets the mean of the distribution for the Darcy-speed with which water flows through the aquifer layer. /// [m/s] /// public RoundedDouble PermeabilityMean { get; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilLayer.cs =================================================================== diff -u -r677ec9937ae7eff73a09bf937804ad22e0dc5a4b -r09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c --- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilLayer.cs (.../PipingSoilLayer.cs) (revision 677ec9937ae7eff73a09bf937804ad22e0dc5a4b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/PipingSoilLayer.cs (.../PipingSoilLayer.cs) (revision 09ab76fbe4f768414ad7dd356eb9b2ebd5b1781c) @@ -92,7 +92,7 @@ public double DiameterD70CoefficientOfVariation { get; set; } /// - /// Gets or sets the mean of the distribution for the the Darcy-speed with which water flows through the aquifer layer. + /// Gets or sets the mean of the distribution for the Darcy-speed with which water flows through the aquifer layer. /// [m/s] /// public double PermeabilityMean { get; set; }