Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -141,8 +141,11 @@ /// public void Cancel() { - calculator?.Cancel(); - + if (calculator != null) + { + calculator.Cancel(); + } + canceled = true; } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -78,8 +78,14 @@ /// public void Cancel() { - overtoppingCalculator?.Cancel(); - dikeHeightCalculator?.Cancel(); + if (overtoppingCalculator != null) + { + overtoppingCalculator.Cancel(); + } + if (dikeHeightCalculator != null) + { + dikeHeightCalculator.Cancel(); + } canceled = true; } @@ -198,7 +204,10 @@ private void NotifyProgress(string stepName, int currentStepNumber, int totalStepNumber) { - OnProgress?.Invoke(stepName, currentStepNumber, totalStepNumber); + if (OnProgress != null) + { + OnProgress.Invoke(stepName, currentStepNumber, totalStepNumber); + } } private void CalculateOvertopping(OvertoppingCalculationInput overtoppingCalculationInput, string calculationName) Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -77,9 +77,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); StringAssert.StartsWith("Validatie mislukt: Er is geen hydraulische randvoorwaardenlocatie geselecteerd.", msgs[1]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[2]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); }); Assert.IsFalse(isValid); @@ -121,9 +121,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[1]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[2]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); }); Assert.IsFalse(isValid); @@ -165,9 +165,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[1]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[2]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); }); Assert.IsFalse(isValid); @@ -207,9 +207,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); StringAssert.StartsWith("Validatie mislukt: Er is geen dijkprofiel geselecteerd.", msgs[1]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[2]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); }); Assert.IsFalse(isValid); @@ -245,9 +245,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); Assert.AreEqual("Validatie mislukt: Er is geen geldige damhoogte ingevoerd.", msgs[1]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[2]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); }); Assert.IsFalse(isValid); @@ -291,9 +291,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); Assert.AreEqual("Validatie mislukt: Er is geen concreet getal ingevoerd voor 'oriëntatie'.", msgs[1]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[2]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[2]); }); Assert.IsFalse(isValid); @@ -331,8 +331,8 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[1]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[1]); }); Assert.IsTrue(isValid); @@ -372,8 +372,8 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); - StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[1]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' gestart om: ", name), msgs[0]); + StringAssert.StartsWith(String.Format("Validatie van '{0}' beëindigd om: ", name), msgs[1]); }); Assert.IsTrue(isValid); @@ -502,11 +502,11 @@ { var msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); - StringAssert.StartsWith($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt.", msgs[2]); + StringAssert.StartsWith(String.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt.", calculation.Name), msgs[2]); StringAssert.StartsWith("Dijkhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[3]); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[4]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]); }); Assert.IsFalse(expectedExceptionThrown); Assert.IsNotNull(calculation.Output); @@ -686,10 +686,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); - StringAssert.StartsWith($"De berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[1]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", calculation.Name), msgs[1]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[2]); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[3]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[3]); }); Assert.IsNull(calculation.Output); Assert.IsTrue(exceptionThrown); @@ -752,10 +752,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); - StringAssert.StartsWith($"De berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Er is geen foutrapport beschikbaar.", msgs[1]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt. Er is geen foutrapport beschikbaar.", calculation.Name), msgs[1]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[2]); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[3]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[3]); }); Assert.IsTrue(exceptionThrown); Assert.IsNull(calculation.Output); @@ -821,10 +821,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); - StringAssert.StartsWith($"De berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[1]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); + StringAssert.StartsWith(String.Format("De berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", calculation.Name), msgs[1]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[2]); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[3]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[3]); }); Assert.IsTrue(exceptionThrown); Assert.AreEqual(calculator.LastErrorFileContent, exceptionMessage); @@ -887,11 +887,11 @@ { var msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); - StringAssert.StartsWith($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[2]); + StringAssert.StartsWith(String.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", calculation.Name), msgs[2]); StringAssert.StartsWith("Dijkhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[3]); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[4]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]); }); Assert.IsNotNull(calculation.Output); Assert.IsFalse(exceptionThrown); @@ -951,11 +951,11 @@ { var msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); - StringAssert.StartsWith($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Er is geen foutrapport beschikbaar.", msgs[2]); + StringAssert.StartsWith(String.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt. Er is geen foutrapport beschikbaar.", calculation.Name), msgs[2]); StringAssert.StartsWith("Dijkhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[3]); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[4]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]); }); Assert.IsNotNull(calculation.Output); Assert.IsFalse(exceptionThrown); @@ -1016,11 +1016,11 @@ TestHelper.AssertLogMessages(call, messages => { var msgs = messages.ToArray(); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); - StringAssert.StartsWith($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[2]); + StringAssert.StartsWith(String.Format("De HBN berekening voor grasbekleding erosie kruin en binnentalud '{0}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", calculation.Name), msgs[2]); StringAssert.StartsWith("Dijkhoogte berekening is uitgevoerd op de tijdelijke locatie", msgs[3]); - StringAssert.StartsWith($"Berekening van '{calculation.Name}' beëindigd om: ", msgs[4]); + StringAssert.StartsWith(String.Format("Berekening van '{0}' beëindigd om: ", calculation.Name), msgs[4]); Assert.AreEqual(5, msgs.Length); }); Assert.IsNotNull(calculation.Output); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -73,7 +73,10 @@ /// public void Cancel() { - calculator?.Cancel(); + if (calculator != null) + { + calculator.Cancel(); + } canceled = true; } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -rebdbf01f6ab35a28b3a306145796ce532920af62 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision ebdbf01f6ab35a28b3a306145796ce532920af62) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -231,7 +231,7 @@ } [Test] - [TestCaseSource(nameof(NormalDistributionsWithInvalidMean))] + [TestCaseSource("NormalDistributionsWithInvalidMean")] public void Validate_NormalDistributionMeanInvalid_LogsErrorAndReturnsFalse(double meanOne, double meanTwo, double meanThree, string parameterName) { // Setup @@ -277,7 +277,7 @@ } [Test] - [TestCaseSource(nameof(LogNormalDistributionsWithInvalidMean))] + [TestCaseSource("LogNormalDistributionsWithInvalidMean")] public void Validate_LogNormalDistributionMeanInvalid_LogsErrorAndReturnsFalse(double meanOne, double meanTwo, double meanThree, double meanFour, double meanFive, string parameterName) { @@ -325,7 +325,7 @@ } [Test] - [TestCaseSource(nameof(DistributionsWithInvalidDeviation))] + [TestCaseSource("DistributionsWithInvalidDeviation")] public void Validate_DistributionStandardDeviationInvalid_LogsErrorAndReturnsFalse(double deviationOne, double deviationTwo, double deviationThree, double deviationFour, double deviationFive, string parameterName) @@ -374,7 +374,7 @@ } [Test] - [TestCaseSource(nameof(DistributionsWithInvalidCoefficient))] + [TestCaseSource("DistributionsWithInvalidCoefficient")] public void Validate_DistributionVariationCoefficientInvalid_LogsErrorAndReturnsFalse( double coefficientOne, double coefficientTwo, double coefficientThree, string parameterName) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/DikeHeightCalculationInput.cs (.../DikeHeightCalculationInput.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -99,7 +99,13 @@ this.criticalOvertoppingStandardDeviation = criticalOvertoppingStandardDeviation; } - public override int VariableId { get; } = 1; + public override int VariableId + { + get + { + return 1; + } + } public override IEnumerable Variables { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/HydraulicLoadsCalculationInput.cs (.../HydraulicLoadsCalculationInput.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -121,7 +121,13 @@ this.breakWater = breakWater; } - public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.HydraulicLoads; + public override HydraRingFailureMechanismType FailureMechanismType + { + get + { + return HydraRingFailureMechanismType.HydraulicLoads; + } + } public override HydraRingSection Section { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Hydraulics/OvertoppingRateCalculationInput.cs (.../OvertoppingRateCalculationInput.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -96,7 +96,13 @@ this.dikeHeight = dikeHeight; } - public override int VariableId { get; } = 17; + public override int VariableId + { + get + { + return 17; + } + } public override IEnumerable Variables { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Overtopping/OvertoppingCalculationInput.cs (.../OvertoppingCalculationInput.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -130,9 +130,21 @@ this.exponentModelFactorShallowUpperBoundary = exponentModelFactorShallowUpperBoundary; } - public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.DikesOvertopping; + public override HydraRingFailureMechanismType FailureMechanismType + { + get + { + return HydraRingFailureMechanismType.DikesOvertopping; + } + } - public override int VariableId { get; } = 1; + public override int VariableId + { + get + { + return 1; + } + } public override HydraRingSection Section { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -rdf9261fbb60c129167c1d6a2ca9aed6dc0885f07 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision df9261fbb60c129167c1d6a2ca9aed6dc0885f07) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -125,9 +125,21 @@ this.probabilityOrFrequencyOpenStructureBeforeFlooding = probabilityOrFrequencyOpenStructureBeforeFlooding; } - public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.StructuresClosure; + public override HydraRingFailureMechanismType FailureMechanismType + { + get + { + return HydraRingFailureMechanismType.StructuresClosure; + } + } - public override int VariableId { get; } = 58; + public override int VariableId + { + get + { + return 58; + } + } public override HydraRingSection Section { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs =================================================================== diff -u -rdf9261fbb60c129167c1d6a2ca9aed6dc0885f07 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision df9261fbb60c129167c1d6a2ca9aed6dc0885f07) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -141,9 +141,21 @@ this.stormDurationVariation = stormDurationVariation; } - public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.StructuresOvertopping; + public override HydraRingFailureMechanismType FailureMechanismType + { + get + { + return HydraRingFailureMechanismType.StructuresOvertopping; + } + } - public override int VariableId { get; } = 60; + public override int VariableId + { + get + { + return 60; + } + } public override HydraRingSection Section { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs =================================================================== diff -u -rdf9261fbb60c129167c1d6a2ca9aed6dc0885f07 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision df9261fbb60c129167c1d6a2ca9aed6dc0885f07) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -143,7 +143,7 @@ /// The modification factor waves slowly-varying pressure component. /// The modification factor dynamic or impulsive pressure component. protected StructuresStabilityPointCalculationInput(long hydraulicBoundaryLocationId, - double sectionNormal, + double sectionNormal, IEnumerable forelandPoints, HydraRingBreakWater breakWater, double volumicWeightWater, @@ -236,9 +236,21 @@ this.modificationFactorDynamicOrImpulsivePressureComponent = modificationFactorDynamicOrImpulsivePressureComponent; } - public override HydraRingFailureMechanismType FailureMechanismType { get; } = HydraRingFailureMechanismType.StructuresStructuralFailure; + public override HydraRingFailureMechanismType FailureMechanismType + { + get + { + return HydraRingFailureMechanismType.StructuresStructuralFailure; + } + } - public override int VariableId { get; } = 58; + public override int VariableId + { + get + { + return 58; + } + } public override HydraRingSection Section { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs =================================================================== diff -u -r644164b33ae8789eab8d1c8ffd84aafe45b19d44 -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 644164b33ae8789eab8d1c8ffd84aafe45b19d44) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/HydraulicLoadsCalculationInputTest.cs (.../HydraulicLoadsCalculationInputTest.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -167,7 +167,13 @@ exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation, exponentModelFactorShallowLowerBoundary, exponentModelFactorShallowUpperBoundary) {} - public override int VariableId { get; } = -1; + public override int VariableId + { + get + { + return -1; + } + } } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -rf7a0b62177d09fb02de673c29f7d153775c5608d -r4febca1a6186a1c6a09aa673ce967ff0b7efd0b1 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision f7a0b62177d09fb02de673c29f7d153775c5608d) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 4febca1a6186a1c6a09aa673ce967ff0b7efd0b1) @@ -160,7 +160,10 @@ /// public void Cancel() { - calculator?.Cancel(); + if (calculator != null) + { + calculator.Cancel(); + } canceled = true; }