Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj =================================================================== diff -u -rc0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision c0467a5ee5f6d7163ce9d8ba61fc8b22828bb44e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -73,7 +73,7 @@ - + Code @@ -370,7 +370,7 @@ - + Fisheye: Tag a06740b53b2afe4f6db49a0f54ba9f743da131b1 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/RealizedStochastCreateExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensions.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensions.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensions.cs (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -0,0 +1,93 @@ +// 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. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Core.Common.Utils.Extensions; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; + +namespace Application.Ringtoets.Storage.Create.IllustrationPoints +{ + /// + /// Extension methods for related to creating an instance of + /// . + /// + internal static class SubmechanismIllustrationPointStochastCreateExtensions + { + /// + /// Creates a based on the information + /// of the . + /// + /// The stochast to create a database entity for. + /// The index at which resides within its parent. + /// A new . + /// Thrown when + /// is null. + public static HydraulicLocationRealizedStochastEntity CreateHydraulicLocationRealizedStochastEntity( + this SubmechanismIllustrationPointStochast submechanismIllustrationPointStochast, int order) + { + if (submechanismIllustrationPointStochast == null) + { + throw new ArgumentNullException(nameof(submechanismIllustrationPointStochast)); + } + + var entity = new HydraulicLocationRealizedStochastEntity + { + Name = submechanismIllustrationPointStochast.Name.DeepClone(), + Alpha = submechanismIllustrationPointStochast.Alpha, + Duration = submechanismIllustrationPointStochast.Duration, + Realization = submechanismIllustrationPointStochast.Realization, + Order = order + }; + + return entity; + } + + /// + /// Creates a based + /// on the information of the . + /// + /// The stochast to create a database entity for. + /// The index at which resides within its parent. + /// A new . + /// Thrown when + /// is null. + public static GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity( + this SubmechanismIllustrationPointStochast submechanismIllustrationPointStochast, int order) + { + if (submechanismIllustrationPointStochast == null) + { + throw new ArgumentNullException(nameof(submechanismIllustrationPointStochast)); + } + + var entity = new GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity + { + Name = submechanismIllustrationPointStochast.Name.DeepClone(), + Alpha = submechanismIllustrationPointStochast.Alpha, + Duration = submechanismIllustrationPointStochast.Duration, + Realization = submechanismIllustrationPointStochast.Realization, + Order = order + }; + + return entity; + } + } +} \ No newline at end of file Fisheye: Tag a06740b53b2afe4f6db49a0f54ba9f743da131b1 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/IRealizedStochastEntityReadExtensions.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensions.cs =================================================================== diff -u --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensions.cs (revision 0) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensions.cs (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -0,0 +1,53 @@ +// 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. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; + +namespace Application.Ringtoets.Storage.Read.IllustrationPoints +{ + /// + /// Extension methods for related to creating a . + /// + internal static class ISubmechanismIllustrationPointStochastEntityReadExtensions + { + /// + /// Reads the and use the information to construct a . + /// + /// The to create + /// for. + /// A new . + /// Thrown when is null. + public static SubmechanismIllustrationPointStochast Read(this IRealizedStochastEntity entity) + { + if (entity == null) + { + throw new ArgumentNullException(nameof(entity)); + } + + return new SubmechanismIllustrationPointStochast(entity.Name, + entity.Duration, + entity.Alpha, + entity.Realization); + } + } +} \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj =================================================================== diff -u -r30df7a3cabc5c48307afa542944fc17fd7a355e3 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 30df7a3cabc5c48307afa542944fc17fd7a355e3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -91,7 +91,7 @@ - + Code @@ -125,7 +125,7 @@ - + Fisheye: Tag a06740b53b2afe4f6db49a0f54ba9f743da131b1 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/RealizedStochastCreateExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensionsTest.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensionsTest.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubmechanismIllustrationPointStochastCreateExtensionsTest.cs (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -0,0 +1,104 @@ +// 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. + +using System; +using Application.Ringtoets.Storage.Create.IllustrationPoints; +using Application.Ringtoets.Storage.DbContext; +using Core.Common.TestUtil; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; + +namespace Application.Ringtoets.Storage.Test.Create.IllustrationPoints +{ + [TestFixture] + public class SubmechanismIllustrationPointStochastCreateExtensionsTest + { + [Test] + public void CreateHydraulicLocationRealizedStochastEntity_StochastNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((SubmechanismIllustrationPointStochast) null).CreateHydraulicLocationRealizedStochastEntity(0); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("realizedStochast", paramName); + } + + [Test] + public void CreateHydraulicLocationRealizedStochastEntity_ValidRealizedStochast_ReturnEntity() + { + // Setup + var random = new Random(123); + var stochast = new SubmechanismIllustrationPointStochast("Some description", + random.NextDouble(), + random.NextDouble(), + random.NextDouble()); + int order = random.Next(); + + // Call + HydraulicLocationRealizedStochastEntity entity = stochast.CreateHydraulicLocationRealizedStochastEntity(order); + + // Assert + Assert.IsInstanceOf(entity); + TestHelper.AssertAreEqualButNotSame(stochast.Name, entity.Name); + Assert.AreEqual(stochast.Alpha, entity.Alpha, stochast.Alpha.GetAccuracy()); + Assert.AreEqual(stochast.Duration, entity.Duration, stochast.Duration.GetAccuracy()); + Assert.AreEqual(stochast.Realization, entity.Realization, stochast.Realization.GetAccuracy()); + Assert.AreEqual(order, entity.Order); + } + + [Test] + public void CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_StochastNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((SubmechanismIllustrationPointStochast) null).CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity(0); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("realizedStochast", paramName); + } + + [Test] + public void CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity_ValidRealizedStochast_ReturnEntity() + { + // Setup + var random = new Random(123); + var stochast = new SubmechanismIllustrationPointStochast("Some description", + random.NextDouble(), + random.NextDouble(), + random.NextDouble()); + int order = random.Next(); + + // Call + GrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity entity = + stochast.CreateGrassCoverErosionOutwardsHydraulicLocationRealizedStochastEntity(order); + + // Assert + Assert.IsInstanceOf(entity); + TestHelper.AssertAreEqualButNotSame(stochast.Name, entity.Name); + Assert.AreEqual(stochast.Alpha, entity.Alpha, stochast.Alpha.GetAccuracy()); + Assert.AreEqual(stochast.Duration, entity.Duration, stochast.Duration.GetAccuracy()); + Assert.AreEqual(stochast.Realization, entity.Realization, stochast.Realization.GetAccuracy()); + Assert.AreEqual(order, entity.Order); + } + } +} \ No newline at end of file Fisheye: Tag a06740b53b2afe4f6db49a0f54ba9f743da131b1 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/IRealizedStochastEntityReadExtensionsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensionsTest.cs =================================================================== diff -u --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensionsTest.cs (revision 0) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/IllustrationPoints/ISubmechanismIllustrationPointStochastEntityReadExtensionsTest.cs (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -0,0 +1,70 @@ +// 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. + +using System; +using Application.Ringtoets.Storage.DbContext; +using Application.Ringtoets.Storage.Read.IllustrationPoints; +using NUnit.Framework; +using Rhino.Mocks; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; + +namespace Application.Ringtoets.Storage.Test.Read.IllustrationPoints +{ + [TestFixture] + public class ISubmechanismIllustrationPointStochastEntityReadExtensionsTest + { + [Test] + public void Read_EntityNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((IRealizedStochastEntity) null).Read(); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("entity", paramName); + } + + [Test] + public void Read_ValidEntity_ReturnRealizedStochast() + { + // Setup + var random = new Random(123); + var mockRepository = new MockRepository(); + var entity = mockRepository.Stub(); + entity.Name = "Description"; + entity.Alpha = random.NextDouble(); + entity.Duration = random.NextDouble(); + entity.Realization = random.NextDouble(); + mockRepository.ReplayAll(); + + // Call + SubmechanismIllustrationPointStochast illustrationPointResult = entity.Read(); + + // Assert + Assert.AreEqual(entity.Name, illustrationPointResult.Name); + Assert.AreEqual(entity.Alpha, illustrationPointResult.Alpha, illustrationPointResult.Alpha.GetAccuracy()); + Assert.AreEqual(entity.Duration, illustrationPointResult.Duration, illustrationPointResult.Duration.GetAccuracy()); + Assert.AreEqual(entity.Realization, illustrationPointResult.Realization, illustrationPointResult.Realization.GetAccuracy()); + mockRepository.VerifyAll(); + } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/IllustrationPoint.cs =================================================================== diff -u -r6fb7fba714affe795d1d41ae88b1fbcfcb73bbbb -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/IllustrationPoint.cs (.../IllustrationPoint.cs) (revision 6fb7fba714affe795d1d41ae88b1fbcfcb73bbbb) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/IllustrationPoint.cs (.../IllustrationPoint.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -34,7 +34,7 @@ /// Creates a new instance of . /// /// The name of the illustration point result - /// The realized stochasts. + /// The stochasts for the sub mechanism illustration point. /// The output variables. /// The beta value that was realized. /// Thrown when any of: @@ -45,7 +45,7 @@ /// /// is null. public IllustrationPoint(string name, - IEnumerable stochasts, + IEnumerable stochasts, IEnumerable illustrationPointResults, double beta) { @@ -80,9 +80,9 @@ public RoundedDouble Beta { get; } /// - /// Gets the stochasts that were realized. + /// Gets the stochasts that belong to this submechanism illustration point. /// - public IEnumerable Stochasts { get; } + public IEnumerable Stochasts { get; } /// /// Gets the output variables. Fisheye: Tag a06740b53b2afe4f6db49a0f54ba9f743da131b1 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/RealizedStochast.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointStochast.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointStochast.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointStochast.cs (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -0,0 +1,52 @@ +// 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. + +using System; +using Core.Common.Base.Data; + +namespace Ringtoets.Common.Data.Hydraulics.IllustrationPoints +{ + /// + /// Container of alpha value definitions which contain a realization. + /// + public class SubmechanismIllustrationPointStochast : Stochast + { + /// + /// Creates a new instance of . + /// + /// The name of the stochast. + /// The duration. + /// The alpha value of the stochast. + /// The realization of the stochast. + /// Thrown when + /// is null. + public SubmechanismIllustrationPointStochast(string name, double duration, double alpha, double realization) + : base(name, duration, alpha) + { + Realization = new RoundedDouble(5, realization); + } + + /// + /// Gets the realization of the stochast. + /// + public RoundedDouble Realization { get; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj (.../Ringtoets.Common.Data.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -72,7 +72,7 @@ - + Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WindDirectionClosingSituationIllustrationPointProperties.cs =================================================================== diff -u -r6cdf02ac497b3bab4f7f955efac588545f5b8986 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WindDirectionClosingSituationIllustrationPointProperties.cs (.../WindDirectionClosingSituationIllustrationPointProperties.cs) (revision 6cdf02ac497b3bab4f7f955efac588545f5b8986) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/WindDirectionClosingSituationIllustrationPointProperties.cs (.../WindDirectionClosingSituationIllustrationPointProperties.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -90,8 +90,8 @@ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_AlphaValues_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] - [KeyValueElement(nameof(RealizedStochast.Name), nameof(RealizedStochast.Alpha))] - public RealizedStochast[] AlphaValues + [KeyValueElement(nameof(SubmechanismIllustrationPointStochast.Name), nameof(SubmechanismIllustrationPointStochast.Alpha))] + public SubmechanismIllustrationPointStochast[] AlphaValues { get { @@ -103,8 +103,8 @@ [ResourcesDisplayName(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_DisplayName))] [ResourcesDescription(typeof(RingtoetsCommonFormsResources), nameof(RingtoetsCommonFormsResources.HydraulicBoundaryDatabase_Durations_Description))] [TypeConverter(typeof(KeyValueExpandableArrayConverter))] - [KeyValueElement(nameof(RealizedStochast.Name), nameof(RealizedStochast.Duration))] - public RealizedStochast[] Durations + [KeyValueElement(nameof(SubmechanismIllustrationPointStochast.Name), nameof(SubmechanismIllustrationPointStochast.Duration))] + public SubmechanismIllustrationPointStochast[] Durations { get { Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointConverter.cs =================================================================== diff -u -r0fd23ff8e68b5f0d18d344d104bc68216cb49b51 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointConverter.cs (.../IllustrationPointConverter.cs) (revision 0fd23ff8e68b5f0d18d344d104bc68216cb49b51) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/IllustrationPointConverter.cs (.../IllustrationPointConverter.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -25,7 +25,7 @@ using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints; using IllustrationPointResult = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.IllustrationPointResult; -using RealizedStochast = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.RealizedStochast; +using SubmechanismIllustrationPointStochast = Ringtoets.Common.Data.Hydraulics.IllustrationPoints.SubmechanismIllustrationPointStochast; namespace Ringtoets.Common.Service.IllustrationPoints { @@ -49,8 +49,8 @@ throw new ArgumentNullException(nameof(subMechanismIllustrationPoint)); } - IEnumerable stochasts = subMechanismIllustrationPoint - .Stochasts.Select(StochastConverter.CreateRealizedStochast); + IEnumerable stochasts = subMechanismIllustrationPoint + .Stochasts.Select(StochastConverter.CreateSubmechanismIllustrationStochast); IEnumerable illustrationPointResults = subMechanismIllustrationPoint .Results.Select(IllustrationPointResultConverter.CreateIllustrationPointResult); Index: Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs =================================================================== diff -u -re2e6db0810ded8ad8c1e6b14a48296f6914954dc -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs (.../StochastConverter.cs) (revision e2e6db0810ded8ad8c1e6b14a48296f6914954dc) +++ Ringtoets/Common/src/Ringtoets.Common.Service/IllustrationPoints/StochastConverter.cs (.../StochastConverter.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -49,23 +49,23 @@ } /// - /// Creates a new instance of based on the information of . + /// Creates a new instance of based on the information of . /// /// The to base the - /// to create on. + /// to create on. /// The newly created . /// Thrown when /// is null. - public static RealizedStochast CreateRealizedStochast(HydraRealizedStochast hydraRealizedStochast) + public static SubmechanismIllustrationPointStochast CreateSubmechanismIllustrationStochast(HydraRealizedStochast hydraRealizedStochast) { if (hydraRealizedStochast == null) { throw new ArgumentNullException(nameof(hydraRealizedStochast)); } - return new RealizedStochast(hydraRealizedStochast.Name, - hydraRealizedStochast.Duration, - hydraRealizedStochast.Alpha, - hydraRealizedStochast.Realization); + return new SubmechanismIllustrationPointStochast(hydraRealizedStochast.Name, + hydraRealizedStochast.Duration, + hydraRealizedStochast.Alpha, + hydraRealizedStochast.Realization); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/IllustrationPointTest.cs =================================================================== diff -u -r1a7bbfc1520b96bab3d6d50f9e68da0b23ca0da9 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/IllustrationPointTest.cs (.../IllustrationPointTest.cs) (revision 1a7bbfc1520b96bab3d6d50f9e68da0b23ca0da9) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/IllustrationPointTest.cs (.../IllustrationPointTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -40,7 +40,7 @@ // Call TestDelegate call = () => new IllustrationPoint(null, - Enumerable.Empty(), + Enumerable.Empty(), Enumerable.Empty(), beta); @@ -76,7 +76,7 @@ // Call TestDelegate call = () => new IllustrationPoint("Illustration Point", - Enumerable.Empty(), + Enumerable.Empty(), null, beta); @@ -93,7 +93,7 @@ var random = new Random(21); double beta = random.NextDouble(); - var stochasts = new List(); + var stochasts = new List(); var illustrationPointResults = new List(); // Call Fisheye: Tag a06740b53b2afe4f6db49a0f54ba9f743da131b1 refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/RealizedStochastTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointStochastTest.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointStochastTest.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/IllustrationPoints/SubmechanismIllustrationPointStochastTest.cs (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -0,0 +1,57 @@ +// 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. + +using System; +using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics.IllustrationPoints; +using Ringtoets.Common.Data.TestUtil; + +namespace Ringtoets.Common.Data.Test.Hydraulics.IllustrationPoints +{ + [TestFixture] + public class SubmechanismIllustrationPointStochastTest + { + [Test] + public void Constructor_ValidArguments_ReturnExpectedValues() + { + // Setup + const string name = "Stochast name"; + + var random = new Random(21); + double duration = random.NextDouble(); + double alpha = random.NextDouble(); + double realization = random.NextDouble(); + + // Call + var stochast = new SubmechanismIllustrationPointStochast(name, duration, alpha, realization); + + // Assert + Assert.IsInstanceOf(stochast); + Assert.AreEqual(name, stochast.Name); + Assert.AreEqual(duration, stochast.Duration, stochast.Duration.GetAccuracy()); + Assert.AreEqual(alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); + + Assert.AreEqual(realization, stochast.Realization, + stochast.Realization.GetAccuracy()); + Assert.AreEqual(5, stochast.Realization.NumberOfDecimalPlaces); + } + } +} \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj =================================================================== diff -u -r853509ec4de49576e9627ec0bf148aa32e04e461 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision 853509ec4de49576e9627ec0bf148aa32e04e461) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj (.../Ringtoets.Common.Data.Test.csproj) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -82,7 +82,7 @@ - + Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestIllustrationPoint.cs =================================================================== diff -u -rb526c46d60f56864ef0da2b8dd2b7442fe42c997 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestIllustrationPoint.cs (.../TestIllustrationPoint.cs) (revision b526c46d60f56864ef0da2b8dd2b7442fe42c997) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/IllustrationPoints/TestIllustrationPoint.cs (.../TestIllustrationPoint.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -33,6 +33,6 @@ /// Creates a . /// public TestIllustrationPoint() - : base("Illustration Point", Enumerable.Empty(), Enumerable.Empty(), 3.14) {} + : base("Illustration Point", Enumerable.Empty(), Enumerable.Empty(), 3.14) {} } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs =================================================================== diff -u -r2ebd17fdb16aa832ad65ef7401dc4968bcba2899 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs (.../RingtoetsStackChartDataFactoryTest.cs) (revision 2ebd17fdb16aa832ad65ef7401dc4968bcba2899) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Factories/RingtoetsStackChartDataFactoryTest.cs (.../RingtoetsStackChartDataFactoryTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -166,35 +166,35 @@ new IllustrationPoint("Punt 1", new[] { - new RealizedStochast("Stochast 1", 1, -0.9, 3), - new RealizedStochast("Stochast 2", 1, -0.43589, 3), - new RealizedStochast("Stochast 3", 1, -0.01, 3), - new RealizedStochast("Stochast 4", 1, -0.01, 3), - new RealizedStochast("Stochast 5", 1, -0.099, 3) + new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.9, 3), + new SubmechanismIllustrationPointStochast("Stochast 2", 1, -0.43589, 3), + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.01, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.01, 3), + new SubmechanismIllustrationPointStochast("Stochast 5", 1, -0.099, 3) }, Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", new IllustrationPoint("Punt 2", new[] { - new RealizedStochast("Stochast 1", 1, -0.43589, 3), - new RealizedStochast("Stochast 2", 1, -0.9, 3), - new RealizedStochast("Stochast 3", 1, -0.02, 3), - new RealizedStochast("Stochast 4", 1, -0.02, 3), - new RealizedStochast("Stochast 5", 1, -0.9, 3) + new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), + new SubmechanismIllustrationPointStochast("Stochast 2", 1, -0.9, 3), + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.02, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.02, 3), + new SubmechanismIllustrationPointStochast("Stochast 5", 1, -0.9, 3) }, Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", new IllustrationPoint("Punt 3", new[] { - new RealizedStochast("Stochast 1", 1, -0.43589, 3), - new RealizedStochast("Stochast 2", 1, -0.9, 3), - new RealizedStochast("Stochast 3", 1, -0.03, 3), - new RealizedStochast("Stochast 4", 1, -0.03, 3), - new RealizedStochast("Stochast 5", 1, -0.099, 3) + new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), + new SubmechanismIllustrationPointStochast("Stochast 2", 1, -0.9, 3), + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.03, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.03, 3), + new SubmechanismIllustrationPointStochast("Stochast 5", 1, -0.099, 3) }, Enumerable.Empty(), 1)) }); Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WindDirectionClosingSituationIllustrationPointPropertiesTest.cs =================================================================== diff -u -r6cdf02ac497b3bab4f7f955efac588545f5b8986 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WindDirectionClosingSituationIllustrationPointPropertiesTest.cs (.../WindDirectionClosingSituationIllustrationPointPropertiesTest.cs) (revision 6cdf02ac497b3bab4f7f955efac588545f5b8986) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WindDirectionClosingSituationIllustrationPointPropertiesTest.cs (.../WindDirectionClosingSituationIllustrationPointPropertiesTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -52,7 +52,7 @@ public void ToString_WithName_ReturnsCombinationOfWindDirectionAndClosingSituation(string name) { // Setup - var illustrationPoint = new IllustrationPoint(name, Enumerable.Empty(), Enumerable.Empty(), 3); + var illustrationPoint = new IllustrationPoint(name, Enumerable.Empty(), Enumerable.Empty(), 3); var context = new WindDirectionClosingSituationIllustrationPoint(new TestWindDirection(), "direction", illustrationPoint); // Call @@ -74,7 +74,7 @@ double beta = random.NextDouble(); var stochasts = new[] { - new RealizedStochast("some name", random.NextDouble(), random.NextDouble(), random.NextDouble()) + new SubmechanismIllustrationPointStochast("some name", random.NextDouble(), random.NextDouble(), random.NextDouble()) }; var illustrationPointResults = new[] { Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs =================================================================== diff -u -r82b9bf17e8089ff78acbe00e6b0a29971355095d -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision 82b9bf17e8089ff78acbe00e6b0a29971355095d) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/IllustrationPointsChartControlTest.cs (.../IllustrationPointsChartControlTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -139,17 +139,17 @@ new IllustrationPoint("Punt 1", new[] { - new RealizedStochast("Stochast 3", 1, -0.9, 3), - new RealizedStochast("Stochast 4", 1, -0.43589, 3) + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.9, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.43589, 3) }, Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", new IllustrationPoint("Punt 2", new[] { - new RealizedStochast("Stochast 3", 1, -0.43589, 3), - new RealizedStochast("Stochast 4", 1, -0.9, 3) + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.43589, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.9, 3) }, Enumerable.Empty(), 1)) }); @@ -176,32 +176,32 @@ new IllustrationPoint("Punt 1", new[] { - new RealizedStochast("Stochast 1", 1, -0.9, 3), - new RealizedStochast("Stochast 2", 1, -0.43589, 3), - new RealizedStochast("Stochast 3", 1, -0.01, 3), - new RealizedStochast("Stochast 4", 1, -0.01, 3) + new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.9, 3), + new SubmechanismIllustrationPointStochast("Stochast 2", 1, -0.43589, 3), + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.01, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.01, 3) }, Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", new IllustrationPoint("Punt 2", new[] { - new RealizedStochast("Stochast 1", 1, -0.43589, 3), - new RealizedStochast("Stochast 2", 1, -0.9, 3), - new RealizedStochast("Stochast 3", 1, -0.02, 3), - new RealizedStochast("Stochast 4", 1, -0.02, 3) + new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), + new SubmechanismIllustrationPointStochast("Stochast 2", 1, -0.9, 3), + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.02, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.02, 3) }, Enumerable.Empty(), 1)), new WindDirectionClosingSituationIllustrationPoint( new TestWindDirection(), "Regular", new IllustrationPoint("Punt 3", new[] { - new RealizedStochast("Stochast 1", 1, -0.43589, 3), - new RealizedStochast("Stochast 2", 1, -0.9, 3), - new RealizedStochast("Stochast 3", 1, -0.03, 3), - new RealizedStochast("Stochast 4", 1, -0.03, 3) + new SubmechanismIllustrationPointStochast("Stochast 1", 1, -0.43589, 3), + new SubmechanismIllustrationPointStochast("Stochast 2", 1, -0.9, 3), + new SubmechanismIllustrationPointStochast("Stochast 3", 1, -0.03, 3), + new SubmechanismIllustrationPointStochast("Stochast 4", 1, -0.03, 3) }, Enumerable.Empty(), 1)) }); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointConverterTest.cs =================================================================== diff -u -r17407aa502b6e9af1d53c8c98551b47d4a35d097 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointConverterTest.cs (.../IllustrationPointConverterTest.cs) (revision 17407aa502b6e9af1d53c8c98551b47d4a35d097) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/IllustrationPointConverterTest.cs (.../IllustrationPointConverterTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -79,7 +79,7 @@ Assert.AreEqual(hydraIllustrationPointResult.Description, illustrationPointResult.Description); Assert.AreEqual(hydraIllustrationPointResult.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy()); - RealizedStochast stochast = illustrationPoint.Stochasts.Single(); + SubmechanismIllustrationPointStochast stochast = illustrationPoint.Stochasts.Single(); Assert.AreEqual(hydraRealizedStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); Assert.AreEqual(duration, stochast.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(hydraRealizedStochast.Name, stochast.Name); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs =================================================================== diff -u -re2e6db0810ded8ad8c1e6b14a48296f6914954dc -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs (.../StochastConverterTest.cs) (revision e2e6db0810ded8ad8c1e6b14a48296f6914954dc) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/StochastConverterTest.cs (.../StochastConverterTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -67,7 +67,7 @@ public void CreateRealizedStochast_HydraRealizedStochastNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => StochastConverter.CreateRealizedStochast(null); + TestDelegate call = () => StochastConverter.CreateSubmechanismIllustrationStochast(null); // Assert string paramName = Assert.Throws(call).ParamName; @@ -88,7 +88,7 @@ var hydraStochast = new HydraRealizedStochast(name, duration, alpha, realization); // Call - RealizedStochast stochast = StochastConverter.CreateRealizedStochast(hydraStochast); + SubmechanismIllustrationPointStochast stochast = StochastConverter.CreateSubmechanismIllustrationStochast(hydraStochast); // Assert Assert.AreEqual(hydraStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverterTest.cs =================================================================== diff -u -r31d09da969f26a243683f5b9984159826fd71851 -ra06740b53b2afe4f6db49a0f54ba9f743da131b1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverterTest.cs (.../WindDirectionClosingSituationIllustrationPointConverterTest.cs) (revision 31d09da969f26a243683f5b9984159826fd71851) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/IllustrationPoints/WindDirectionClosingSituationIllustrationPointConverterTest.cs (.../WindDirectionClosingSituationIllustrationPointConverterTest.cs) (revision a06740b53b2afe4f6db49a0f54ba9f743da131b1) @@ -124,7 +124,7 @@ Assert.AreEqual(hydraIllustrationPointResult.Description, illustrationPointResult.Description); Assert.AreEqual(hydraIllustrationPointResult.Value, illustrationPointResult.Value, illustrationPointResult.Value.GetAccuracy()); - RealizedStochast stochast = illustrationPoint.Stochasts.Single(); + SubmechanismIllustrationPointStochast stochast = illustrationPoint.Stochasts.Single(); Assert.AreEqual(hydraRealizedStochast.Alpha, stochast.Alpha, stochast.Alpha.GetAccuracy()); Assert.AreEqual(hydraRealizedStochast.Duration, stochast.Duration, stochast.Duration.GetAccuracy()); Assert.AreEqual(hydraRealizedStochast.Name, stochast.Name); Fisheye: Tag 6cdf02ac497b3bab4f7f955efac588545f5b8986 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/WindDirectionClosingSituationIllustrationPointProperties.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6cdf02ac497b3bab4f7f955efac588545f5b8986 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WindDirectionClosingSituationIllustrationPointPropertiesTest.cs'. Fisheye: No comparison available. Pass `N' to diff?