Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/AssessmentLevelCalculation.cs =================================================================== diff -u -rdd33f3b9d039c570742b8233da23326538c848cf -re58872a87106093853d59f6cae8f57e63b623202 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/AssessmentLevelCalculation.cs (.../AssessmentLevelCalculation.cs) (revision dd33f3b9d039c570742b8233da23326538c848cf) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/AssessmentLevelCalculation.cs (.../AssessmentLevelCalculation.cs) (revision e58872a87106093853d59f6cae8f57e63b623202) @@ -27,15 +27,15 @@ /// /// Container of all data necessary for performing an assessment level calculation via Hydra-Ring. /// - public class AssessmentLevelCalculation : HydraulicCalculation + public class AssessmentLevelCalculation : IterateTowardsTargetProbabilityCalculation { private readonly HydraRingDikeSection dikeSection; /// /// Creates a new instance of the class. /// /// The id of the hydraulic station to use during the calculation. - /// The target reliability index to use during the calculation. + /// The reliability index to use during the calculation. public AssessmentLevelCalculation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId, beta) { dikeSection = new HydraRingDikeSection(HydraulicBoundaryLocationId, HydraulicBoundaryLocationId.ToString(), double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); Fisheye: Tag e58872a87106093853d59f6cae8f57e63b623202 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/HydraulicCalculation.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/IterateTowardsTargetProbabilityCalculation.cs =================================================================== diff -u --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/IterateTowardsTargetProbabilityCalculation.cs (revision 0) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Hydraulics/IterateTowardsTargetProbabilityCalculation.cs (revision e58872a87106093853d59f6cae8f57e63b623202) @@ -0,0 +1,49 @@ +// Copyright (C) Stichting Deltares 2016. 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. + +namespace Ringtoets.HydraRing.Calculation.Hydraulics +{ + /// + /// Container of all data necessary for performing a type-2 calculation via Hydra-Ring ("iterate towards a target probability, provided as reliability index"). + /// + public abstract class IterateTowardsTargetProbabilityCalculation : HydraRingCalculation + { + private readonly double beta; + + /// + /// Creates a new instance of the class. + /// + /// The id of the hydraulic station to use during the calculation. + /// The reliability index to use during the calculation. + protected IterateTowardsTargetProbabilityCalculation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId) + { + this.beta = beta; + } + + public override double Beta + { + get + { + return beta; + } + } + } +} \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs =================================================================== diff -u -r9584767846c783bf352e50a504dbc2de9af120bd -re58872a87106093853d59f6cae8f57e63b623202 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs (.../HydraRingSettingsCsvReader.cs) (revision 9584767846c783bf352e50a504dbc2de9af120bd) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs (.../HydraRingSettingsCsvReader.cs) (revision e58872a87106093853d59f6cae8f57e63b623202) @@ -28,7 +28,7 @@ namespace Ringtoets.HydraRing.Calculation.IO { /// - /// The reader for the Hydra- Ring settings in csv format. + /// The reader for the Hydra-Ring settings in csv format. /// public class HydraRingSettingsCsvReader { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj =================================================================== diff -u -rf760a191fb5e4826ef1b7a5ab4e04bee993c1215 -re58872a87106093853d59f6cae8f57e63b623202 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision f760a191fb5e4826ef1b7a5ab4e04bee993c1215) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision e58872a87106093853d59f6cae8f57e63b623202) @@ -63,7 +63,7 @@ - + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs =================================================================== diff -u -r0ee07a08d225dd9042229ae8ae1e582fe4bd22a6 -re58872a87106093853d59f6cae8f57e63b623202 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision 0ee07a08d225dd9042229ae8ae1e582fe4bd22a6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/HydraRingConfigurationTest.cs (.../HydraRingConfigurationTest.cs) (revision e58872a87106093853d59f6cae8f57e63b623202) @@ -47,7 +47,7 @@ { var hydraRingConfiguration = new HydraRingConfiguration("34-1", HydraRingTimeIntegrationSchemeType.NTI, HydraRingUncertaintiesType.Model); - hydraRingConfiguration.AddHydraRingCalculation(new HydraulicCalculationImplementation(700004, 1.1)); + hydraRingConfiguration.AddHydraRingCalculation(new IterateTowardsTargetProbabilityCalculationImplementation(700004, 1.1)); var expectedCreationScript = "DELETE FROM [HydraulicModels];" + Environment.NewLine + "INSERT INTO [HydraulicModels] VALUES (3, 2, 'WTI 2017');" + Environment.NewLine + @@ -112,9 +112,9 @@ Assert.AreEqual(expectedCreationScript, creationScript); } - private class HydraulicCalculationImplementation : HydraulicCalculation + private class IterateTowardsTargetProbabilityCalculationImplementation : IterateTowardsTargetProbabilityCalculation { - public HydraulicCalculationImplementation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId, beta) + public IterateTowardsTargetProbabilityCalculationImplementation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId, beta) { } Fisheye: Tag e58872a87106093853d59f6cae8f57e63b623202 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/HydraulicCalculationTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/IterateTowardsTargetProbabilityCalculationTest.cs =================================================================== diff -u --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/IterateTowardsTargetProbabilityCalculationTest.cs (revision 0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Hydraulics/IterateTowardsTargetProbabilityCalculationTest.cs (revision e58872a87106093853d59f6cae8f57e63b623202) @@ -0,0 +1,66 @@ +// Copyright (C) Stichting Deltares 2016. 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 NUnit.Framework; +using Ringtoets.HydraRing.Calculation.Data; +using Ringtoets.HydraRing.Calculation.Hydraulics; + +namespace Ringtoets.HydraRing.Calculation.Test.Hydraulics +{ + [TestFixture] + public class IterateTowardsTargetProbabilityCalculationTest + { + [Test] + public void Constructor_ExpectedValues() + { + // Call + var iterateTowardsTargetProbabilityCalculationImplementation = new IterateTowardsTargetProbabilityCalculationImplementation(1, 2.2); + + // Assert + Assert.AreEqual(1, iterateTowardsTargetProbabilityCalculationImplementation.HydraulicBoundaryLocationId); + Assert.AreEqual(HydraRingFailureMechanismType.DikesPiping, iterateTowardsTargetProbabilityCalculationImplementation.FailureMechanismType); + CollectionAssert.IsEmpty(iterateTowardsTargetProbabilityCalculationImplementation.Variables); + CollectionAssert.IsEmpty(iterateTowardsTargetProbabilityCalculationImplementation.ProfilePoints); + Assert.AreEqual(2.2, iterateTowardsTargetProbabilityCalculationImplementation.Beta); + } + + private class IterateTowardsTargetProbabilityCalculationImplementation : IterateTowardsTargetProbabilityCalculation + { + public IterateTowardsTargetProbabilityCalculationImplementation(int hydraulicBoundaryLocationId, double beta) : base(hydraulicBoundaryLocationId, beta) {} + + public override HydraRingFailureMechanismType FailureMechanismType + { + get + { + return HydraRingFailureMechanismType.DikesPiping; + } + } + + public override HydraRingDikeSection DikeSection + { + get + { + return new HydraRingDikeSection(1, "Name", 2.2, 3.3, 4.4, 5.5, 6.6, 7.7); + } + } + } + } +} Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj =================================================================== diff -u -rfe9af51d0ecee9dc64884d9370cf951fe787a8bc -re58872a87106093853d59f6cae8f57e63b623202 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision fe9af51d0ecee9dc64884d9370cf951fe787a8bc) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision e58872a87106093853d59f6cae8f57e63b623202) @@ -55,7 +55,7 @@ - +