Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r55e286e8436b5061a9264ec8623b525f3015fe6e -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 55e286e8436b5061a9264ec8623b525f3015fe6e) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -179,15 +179,7 @@ { AssessmentLevelCalculationInput calculationInput = CreateInput(designWaterLevelCalculation, norm, hydraulicBoundaryDatabaseFilePath); - bool calculateIllustrationPoints = designWaterLevelCalculation.CalculateIllustrationPoints; - if (calculateIllustrationPoints) - { - calculator.CalculateWithIllustrationPoints(calculationInput); - } - else - { - calculator.Calculate(calculationInput); - } + calculator.Calculate(calculationInput); if (canceled || !string.IsNullOrEmpty(calculator.LastErrorFileContent)) { @@ -197,7 +189,7 @@ HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput( messageProvider, designWaterLevelCalculation.Name, calculationInput.Beta, norm, calculator.Converged); - if (calculateIllustrationPoints) + if (designWaterLevelCalculation.CalculateIllustrationPoints) { SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult); } Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r55e286e8436b5061a9264ec8623b525f3015fe6e -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 55e286e8436b5061a9264ec8623b525f3015fe6e) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -180,15 +180,7 @@ { WaveHeightCalculationInput calculationInput = CreateInput(waveHeightCalculation, norm, hydraulicBoundaryDatabaseFilePath); - bool calculateIllustrationPoints = waveHeightCalculation.CalculateIllustrationPoints; - if (calculateIllustrationPoints) - { - calculator.CalculateWithIllustrationPoints(calculationInput); - } - else - { - calculator.Calculate(calculationInput); - } + calculator.Calculate(calculationInput); if (canceled || !string.IsNullOrEmpty(calculator.LastErrorFileContent)) { @@ -198,7 +190,7 @@ HydraulicBoundaryLocationOutput hydraulicBoundaryLocationOutput = CreateHydraulicBoundaryLocationOutput( messageProvider, waveHeightCalculation.Name, calculationInput.Beta, norm, calculator.Converged); - if (calculateIllustrationPoints) + if (waveHeightCalculation.CalculateIllustrationPoints) { SetIllustrationPointsResult(hydraulicBoundaryLocationOutput, calculator.IllustrationPointsResult); } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r55e286e8436b5061a9264ec8623b525f3015fe6e -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 55e286e8436b5061a9264ec8623b525f3015fe6e) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -126,7 +126,9 @@ } [Test] - public void Calculate_ValidDesignWaterLevelCalculation_StartsCalculationWithRightParameters() + [TestCase(true)] + [TestCase(false)] + public void Calculate_ValidDesignWaterLevelCalculation_StartsCalculationWithRightParameters(bool readIllustrationPoints) { // Setup string validFilePath = Path.Combine(testDataPath, validFile); @@ -135,7 +137,10 @@ const string locationName = "punt_flw_ 1"; const double norm = 1.0 / 30; - var calculator = new TestDesignWaterLevelCalculator(); + var calculator = new TestDesignWaterLevelCalculator + { + IllustrationPointsResult = new TestGeneralResult() + }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); @@ -144,7 +149,7 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return(locationName); calculation.Expect(c => c.Id).Return(id); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(false); + calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustrationPoints); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty); @@ -163,14 +168,13 @@ AssertInput(expectedInput, calculator.ReceivedInputs.Single()); Assert.IsFalse(calculator.IsCanceled); - Assert.IsFalse(calculator.CalculatedWithIllustrationPoints); - Assert.IsFalse(calculation.Output.HasIllustrationPoints); + Assert.AreEqual(readIllustrationPoints, calculation.Output.HasIllustrationPoints); } mockRepository.VerifyAll(); } [Test] - public void Calculate_ValidDesignWaterLevelCalculationWithIllustrationPointsThrowsException_ThrowsHydraRingFileParserException() + public void Calculate_ValidDesignWaterLevelCalculationThrowsException_ThrowsHydraRingFileParserException() { // Setup string validFilePath = Path.Combine(testDataPath, validFile); @@ -180,7 +184,7 @@ var mockRepository = new MockRepository(); var calculator = mockRepository.Stub(); - calculator.Expect(c => c.CalculateWithIllustrationPoints(Arg.Is.TypeOf)) + calculator.Expect(c => c.Calculate(Arg.Is.TypeOf)) .Throw(expectedException); calculator.Stub(c => c.LastErrorFileContent).Return(string.Empty); calculator.Stub(c => c.OutputDirectory).Return(string.Empty); @@ -191,7 +195,6 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return(locationName); calculation.Expect(c => c.Id).Return(100); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(true); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty); @@ -256,55 +259,6 @@ } [Test] - public void Calculate_ValidDesignWaterLevelCalculationWithIllustrationPoints_StartsCalculationWithRightParameters() - { - // Setup - string validFilePath = Path.Combine(testDataPath, validFile); - - const long id = 100; - const string locationName = "punt_flw_ 1"; - const double norm = 1.0 / 30; - - var calculator = new TestDesignWaterLevelCalculator - { - IllustrationPointsResult = new TestGeneralResult() - }; - - var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateDesignWaterLevelCalculator(testDataPath)).Return(calculator); - - var calculation = mockRepository.Stub(); - calculation.Stub(c => c.Name).Return(locationName); - calculation.Expect(c => c.Id).Return(id); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(true); - - var calculationMessageProvider = mockRepository.Stub(); - calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty); - mockRepository.ReplayAll(); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - // Call - new DesignWaterLevelCalculationService().Calculate(calculation, - validFilePath, - norm, - calculationMessageProvider); - - // Assert - AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm); - AssertInput(expectedInput, calculator.ReceivedInputs.Single()); - Assert.IsFalse(calculator.IsCanceled); - - Assert.IsTrue(calculator.CalculatedWithIllustrationPoints); - - HydraulicBoundaryLocationOutput output = calculation.Output; - Assert.IsTrue(output.HasIllustrationPoints); - } - mockRepository.VerifyAll(); - } - - [Test] public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() { // Setup @@ -319,7 +273,6 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return("name"); calculation.Expect(c => c.Id).Return(0); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(false); var calculationMessageProvider = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -370,7 +323,6 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return(locationName); calculation.Expect(c => c.Id).Return(0); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(false); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Expect(calc => calc.GetCalculationFailedMessage(locationName, Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -rca13ac94cb4308335c7a44bd15aa903eec98b308 -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision ca13ac94cb4308335c7a44bd15aa903eec98b308) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -126,7 +126,9 @@ } [Test] - public void Calculate_ValidWaveHeightCalculation_StartsCalculationWithRightParameters() + [TestCase(true)] + [TestCase(false)] + public void Calculate_ValidWaveHeightCalculation_StartsCalculationWithRightParameters(bool readIllustationPoints) { // Setup string validFilePath = Path.Combine(testDataPath, validFile); @@ -135,7 +137,10 @@ const string locationName = "punt_flw_ 1"; const double norm = 1.0 / 30; - var calculator = new TestWaveHeightCalculator(); + var calculator = new TestWaveHeightCalculator + { + IllustrationPointsResult = new TestGeneralResult() + }; var mockRepository = new MockRepository(); var calculatorFactory = mockRepository.StrictMock(); @@ -144,7 +149,7 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return(locationName); calculation.Expect(c => c.Id).Return(id); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(false); + calculation.Expect(c => c.CalculateIllustrationPoints).Return(readIllustationPoints); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty); @@ -162,14 +167,13 @@ AssertInput(expectedInput, calculator.ReceivedInputs.Single()); Assert.IsFalse(calculator.IsCanceled); - Assert.IsFalse(calculator.CalculatedWithIllustrationPoints); - Assert.IsFalse(calculation.Output.HasIllustrationPoints); + Assert.AreEqual(readIllustationPoints, calculation.Output.HasIllustrationPoints); } mockRepository.VerifyAll(); } [Test] - public void Calculate_ValidWaveHeightCalculationWithIllustrationPointsThrowsException_ThrowsHydraRingFileParserException() + public void Calculate_ValidWaveHeightCalculationThrowsException_ThrowsHydraRingFileParserException() { // Setup string validFilePath = Path.Combine(testDataPath, validFile); @@ -179,7 +183,7 @@ var mockRepository = new MockRepository(); var calculator = mockRepository.Stub(); - calculator.Expect(c => c.CalculateWithIllustrationPoints(Arg.Is.TypeOf)) + calculator.Expect(c => c.Calculate(Arg.Is.TypeOf)) .Throw(expectedException); calculator.Stub(c => c.LastErrorFileContent).Return(string.Empty); calculator.Stub(c => c.OutputDirectory).Return(string.Empty); @@ -190,7 +194,6 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return(locationName); calculation.Expect(c => c.Id).Return(100); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(true); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty); @@ -255,55 +258,6 @@ } [Test] - public void Calculate_ValidWaveHeightCalculationWithIllustrationPoints_StartsCalculationWithRightParameters() - { - // Setup - string validFilePath = Path.Combine(testDataPath, validFile); - - const long id = 100; - const string locationName = "punt_flw_ 1"; - const double norm = 1.0 / 30; - - var calculator = new TestWaveHeightCalculator - { - IllustrationPointsResult = new TestGeneralResult() - }; - - var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.StrictMock(); - calculatorFactory.Expect(cf => cf.CreateWaveHeightCalculator(testDataPath)).Return(calculator); - - var calculation = mockRepository.Stub(); - calculation.Stub(c => c.Name).Return(locationName); - calculation.Expect(c => c.Id).Return(id); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(true); - - var calculationMessageProvider = mockRepository.Stub(); - calculationMessageProvider.Stub(calc => calc.GetCalculatedNotConvergedMessage(locationName)).Return(string.Empty); - mockRepository.ReplayAll(); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - // Call - new WaveHeightCalculationService().Calculate(calculation, - validFilePath, - norm, - calculationMessageProvider); - - // Assert - AssessmentLevelCalculationInput expectedInput = CreateInput(id, norm); - AssertInput(expectedInput, calculator.ReceivedInputs.Single()); - Assert.IsFalse(calculator.IsCanceled); - - Assert.IsTrue(calculator.CalculatedWithIllustrationPoints); - - HydraulicBoundaryLocationOutput output = calculation.Output; - Assert.IsTrue(output.HasIllustrationPoints); - } - mockRepository.VerifyAll(); - } - - [Test] public void Calculate_CancelCalculationWithValidInput_CancelsCalculator() { // Setup @@ -317,7 +271,6 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return("name"); calculation.Expect(c => c.Id).Return(0); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(false); var calculationMessageProvider = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -368,7 +321,6 @@ var calculation = mockRepository.Stub(); calculation.Stub(c => c.Name).Return(locationName); calculation.Expect(c => c.Id).Return(0); - calculation.Expect(c => c.CalculateIllustrationPoints).Return(false); var calculationMessageProvider = mockRepository.Stub(); calculationMessageProvider.Expect(calc => calc.GetCalculationFailedMessage(locationName, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs =================================================================== diff -u -rb8d852df1bd7269388f44bcb13d23a51920842fc -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs (.../DesignWaterLevelCalculator.cs) (revision b8d852df1bd7269388f44bcb13d23a51920842fc) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs (.../DesignWaterLevelCalculator.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -38,7 +38,6 @@ private readonly ReliabilityIndexCalculationParser targetProbabilityParser; private readonly ConvergenceParser convergenceParser; private readonly IllustrationPointsParser illustrationPointsParser; - private bool includeIllustrationPoints; /// /// Create a new instance of . @@ -69,27 +68,11 @@ Calculate(HydraRingUncertaintiesType.All, input); } - public void CalculateWithIllustrationPoints(AssessmentLevelCalculationInput input) - { - includeIllustrationPoints = true; - try - { - Calculate(input); - } - finally - { - includeIllustrationPoints = false; - } - } - protected override IEnumerable GetParsers() { yield return targetProbabilityParser; yield return convergenceParser; - if (includeIllustrationPoints) - { - yield return illustrationPointsParser; - } + yield return illustrationPointsParser; } protected override void SetOutputs() @@ -101,10 +84,7 @@ } Converged = convergenceParser.Output; - if (includeIllustrationPoints) - { - IllustrationPointsResult = illustrationPointsParser.Output; - } + IllustrationPointsResult = illustrationPointsParser.Output; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs =================================================================== diff -u -r6c058f12138b8a73a78eacd10357d9caa81ed67d -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 6c058f12138b8a73a78eacd10357d9caa81ed67d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -27,8 +27,10 @@ using System.Security; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input; +using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints; using Ringtoets.HydraRing.Calculation.Exceptions; using Ringtoets.HydraRing.Calculation.Parsers; +using Ringtoets.HydraRing.Calculation.Parsers.IllustrationPoints; using Ringtoets.HydraRing.Calculation.Properties; using Ringtoets.HydraRing.Calculation.Services; @@ -40,6 +42,7 @@ internal abstract class HydraRingCalculatorBase { private readonly LastErrorFileParser lastErrorFileParser; + private readonly IllustrationPointsParser illustrationPointsParser; private readonly string hlcdDirectory; private Process hydraRingProcess; @@ -59,6 +62,7 @@ this.hlcdDirectory = hlcdDirectory; lastErrorFileParser = new LastErrorFileParser(); + illustrationPointsParser = new IllustrationPointsParser(); } /// @@ -72,6 +76,11 @@ public string LastErrorFileContent { get; private set; } /// + /// Gets the result of the illustration points. + /// + public GeneralResult IllustrationPointsResult { get; private set; } + + /// /// Cancels any currently running Hydra-Ring calculation. /// public void Cancel() @@ -150,10 +159,22 @@ /// The id of the section of the calculation. /// Thrown when the HydraRing file parser /// encounters an error while parsing HydraRing output. + /// The is set to null when the + /// encounters an error. private void ExecuteGenericParsers(HydraRingInitializationService hydraRingInitializationService, int sectionId) { lastErrorFileParser.Parse(hydraRingInitializationService.TemporaryWorkingDirectory, sectionId); LastErrorFileContent = lastErrorFileParser.ErrorFileContent; + + try + { + illustrationPointsParser.Parse(hydraRingInitializationService.TemporaryWorkingDirectory, sectionId); + IllustrationPointsResult = illustrationPointsParser.Output; + } + catch (HydraRingFileParserException) + { + IllustrationPointsResult = null; + } } /// Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs =================================================================== diff -u -r0fd23ff8e68b5f0d18d344d104bc68216cb49b51 -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs (.../IDesignWaterLevelCalculator.cs) (revision 0fd23ff8e68b5f0d18d344d104bc68216cb49b51) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IDesignWaterLevelCalculator.cs (.../IDesignWaterLevelCalculator.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -70,15 +70,6 @@ void Calculate(AssessmentLevelCalculationInput input); /// - /// Performs the actual calculation by running the Hydra-Ring executable. - /// Afterwards, sets the . - /// - /// The which contains all the necessary input - /// for the calculation. - /// Thrown when an error occurs while performing the calculation. - void CalculateWithIllustrationPoints(AssessmentLevelCalculationInput input); - - /// /// Cancels any currently running Hydra-Ring calculation. /// void Cancel(); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs =================================================================== diff -u -r0fd23ff8e68b5f0d18d344d104bc68216cb49b51 -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs (.../IWaveHeightCalculator.cs) (revision 0fd23ff8e68b5f0d18d344d104bc68216cb49b51) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/IWaveHeightCalculator.cs (.../IWaveHeightCalculator.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -70,15 +70,6 @@ void Calculate(WaveHeightCalculationInput input); /// - /// Performs the actual calculation by running the Hydra-Ring executable. - /// Afterwards, sets the . - /// - /// The which contains all the necessary input - /// for the calculation. - /// Thrown when an error occurs while performing the calculation. - void CalculateWithIllustrationPoints(WaveHeightCalculationInput input); - - /// /// Cancels any currently running Hydra-Ring calculation. /// void Cancel(); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs =================================================================== diff -u -rb8d852df1bd7269388f44bcb13d23a51920842fc -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs (.../WaveHeightCalculator.cs) (revision b8d852df1bd7269388f44bcb13d23a51920842fc) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs (.../WaveHeightCalculator.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -23,9 +23,7 @@ using System.Collections.Generic; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics; -using Ringtoets.HydraRing.Calculation.Data.Output.IllustrationPoints; using Ringtoets.HydraRing.Calculation.Parsers; -using Ringtoets.HydraRing.Calculation.Parsers.IllustrationPoints; namespace Ringtoets.HydraRing.Calculation.Calculator { @@ -37,8 +35,6 @@ { private readonly ReliabilityIndexCalculationParser targetProbabilityParser; private readonly ConvergenceParser convergenceParser; - private readonly IllustrationPointsParser illustrationPointsParser; - private bool includeIllustrationPoints; /// /// Create a new instance of . @@ -50,32 +46,16 @@ { targetProbabilityParser = new ReliabilityIndexCalculationParser(); convergenceParser = new ConvergenceParser(); - illustrationPointsParser = new IllustrationPointsParser(); WaveHeight = double.NaN; ReliabilityIndex = double.NaN; } - public GeneralResult IllustrationPointsResult { get; private set; } - public double WaveHeight { get; private set; } public double ReliabilityIndex { get; private set; } public bool? Converged { get; private set; } - public void CalculateWithIllustrationPoints(WaveHeightCalculationInput input) - { - includeIllustrationPoints = true; - try - { - Calculate(input); - } - finally - { - includeIllustrationPoints = false; - } - } - public void Calculate(WaveHeightCalculationInput input) { Calculate(HydraRingUncertaintiesType.All, input); @@ -85,10 +65,6 @@ { yield return targetProbabilityParser; yield return convergenceParser; - if (includeIllustrationPoints) - { - yield return illustrationPointsParser; - } } protected override void SetOutputs() @@ -99,11 +75,6 @@ ReliabilityIndex = targetProbabilityParser.Output.CalculatedReliabilityIndex; } Converged = convergenceParser.Output; - - if (includeIllustrationPoints) - { - IllustrationPointsResult = illustrationPointsParser.Output; - } } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs =================================================================== diff -u -r6c058f12138b8a73a78eacd10357d9caa81ed67d -r2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 6c058f12138b8a73a78eacd10357d9caa81ed67d) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 2fb9ff1aeea694e4ee33075b6ae5e6f3f819573c) @@ -118,7 +118,6 @@ public bool EndInFailure { get; set; } public bool IsCanceled { get; private set; } - public bool CalculatedWithIllustrationPoints { get; private set; } public GeneralResult IllustrationPointsResult { get; set; } public readonly HydraRingCalculationException HydraRingCalculationException = new HydraRingCalculationException(); @@ -133,12 +132,6 @@ CalculationFinished(EventArgs.Empty); } - public void CalculateWithIllustrationPoints(T input) - { - CalculatedWithIllustrationPoints = true; - Calculate(input); - } - public void Cancel() { IsCanceled = true;