Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/DesignTablesSettingsCsvReader.cs (.../DesignTablesSettingsCsvReader.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -72,7 +72,7 @@ /// /// Creates a new instance of . /// - /// The fileContents to read. + /// The file contents to read. /// Thrown when is not set. public DesignTablesSettingsCsvReader(string fileContents) : base(fileContents, new Dictionary>()) {} @@ -91,7 +91,7 @@ var ringId = GetRingId(line); if (!Settings[failureMechanismType].ContainsKey(ringId)) { - Settings[failureMechanismType].Add(ringId, GetDesignTablesSettings(line)); + Settings[failureMechanismType].Add(ringId, GetDesignTablesSetting(line)); } } @@ -105,7 +105,7 @@ return GetStringValueFromElement(line[columns[ringIdKey]]); } - private DesignTablesSetting GetDesignTablesSettings(IList line) + private DesignTablesSetting GetDesignTablesSetting(IList line) { return new DesignTablesSetting(GetIntValueFromElement(line[columns[minKey]]), GetIntValueFromElement(line[columns[maxKey]])); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs (.../HydraRingSettingsCsvReader.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/HydraRingSettingsCsvReader.cs (.../HydraRingSettingsCsvReader.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -1,6 +1,6 @@ // Copyright (C) Stichting Deltares 2016. All rights reserved. // -// This fileContents is part of Ringtoets. +// 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 @@ -40,7 +40,7 @@ /// /// Creates a new instance of . /// - /// The fileContents to read. + /// The file contents to read. /// The provided settings object to add the read settings to. /// Thrown when or is null. protected HydraRingSettingsCsvReader(string fileContents, TOutput settings) @@ -60,7 +60,7 @@ } /// - /// Reads the settings from the fileContents. + /// Reads the settings from the file contents. /// /// A with the settings. public TOutput ReadSettings() Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsCsvReader.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsCsvReader.cs (.../NumericsSettingsCsvReader.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/IO/NumericsSettingsCsvReader.cs (.../NumericsSettingsCsvReader.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -88,7 +88,7 @@ /// /// Creates a new instance of . /// - /// The fileContents to read. + /// The file contents to read. /// Thrown when is not set. public NumericsSettingsCsvReader(string fileContents) : base(fileContents, new Dictionary>>()) {} @@ -115,7 +115,7 @@ if (!Settings[failureMechanismType][subMechanism].ContainsKey(ringId)) { - Settings[failureMechanismType][subMechanism].Add(ringId, GetNumericSettings(line)); + Settings[failureMechanismType][subMechanism].Add(ringId, GetNumericsSetting(line)); } } @@ -134,7 +134,7 @@ return GetStringValueFromElement(line[columns[ringIdKey]]); } - private NumericsSetting GetNumericSettings(IList line) + private NumericsSetting GetNumericsSetting(IList line) { return new NumericsSetting(GetIntValueFromElement(line[columns[calculationMethodKey]]), GetIntValueFromElement(line[columns[formStartMethodKey]]), Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/DesignTablesSettingsProvider.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -51,7 +51,7 @@ /// The to obtain the for. /// The ring id to obtain the for. /// The corresponding to the provided failure mechanism type and ring id.The sub mechanism id to obtain the for. /// The ring id to obtain the for. /// The corresponding to the provided failure mechanism type, sub mechanism id and ring id. - public NumericsSetting GetNumericsSettings(HydraRingFailureMechanismType failureMechanismType, int subMechanismId, string ringId) + public NumericsSetting GetNumericsSetting(HydraRingFailureMechanismType failureMechanismType, int subMechanismId, string ringId) { var mechanismId = new FailureMechanismDefaultsProvider().GetFailureMechanismDefaults(failureMechanismType).MechanismId; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -252,7 +252,7 @@ foreach (var hydraRingCalculationInput in hydraRingCalculationInputs) { var failureMechanismDefaults = failureMechanismDefaultsProvider.GetFailureMechanismDefaults(hydraRingCalculationInput.FailureMechanismType); - var designTablesSettings = designTablesSettingsProvider.GetDesignTablesSettings(hydraRingCalculationInput.FailureMechanismType, ringId); + var designTablesSetting = designTablesSettingsProvider.GetDesignTablesSetting(hydraRingCalculationInput.FailureMechanismType, ringId); orderedDictionaries.Add(new OrderedDictionary { @@ -287,10 +287,10 @@ "TableStepSize", defaultHydraRingValue // Fixed: no support for type III computations (see "Method") }, { - "ValueMin", GetHydraRingValue(designTablesSettings.ValueMin) + "ValueMin", GetHydraRingValue(designTablesSetting.ValueMin) }, { - "ValueMax", GetHydraRingValue(designTablesSettings.ValueMax) + "ValueMax", GetHydraRingValue(designTablesSetting.ValueMax) }, { "Beta", GetHydraRingValue(hydraRingCalculationInput.Beta) @@ -311,7 +311,7 @@ foreach (var subMechanismId in failureMechanismDefaults.SubMechanismIds) { - var numericsSettings = numericsSettingsProvider.GetNumericsSettings(hydraRingCalculationInput.FailureMechanismType, subMechanismId, ringId); + var numericsSetting = numericsSettingsProvider.GetNumericsSetting(hydraRingCalculationInput.FailureMechanismType, subMechanismId, ringId); orderDictionaries.Add(new OrderedDictionary { @@ -331,49 +331,49 @@ "SubMechanismId", subMechanismId }, { - "Method", numericsSettings.CalculationTechniqueId + "Method", numericsSetting.CalculationTechniqueId }, { - "FormStartMethod", numericsSettings.FormStartMethod + "FormStartMethod", numericsSetting.FormStartMethod }, { - "FormNumberOfIterations", numericsSettings.FormNumberOfIterations + "FormNumberOfIterations", numericsSetting.FormNumberOfIterations }, { - "FormRelaxationFactor", GetHydraRingValue(numericsSettings.FormRelaxationFactor) + "FormRelaxationFactor", GetHydraRingValue(numericsSetting.FormRelaxationFactor) }, { - "FormEpsBeta", GetHydraRingValue(numericsSettings.FormEpsBeta) + "FormEpsBeta", GetHydraRingValue(numericsSetting.FormEpsBeta) }, { - "FormEpsHOH", GetHydraRingValue(numericsSettings.FormEpsHoh) + "FormEpsHOH", GetHydraRingValue(numericsSetting.FormEpsHoh) }, { - "FormEpsZFunc", GetHydraRingValue(numericsSettings.FormEpsZFunc) + "FormEpsZFunc", GetHydraRingValue(numericsSetting.FormEpsZFunc) }, { - "DsStartMethod", numericsSettings.DsStartMethod + "DsStartMethod", numericsSetting.DsStartMethod }, { "DsIterationmethod", 1 // Fixed: not relevant }, { - "DsMinNumberOfIterations", numericsSettings.DsMinNumberOfIterations + "DsMinNumberOfIterations", numericsSetting.DsMinNumberOfIterations }, { - "DsMaxNumberOfIterations", numericsSettings.DsMaxNumberOfIterations + "DsMaxNumberOfIterations", numericsSetting.DsMaxNumberOfIterations }, { - "DsVarCoefficient", GetHydraRingValue(numericsSettings.DsVarCoefficient) + "DsVarCoefficient", GetHydraRingValue(numericsSetting.DsVarCoefficient) }, { - "NiUMin", GetHydraRingValue(numericsSettings.NiUMin) + "NiUMin", GetHydraRingValue(numericsSetting.NiUMin) }, { - "NiUMax", GetHydraRingValue(numericsSettings.NiUMax) + "NiUMax", GetHydraRingValue(numericsSetting.NiUMax) }, { - "NiNumberSteps", numericsSettings.NiNumberSteps + "NiNumberSteps", numericsSetting.NiNumberSteps } }); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/NumericsSettingTest.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/NumericsSettingTest.cs (.../NumericsSettingTest.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Settings/NumericsSettingTest.cs (.../NumericsSettingTest.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -31,23 +31,23 @@ public void Constructor_ExpectedValues() { // Call - var numericsSettings = new NumericsSetting(1, 2, 3, 4.4, 5.5, 6.6, 7.7, 8, 9, 10, 11.11, 12.12, 13.13, 14); + var numericsSetting = new NumericsSetting(1, 2, 3, 4.4, 5.5, 6.6, 7.7, 8, 9, 10, 11.11, 12.12, 13.13, 14); // Assert - Assert.AreEqual(1, numericsSettings.CalculationTechniqueId); - Assert.AreEqual(2, numericsSettings.FormStartMethod); - Assert.AreEqual(3, numericsSettings.FormNumberOfIterations); - Assert.AreEqual(4.4, numericsSettings.FormRelaxationFactor); - Assert.AreEqual(5.5, numericsSettings.FormEpsBeta); - Assert.AreEqual(6.6, numericsSettings.FormEpsHoh); - Assert.AreEqual(7.7, numericsSettings.FormEpsZFunc); - Assert.AreEqual(8, numericsSettings.DsStartMethod); - Assert.AreEqual(9, numericsSettings.DsMinNumberOfIterations); - Assert.AreEqual(10, numericsSettings.DsMaxNumberOfIterations); - Assert.AreEqual(11.11, numericsSettings.DsVarCoefficient); - Assert.AreEqual(12.12, numericsSettings.NiUMin); - Assert.AreEqual(13.13, numericsSettings.NiUMax); - Assert.AreEqual(14, numericsSettings.NiNumberSteps); + Assert.AreEqual(1, numericsSetting.CalculationTechniqueId); + Assert.AreEqual(2, numericsSetting.FormStartMethod); + Assert.AreEqual(3, numericsSetting.FormNumberOfIterations); + Assert.AreEqual(4.4, numericsSetting.FormRelaxationFactor); + Assert.AreEqual(5.5, numericsSetting.FormEpsBeta); + Assert.AreEqual(6.6, numericsSetting.FormEpsHoh); + Assert.AreEqual(7.7, numericsSetting.FormEpsZFunc); + Assert.AreEqual(8, numericsSetting.DsStartMethod); + Assert.AreEqual(9, numericsSetting.DsMinNumberOfIterations); + Assert.AreEqual(10, numericsSetting.DsMaxNumberOfIterations); + Assert.AreEqual(11.11, numericsSetting.DsVarCoefficient); + Assert.AreEqual(12.12, numericsSetting.NiUMin); + Assert.AreEqual(13.13, numericsSetting.NiUMax); + Assert.AreEqual(14, numericsSetting.NiNumberSteps); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs (.../DesignTablesSettingsCsvReaderTest.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/DesignTablesSettingsCsvReaderTest.cs (.../DesignTablesSettingsCsvReaderTest.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -79,15 +79,15 @@ Assert.IsTrue(settings.ContainsKey(expectedMechanism.Key)); Assert.IsInstanceOf>(settings[expectedMechanism.Key]); - foreach (KeyValuePair expectedDesignTablesSettings in expectedMechanism.Value) + foreach (KeyValuePair expectedDesignTablesSetting in expectedMechanism.Value) { - Assert.IsTrue(settings[expectedMechanism.Key].ContainsKey(expectedDesignTablesSettings.Key)); - Assert.IsInstanceOf(settings[expectedMechanism.Key][expectedDesignTablesSettings.Key]); + Assert.IsTrue(settings[expectedMechanism.Key].ContainsKey(expectedDesignTablesSetting.Key)); + Assert.IsInstanceOf(settings[expectedMechanism.Key][expectedDesignTablesSetting.Key]); - DesignTablesSetting setting = settings[expectedMechanism.Key][expectedDesignTablesSettings.Key]; + DesignTablesSetting setting = settings[expectedMechanism.Key][expectedDesignTablesSetting.Key]; - Assert.AreEqual(expectedDesignTablesSettings.Value.ValueMin, setting.ValueMin); - Assert.AreEqual(expectedDesignTablesSettings.Value.ValueMax, setting.ValueMax); + Assert.AreEqual(expectedDesignTablesSetting.Value.ValueMin, setting.ValueMin); + Assert.AreEqual(expectedDesignTablesSetting.Value.ValueMax, setting.ValueMax); } } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraRingSettingsCsvReaderTest.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraRingSettingsCsvReaderTest.cs (.../HydraRingSettingsCsvReaderTest.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/HydraRingSettingsCsvReaderTest.cs (.../HydraRingSettingsCsvReaderTest.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -31,7 +31,7 @@ public class HydraRingSettingsCsvReaderTest { [Test] - public void Constructor_FileNull_ThrowsArgumentNullException() + public void Constructor_FileContentsNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new TestCsvReader(null, new object()); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/NumericsSettingsCsvReaderTest.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/NumericsSettingsCsvReaderTest.cs (.../NumericsSettingsCsvReaderTest.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/IO/NumericsSettingsCsvReaderTest.cs (.../NumericsSettingsCsvReaderTest.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -84,27 +84,27 @@ Assert.IsTrue(settings[expectedMechanism.Key].ContainsKey(expectedSubMechanism.Key)); Assert.IsInstanceOf>(settings[expectedMechanism.Key][expectedSubMechanism.Key]); - foreach (KeyValuePair expectedNumericsSettings in expectedSubMechanism.Value) + foreach (KeyValuePair expectedNumericsSetting in expectedSubMechanism.Value) { - Assert.IsTrue(settings[expectedMechanism.Key][expectedSubMechanism.Key].ContainsKey(expectedNumericsSettings.Key)); - Assert.IsInstanceOf(settings[expectedMechanism.Key][expectedSubMechanism.Key][expectedNumericsSettings.Key]); + Assert.IsTrue(settings[expectedMechanism.Key][expectedSubMechanism.Key].ContainsKey(expectedNumericsSetting.Key)); + Assert.IsInstanceOf(settings[expectedMechanism.Key][expectedSubMechanism.Key][expectedNumericsSetting.Key]); - NumericsSetting setting = settings[expectedMechanism.Key][expectedSubMechanism.Key][expectedNumericsSettings.Key]; + NumericsSetting setting = settings[expectedMechanism.Key][expectedSubMechanism.Key][expectedNumericsSetting.Key]; - Assert.AreEqual(expectedNumericsSettings.Value.CalculationTechniqueId, setting.CalculationTechniqueId); - Assert.AreEqual(expectedNumericsSettings.Value.FormStartMethod, setting.FormStartMethod); - Assert.AreEqual(expectedNumericsSettings.Value.FormNumberOfIterations, setting.FormNumberOfIterations); - Assert.AreEqual(expectedNumericsSettings.Value.FormRelaxationFactor, setting.FormRelaxationFactor); - Assert.AreEqual(expectedNumericsSettings.Value.FormEpsBeta, setting.FormEpsBeta); - Assert.AreEqual(expectedNumericsSettings.Value.FormEpsHoh, setting.FormEpsHoh); - Assert.AreEqual(expectedNumericsSettings.Value.FormEpsZFunc, setting.FormEpsZFunc); - Assert.AreEqual(expectedNumericsSettings.Value.DsStartMethod, setting.DsStartMethod); - Assert.AreEqual(expectedNumericsSettings.Value.DsMaxNumberOfIterations, setting.DsMaxNumberOfIterations); - Assert.AreEqual(expectedNumericsSettings.Value.DsMinNumberOfIterations, setting.DsMinNumberOfIterations); - Assert.AreEqual(expectedNumericsSettings.Value.DsVarCoefficient, setting.DsVarCoefficient); - Assert.AreEqual(expectedNumericsSettings.Value.NiNumberSteps, setting.NiNumberSteps); - Assert.AreEqual(expectedNumericsSettings.Value.NiUMax, setting.NiUMax); - Assert.AreEqual(expectedNumericsSettings.Value.NiUMin, setting.NiUMin); + Assert.AreEqual(expectedNumericsSetting.Value.CalculationTechniqueId, setting.CalculationTechniqueId); + Assert.AreEqual(expectedNumericsSetting.Value.FormStartMethod, setting.FormStartMethod); + Assert.AreEqual(expectedNumericsSetting.Value.FormNumberOfIterations, setting.FormNumberOfIterations); + Assert.AreEqual(expectedNumericsSetting.Value.FormRelaxationFactor, setting.FormRelaxationFactor); + Assert.AreEqual(expectedNumericsSetting.Value.FormEpsBeta, setting.FormEpsBeta); + Assert.AreEqual(expectedNumericsSetting.Value.FormEpsHoh, setting.FormEpsHoh); + Assert.AreEqual(expectedNumericsSetting.Value.FormEpsZFunc, setting.FormEpsZFunc); + Assert.AreEqual(expectedNumericsSetting.Value.DsStartMethod, setting.DsStartMethod); + Assert.AreEqual(expectedNumericsSetting.Value.DsMaxNumberOfIterations, setting.DsMaxNumberOfIterations); + Assert.AreEqual(expectedNumericsSetting.Value.DsMinNumberOfIterations, setting.DsMinNumberOfIterations); + Assert.AreEqual(expectedNumericsSetting.Value.DsVarCoefficient, setting.DsVarCoefficient); + Assert.AreEqual(expectedNumericsSetting.Value.NiNumberSteps, setting.NiNumberSteps); + Assert.AreEqual(expectedNumericsSetting.Value.NiUMax, setting.NiUMax); + Assert.AreEqual(expectedNumericsSetting.Value.NiUMin, setting.NiUMin); } } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/DesignTablesSettingsProviderTest.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -40,13 +40,13 @@ [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, "205", double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, "205", double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, "205", double.NaN, double.NaN)] - public void GetDesignTablesSettings_UnknownFailureMechanismTypeOrRingId_ReturnsDefaultDesignTablesSettings(HydraRingFailureMechanismType failureMechanismType, string ringId, double expectedValueMin, double expectedValueMax) + public void GetDesignTablesSetting_UnknownFailureMechanismTypeOrRingId_ReturnsDefaultDesignTablesSetting(HydraRingFailureMechanismType failureMechanismType, string ringId, double expectedValueMin, double expectedValueMax) { // Setup DesignTablesSettingsProvider designTablesSettingsProvider = new DesignTablesSettingsProvider(); // Call - DesignTablesSetting designTablesSetting = designTablesSettingsProvider.GetDesignTablesSettings(failureMechanismType, ringId); + DesignTablesSetting designTablesSetting = designTablesSettingsProvider.GetDesignTablesSetting(failureMechanismType, ringId); // Assert Assert.AreEqual(expectedValueMin, designTablesSetting.ValueMin); @@ -58,17 +58,17 @@ [TestCase(HydraRingFailureMechanismType.QVariant, "205", 5.0, 15.0)] [TestCase(HydraRingFailureMechanismType.AssessmentLevel, "11-1", 5.0, 15.0)] [TestCase(HydraRingFailureMechanismType.QVariant, "11-1", 5.0, 15.0)] - public void GetDesignTablesSettings_KnownRingIdAndFailureMechanismType_ReturnsExpectedDesignTablesSettings(HydraRingFailureMechanismType failureMechanismType, string ringId, double expectedValueMin, double expectedValueMax) + public void GetDesignTablesSetting_KnownRingIdAndFailureMechanismType_ReturnsExpectedDesignTablesSetting(HydraRingFailureMechanismType failureMechanismType, string ringId, double expectedValueMin, double expectedValueMax) { // Setup DesignTablesSettingsProvider designTablesSettingsProvider = new DesignTablesSettingsProvider(); // Call - DesignTablesSetting settings = designTablesSettingsProvider.GetDesignTablesSettings(failureMechanismType, ringId); + DesignTablesSetting designTablesSetting = designTablesSettingsProvider.GetDesignTablesSetting(failureMechanismType, ringId); // Assert - Assert.AreEqual(expectedValueMin, settings.ValueMin); - Assert.AreEqual(expectedValueMax, settings.ValueMax); + Assert.AreEqual(expectedValueMin, designTablesSetting.ValueMin); + Assert.AreEqual(expectedValueMax, designTablesSetting.ValueMax); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/NumericsSettingsProviderTest.cs =================================================================== diff -u -rc7843d3b8c846c4aab66ba32e67f883b6555932b -r9cb407703438fcb02cc78b839496d7b05d843875 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision c7843d3b8c846c4aab66ba32e67f883b6555932b) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/NumericsSettingsProviderTest.cs (.../NumericsSettingsProviderTest.cs) (revision 9cb407703438fcb02cc78b839496d7b05d843875) @@ -30,30 +30,30 @@ public class NumericsSettingsProviderTest { [Test] - public void GetNumericsSettings_KnownRingId_ReturnsExpectedNumericsSettings() + public void GetNumericsSetting_KnownRingId_ReturnsExpectedNumericsSetting() { // Setup NumericsSettingsProvider numericsSettingsProvider = new NumericsSettingsProvider(); - NumericsSetting expectedValues = GetExpectedNumericsSettings(); + NumericsSetting expectedValues = GetExpectedNumericsSetting(); // Call - NumericsSetting setting = numericsSettingsProvider.GetNumericsSettings(HydraRingFailureMechanismType.AssessmentLevel, 1, "205"); + NumericsSetting numericsSetting = numericsSettingsProvider.GetNumericsSetting(HydraRingFailureMechanismType.AssessmentLevel, 1, "205"); // Assert - Assert.AreEqual(expectedValues.CalculationTechniqueId, setting.CalculationTechniqueId); - Assert.AreEqual(expectedValues.FormStartMethod, setting.FormStartMethod); - Assert.AreEqual(expectedValues.FormNumberOfIterations, setting.FormNumberOfIterations); - Assert.AreEqual(expectedValues.FormRelaxationFactor, setting.FormRelaxationFactor); - Assert.AreEqual(expectedValues.FormEpsBeta, setting.FormEpsBeta); - Assert.AreEqual(expectedValues.FormEpsHoh, setting.FormEpsHoh); - Assert.AreEqual(expectedValues.FormEpsZFunc, setting.FormEpsZFunc); - Assert.AreEqual(expectedValues.DsStartMethod, setting.DsStartMethod); - Assert.AreEqual(expectedValues.DsMinNumberOfIterations, setting.DsMinNumberOfIterations); - Assert.AreEqual(expectedValues.DsMaxNumberOfIterations, setting.DsMaxNumberOfIterations); - Assert.AreEqual(expectedValues.DsVarCoefficient, setting.DsVarCoefficient); - Assert.AreEqual(expectedValues.NiNumberSteps, setting.NiNumberSteps); - Assert.AreEqual(expectedValues.NiUMax, setting.NiUMax); - Assert.AreEqual(expectedValues.NiUMin, setting.NiUMin); + Assert.AreEqual(expectedValues.CalculationTechniqueId, numericsSetting.CalculationTechniqueId); + Assert.AreEqual(expectedValues.FormStartMethod, numericsSetting.FormStartMethod); + Assert.AreEqual(expectedValues.FormNumberOfIterations, numericsSetting.FormNumberOfIterations); + Assert.AreEqual(expectedValues.FormRelaxationFactor, numericsSetting.FormRelaxationFactor); + Assert.AreEqual(expectedValues.FormEpsBeta, numericsSetting.FormEpsBeta); + Assert.AreEqual(expectedValues.FormEpsHoh, numericsSetting.FormEpsHoh); + Assert.AreEqual(expectedValues.FormEpsZFunc, numericsSetting.FormEpsZFunc); + Assert.AreEqual(expectedValues.DsStartMethod, numericsSetting.DsStartMethod); + Assert.AreEqual(expectedValues.DsMinNumberOfIterations, numericsSetting.DsMinNumberOfIterations); + Assert.AreEqual(expectedValues.DsMaxNumberOfIterations, numericsSetting.DsMaxNumberOfIterations); + Assert.AreEqual(expectedValues.DsVarCoefficient, numericsSetting.DsVarCoefficient); + Assert.AreEqual(expectedValues.NiNumberSteps, numericsSetting.NiNumberSteps); + Assert.AreEqual(expectedValues.NiUMax, numericsSetting.NiUMax); + Assert.AreEqual(expectedValues.NiUMin, numericsSetting.NiUMin); } [Test] @@ -88,13 +88,13 @@ [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 433, 1, 1)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 434, 1, 4)] [TestCase(HydraRingFailureMechanismType.StructuresStructuralFailure, 435, 1, 4)] - public void GetNumericsSettings_UnknownRingId_ReturnsExpectedDefaultNumericsSettings(HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId, int expectedFormStartMethod) + public void GetNumericsSetting_UnknownRingId_ReturnsExpectedDefaultNumericsSetting(HydraRingFailureMechanismType failureMechanismType, int subMechanismId, int expectedCalculationTechniqueId, int expectedFormStartMethod) { // Setup NumericsSettingsProvider numericsSettingsProvider = new NumericsSettingsProvider(); // Call - NumericsSetting numericsSetting = numericsSettingsProvider.GetNumericsSettings(failureMechanismType, subMechanismId, "unknown ringId"); + NumericsSetting numericsSetting = numericsSettingsProvider.GetNumericsSetting(failureMechanismType, subMechanismId, "unknown ringId"); // Assert Assert.AreEqual(expectedCalculationTechniqueId, numericsSetting.CalculationTechniqueId); @@ -113,7 +113,7 @@ Assert.AreEqual(25, numericsSetting.NiNumberSteps); } - private static NumericsSetting GetExpectedNumericsSettings() + private static NumericsSetting GetExpectedNumericsSetting() { return new NumericsSetting(1, 4, 50, 0.15, 0.01, 0.01, 0.01, 2, 20000, 100000, 0.1, -6, 6, 25); }