Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9 -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b) @@ -58,7 +58,7 @@ private bool canceled; private IOvertoppingCalculator overtoppingCalculator; private IDikeHeightCalculator dikeHeightCalculator; - private IOvertoppingSubCalculator overtoppingRateCalculator; + private IHydraulicLoadsCalculator overtoppingRateCalculator; /// /// Performs validation over the values on the given . Error and status information is logged during Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs =================================================================== diff -u -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9 -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs (.../HydraRingCalculatorFactory.cs) (revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs (.../HydraRingCalculatorFactory.cs) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b) @@ -59,7 +59,7 @@ return new DikeHeightCalculator(hlcdDirectory); } - public IOvertoppingSubCalculator CreateOvertoppingRateCalculator(string hlcdDirectory) + public IHydraulicLoadsCalculator CreateOvertoppingRateCalculator(string hlcdDirectory) { return new OvertoppingRateCalculator(hlcdDirectory); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs =================================================================== diff -u -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9 -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b) @@ -57,9 +57,9 @@ /// Creates a calculator for calculating an overtopping rate. /// /// The directory where the hydraulic database can be found. - /// A new . + /// A new . /// Thrown when is null. - IOvertoppingSubCalculator CreateOvertoppingRateCalculator(string hlcdDirectory); + IHydraulicLoadsCalculator CreateOvertoppingRateCalculator(string hlcdDirectory); /// /// Creates a calculator for calculating wave conditions. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IHydraulicLoadsCalculator.cs =================================================================== diff -u --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IHydraulicLoadsCalculator.cs (revision 0) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IHydraulicLoadsCalculator.cs (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b) @@ -0,0 +1,71 @@ +// 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 Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; +using Ringtoets.HydraRing.Calculation.Exceptions; + +namespace Ringtoets.HydraRing.Calculation.Calculator +{ + /// + /// Interface for a calculator which calculates a hydraulic loads value associated to the result of iterating towards a + /// probability of failure given a norm. + /// + public interface IHydraulicLoadsCalculator + { + /// + /// Gets the calculated hydraulic loads value. + /// + double Value { get; } + + /// + /// Gets the reliability index. + /// + double ReliabilityIndex { get; } + + /// + /// Gets the value indicating whether the calculation converged. + /// + bool? Converged { get; } + + /// + /// Gets the temporary output directory that is generated during the Hydra-Ring calculation. + /// + string OutputDirectory { get; } + + /// + /// Gets the content of the last error file generated during the Hydra-Ring calculation. + /// + string LastErrorFileContent { get; } + + /// + /// Performs the actual calculation by running the Hydra-Ring executable. + /// + /// The which contains all the necessary input + /// for the calculation. + /// Thrown when an error occurs while performing the calculation. + void Calculate(HydraulicLoadsCalculationInput input); + + /// + /// Cancels any currently running Hydra-Ring calculation. + /// + void Cancel(); + } +} \ No newline at end of file Fisheye: Tag f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IOvertoppingSubCalculator.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingRateCalculator.cs =================================================================== diff -u -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9 -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingRateCalculator.cs (.../OvertoppingRateCalculator.cs) (revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingRateCalculator.cs (.../OvertoppingRateCalculator.cs) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b) @@ -31,7 +31,7 @@ /// Calculator which calculates the overtopping rate associated to the result of iterating towards a /// probability of failure given a norm. /// - internal class OvertoppingRateCalculator : HydraRingCalculatorBase, IOvertoppingSubCalculator + internal class OvertoppingRateCalculator : HydraRingCalculatorBase, IHydraulicLoadsCalculator { private readonly ReliabilityIndexCalculationParser targetProbabilityParser; private readonly ConvergenceParser convergenceParser; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj =================================================================== diff -u -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9 -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b) @@ -49,7 +49,7 @@ - + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs =================================================================== diff -u -rd4ab6d2f797dfb71ab463cebb3565809a6af76a9 -rf8a22607a4baa03dc132a07b6ef4d5ef83c3df6b --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision d4ab6d2f797dfb71ab463cebb3565809a6af76a9) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision f8a22607a4baa03dc132a07b6ef4d5ef83c3df6b) @@ -62,7 +62,7 @@ return DikeHeightCalculator; } - public IOvertoppingSubCalculator CreateOvertoppingRateCalculator(string hlcdDirectory) + public IHydraulicLoadsCalculator CreateOvertoppingRateCalculator(string hlcdDirectory) { OvertoppingRateCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; return OvertoppingRateCalculator; @@ -144,7 +144,7 @@ public bool? Converged { get; set; } } - public class TestOvertoppingRateCalculator : TestHydraRingCalculator, IOvertoppingSubCalculator + public class TestOvertoppingRateCalculator : TestHydraRingCalculator, IHydraulicLoadsCalculator { public double Value { get; set; } public double ReliabilityIndex { get; set; }