Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs (.../DesignWaterLevelCalculator.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs (.../DesignWaterLevelCalculator.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -79,6 +79,7 @@ DesignWaterLevel = targetProbabilityParser.Output.Result; ReliabilityIndex = targetProbabilityParser.Output.CalculatedReliabilityIndex; } + Converged = convergenceParser.Output; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs (.../OvertoppingCalculator.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs (.../OvertoppingCalculator.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -79,10 +79,12 @@ { ExceedanceProbabilityBeta = exceedanceProbabilityCalculationParser.Output.Value; } + if (waveHeightParser.Output != null) { WaveHeight = waveHeightParser.Output.WaveHeight; } + IsOvertoppingDominant = waveHeightParser.Output != null && waveHeightParser.Output.IsOvertoppingDominant; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs (.../WaveHeightCalculator.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs (.../WaveHeightCalculator.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -78,6 +78,7 @@ WaveHeight = targetProbabilityParser.Output.Result; ReliabilityIndex = targetProbabilityParser.Output.CalculatedReliabilityIndex; } + Converged = convergenceParser.Output; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/FaultTreeIllustrationPoint.cs =================================================================== diff -u -rd7f56db6a475e07dd904bd61c0a56346aac4e565 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/FaultTreeIllustrationPoint.cs (.../FaultTreeIllustrationPoint.cs) (revision d7f56db6a475e07dd904bd61c0a56346aac4e565) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/FaultTreeIllustrationPoint.cs (.../FaultTreeIllustrationPoint.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -47,6 +47,7 @@ { throw new ArgumentNullException(nameof(name)); } + if (stochasts == null) { throw new ArgumentNullException(nameof(stochasts)); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/GeneralResult.cs =================================================================== diff -u -rca13ac94cb4308335c7a44bd15aa903eec98b308 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/GeneralResult.cs (.../GeneralResult.cs) (revision ca13ac94cb4308335c7a44bd15aa903eec98b308) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/GeneralResult.cs (.../GeneralResult.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -46,10 +46,12 @@ { throw new ArgumentNullException(nameof(governingWindDirection)); } + if (stochasts == null) { throw new ArgumentNullException(nameof(stochasts)); } + if (illustrationPoints == null) { throw new ArgumentNullException(nameof(illustrationPoints)); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/IllustrationPointTreeNode.cs =================================================================== diff -u -r8853e1a9e9eef19262eb25668799dffc978afe23 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/IllustrationPointTreeNode.cs (.../IllustrationPointTreeNode.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/IllustrationPointTreeNode.cs (.../IllustrationPointTreeNode.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -45,6 +45,7 @@ { throw new ArgumentNullException(nameof(data)); } + Data = data; Children = Enumerable.Empty(); } @@ -78,6 +79,7 @@ throw new ArgumentException(Resources.IllustrationPointTreeNode_SetChildren_Node_must_have_zero_or_two_child_nodes, nameof(children)); } + Children = children; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/Stochast.cs =================================================================== diff -u -rbe6a13ac1251d94b796612190233ac7a380b328e -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/Stochast.cs (.../Stochast.cs) (revision be6a13ac1251d94b796612190233ac7a380b328e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/Stochast.cs (.../Stochast.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -42,6 +42,7 @@ { throw new ArgumentNullException(nameof(name)); } + Name = name; Duration = duration; Alpha = alpha; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPoint.cs =================================================================== diff -u -r4a73a8a56bdfc43d45d691fa4dbc251bbb261085 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPoint.cs (.../SubMechanismIllustrationPoint.cs) (revision 4a73a8a56bdfc43d45d691fa4dbc251bbb261085) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/SubMechanismIllustrationPoint.cs (.../SubMechanismIllustrationPoint.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -50,10 +50,12 @@ { throw new ArgumentNullException(nameof(name)); } + if (stochasts == null) { throw new ArgumentNullException(nameof(stochasts)); } + if (illustrationPointResults == null) { throw new ArgumentNullException(nameof(illustrationPointResults)); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirection.cs =================================================================== diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirection.cs (.../WindDirection.cs) (revision a1abe798a3991d9fff01eae522ccae2a43d0a931) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirection.cs (.../WindDirection.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -60,14 +60,17 @@ { return false; } + if (ReferenceEquals(this, obj)) { return true; } + if (GetType() != obj.GetType()) { return false; } + return Equals((WindDirection) obj); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirectionClosingSituation.cs =================================================================== diff -u -ra1abe798a3991d9fff01eae522ccae2a43d0a931 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirectionClosingSituation.cs (.../WindDirectionClosingSituation.cs) (revision a1abe798a3991d9fff01eae522ccae2a43d0a931) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/WindDirectionClosingSituation.cs (.../WindDirectionClosingSituation.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -41,6 +41,7 @@ { throw new ArgumentNullException(nameof(windDirection)); } + if (closingSituation == null) { throw new ArgumentNullException(nameof(closingSituation)); @@ -66,14 +67,17 @@ { return false; } + if (ReferenceEquals(this, obj)) { return true; } + if (GetType() != obj.GetType()) { return false; } + return Equals((WindDirectionClosingSituation) obj); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingDatabaseParseHelper.cs =================================================================== diff -u -r648d6c8d5c952943c3f428981f97c1cdd8b0bd37 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingDatabaseParseHelper.cs (.../HydraRingDatabaseParseHelper.cs) (revision 648d6c8d5c952943c3f428981f97c1cdd8b0bd37) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/HydraRingDatabaseParseHelper.cs (.../HydraRingDatabaseParseHelper.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -93,10 +93,12 @@ { throw new ArgumentNullException(nameof(workingDirectory)); } + if (query == null) { throw new ArgumentNullException(nameof(query)); } + if (exceptionMessage == null) { throw new ArgumentNullException(nameof(exceptionMessage)); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs =================================================================== diff -u -r16559315c0a64fffd05827d249200c62e353231f -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision 16559315c0a64fffd05827d249200c62e353231f) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -187,6 +187,7 @@ { throw new HydraRingFileParserException(Resources.IllustrationPointsParser_Parse_Multiple_values_for_beta_of_illustration_point_found); } + faultTreeBetaValues[threeKeyIndex] = faultTreeBeta; } } @@ -248,6 +249,7 @@ { throw new HydraRingFileParserException(Resources.IllustrationPointsParser_Parse_Multiple_values_for_beta_of_illustration_point_found); } + subMechanismBetaValues[threeKeyIndex] = subMechanismBeta; } } @@ -301,8 +303,10 @@ rootIllustrationPoints[CreateFaultTreeKey(windDirectionClosingSituation)] = illustrationPointTreeNode; } } + return rootIllustrationPoints; } + return null; } @@ -344,6 +348,7 @@ type == "faulttree" ? typeof(FaultTreeIllustrationPoint) : typeof(SubMechanismIllustrationPoint), combine == "and" ? CombinationType.And : CombinationType.Or)); } + return results; } @@ -378,6 +383,7 @@ { AddRange(faultTreeIllustrationPointStochasts, faultTreeStochasts[dataKey]); } + var illustrationPoint = new FaultTreeIllustrationPoint(faultTrees[faultTreeId], faultTreeBetaValues[dataKey], faultTreeIllustrationPointStochasts, @@ -409,6 +415,7 @@ { AddRange(illustrationPointStochasts, subMechanismStochasts[dataKey]); } + if (subMechanismResults.ContainsKey(dataKey)) { AddRange(illustrationPointResults, subMechanismResults[dataKey]); @@ -448,10 +455,12 @@ { throw new HydraRingFileParserException(Resources.IllustrationPointsParser_Parse_Multiple_values_for_beta_of_illustration_point_found); } + if (betaValues.Length == 0) { throw new HydraRingFileParserException(Resources.IllustrationPointsParser_Parse_No_values_for_beta_of_illustration_point_found); } + beta = ConvertToDouble(betaValues[0][IllustrationPointsDatabaseConstants.BetaValue], IllustrationPointsDatabaseConstants.BetaValue); } @@ -471,6 +480,7 @@ { throw new HydraRingFileParserException(string.Format(Resources.IllustrationPointsParser_Parse_Column_0_is_Null, identifier)); } + return Convert.ToDouble(doubleValue); } @@ -574,10 +584,12 @@ { return false; } + if (GetType() != obj.GetType()) { return false; } + return Equals((ThreeKeyIndex) obj); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs =================================================================== diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -65,10 +65,12 @@ { throw new ArgumentNullException(nameof(workingDirectory)); } + if (query == null) { throw new ArgumentNullException(nameof(query)); } + IOUtils.ValidateFilePath(workingDirectory); this.workingDirectory = workingDirectory; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r2704a8a23092069a5b2e66a4a65d3eea57f36c30 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 2704a8a23092069a5b2e66a4a65d3eea57f36c30) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -579,6 +579,7 @@ } }); } + return orderDictionaries; } @@ -608,6 +609,7 @@ }); } } + return orderDictionaries; } @@ -632,6 +634,7 @@ }); } } + return orderedDictionaries; } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -249,6 +249,7 @@ { throw exception; } + Parsed = true; } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -167,7 +167,7 @@ (runPreprocessor ? "INSERT INTO [SectionFaultTreeModels] VALUES (1, 1, 1, 1, 9);" + Environment.NewLine : string.Empty) + - Environment.NewLine + + Environment.NewLine + "DELETE FROM [SectionSubMechanismModels];" + Environment.NewLine + "INSERT INTO [SectionSubMechanismModels] VALUES (1, 1, 1, 1, 1234);" + Environment.NewLine + Environment.NewLine + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs =================================================================== diff -u -rf8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs (.../HydraRingInitializationServiceTest.cs) (revision f8c28b3b04cdabb62ea37772efcb1f4ebbbf2b9e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingInitializationServiceTest.cs (.../HydraRingInitializationServiceTest.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -39,10 +39,10 @@ { // Call var hydraRingInitializationService = new HydraRingInitializationService(HydraRingFailureMechanismType.AssessmentLevel, - 700001, - "D:\\hlcd", - "D:\\work", - "D:\\preprocessor"); + 700001, + "D:\\hlcd", + "D:\\work", + "D:\\preprocessor"); // Assert Assert.AreEqual("D:\\work\\700001.ini", hydraRingInitializationService.IniFilePath); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/IllustrationPoints/GeneralResultTestFactoryTest.cs =================================================================== diff -u -r92f0a266f3ee297a3e0332e9a36fc3ec70d47b59 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/IllustrationPoints/GeneralResultTestFactoryTest.cs (.../GeneralResultTestFactoryTest.cs) (revision 92f0a266f3ee297a3e0332e9a36fc3ec70d47b59) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/IllustrationPoints/GeneralResultTestFactoryTest.cs (.../GeneralResultTestFactoryTest.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -46,6 +46,7 @@ { Assert.AreEqual("Stochast A", stochast.Name); } + CollectionAssert.IsEmpty(generalResult.IllustrationPoints); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/IllustrationPoints/GeneralResultTestFactory.cs =================================================================== diff -u -r92f0a266f3ee297a3e0332e9a36fc3ec70d47b59 -rf8ccdd4e0b50b88b4c0da66fc85a370da1b824e0 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/IllustrationPoints/GeneralResultTestFactory.cs (.../GeneralResultTestFactory.cs) (revision 92f0a266f3ee297a3e0332e9a36fc3ec70d47b59) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/IllustrationPoints/GeneralResultTestFactory.cs (.../GeneralResultTestFactory.cs) (revision f8ccdd4e0b50b88b4c0da66fc85a370da1b824e0) @@ -34,7 +34,7 @@ public static GeneralResult CreateGeneralResultWithDuplicateStochasts() { var stochast = new Stochast("Stochast A", 0, 0); - var stochasts = new[] + Stochast[] stochasts = { stochast, stochast