Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs =================================================================== diff -u -r0a6be471bf3a8954a107a2625f7cba502395cc8f -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 0a6be471bf3a8954a107a2625f7cba502395cc8f) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Service/ClosingStructuresCalculationService.cs (.../ClosingStructuresCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -102,7 +102,7 @@ hydraulicBoundaryDatabaseFilePath); string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); - calculator = HydraRingCalculatorFactory.Instance.CreateStructuresClosureCalculator(hlcdDirectory, assessmentSection.Id); + calculator = HydraRingCalculatorFactory.Instance.CreateStructuresClosureCalculator(hlcdDirectory); CalculationServiceHelper.LogCalculationBeginTime(calculationName); Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/ClosingStructuresCalculationServiceTest.cs (.../ClosingStructuresCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -629,7 +629,6 @@ StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId); GeneralClosingStructuresInput generalInput = closingStructuresFailureMechanism.GeneralInput; ClosingStructuresInput input = calculation.InputParameters; @@ -708,7 +707,6 @@ StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId); GeneralClosingStructuresInput generalInput = closingStructuresFailureMechanism.GeneralInput; ClosingStructuresInput input = calculation.InputParameters; @@ -786,7 +784,6 @@ StructuresClosureCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId); GeneralClosingStructuresInput generalInput = closingStructuresFailureMechanism.GeneralInput; ClosingStructuresInput input = calculation.InputParameters; Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -r868ce235350ca4bdfecd80eb8469485dc3a1b50d -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 868ce235350ca4bdfecd80eb8469485dc3a1b50d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -59,7 +59,6 @@ public bool CalculateDesignWaterLevels(string hydraulicBoundaryDatabaseFilePath, IEnumerable locations, - string ringId, double norm, ICalculationMessageProvider messageProvider) { @@ -76,14 +75,12 @@ return RunActivities(hydraulicBoundaryDatabaseFilePath, locations.Select(location => new DesignWaterLevelCalculationActivity(location, hydraulicBoundaryDatabaseFilePath, - ringId, norm, messageProvider)).ToArray()); } public bool CalculateWaveHeights(string hydraulicBoundaryDatabaseFilePath, IEnumerable locations, - string ringId, double norm, ICalculationMessageProvider messageProvider) { @@ -100,7 +97,6 @@ return RunActivities(hydraulicBoundaryDatabaseFilePath, locations.Select(location => new WaveHeightCalculationActivity(location, hydraulicBoundaryDatabaseFilePath, - ringId, norm, messageProvider)).ToArray()); } Index: Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -r868ce235350ca4bdfecd80eb8469485dc3a1b50d -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs (.../IHydraulicBoundaryLocationCalculationGuiService.cs) (revision 868ce235350ca4bdfecd80eb8469485dc3a1b50d) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/GuiServices/IHydraulicBoundaryLocationCalculationGuiService.cs (.../IHydraulicBoundaryLocationCalculationGuiService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -38,15 +38,13 @@ /// The HLCD file that should be used for performing the calculation. /// The objects to calculate /// the for. - /// The id of the ring to perform the calculation for. /// The norm to use during the calculation. /// The message provider for the services. /// True if the observers should be notified; false if otherwise /// Thrown when /// or is null. bool CalculateDesignWaterLevels(string hydraulicBoundaryDatabaseFilePath, IEnumerable locations, - string ringId, double norm, ICalculationMessageProvider messageProvider); @@ -56,15 +54,13 @@ /// The HLCD file that should be used for performing the calculation. /// The objects to calculate /// the for. - /// The id of the ring to perform the calculation for. /// The norm to use during the calculation. /// The message provider for the services. /// True if the observers should be notified; false if otherwise /// Thrown when /// or is null. bool CalculateWaveHeights(string hydraulicBoundaryDatabaseFilePath, IEnumerable locations, - string ringId, double norm, ICalculationMessageProvider messageProvider); } Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationActivity.cs (.../DesignWaterLevelCalculationActivity.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -35,7 +35,6 @@ private readonly HydraulicBoundaryLocation hydraulicBoundaryLocation; private readonly double norm; private readonly string hydraulicBoundaryDatabaseFilePath; - private readonly string ringId; private readonly ICalculationMessageProvider messageProvider; private readonly DesignWaterLevelCalculationService calculationService; @@ -44,14 +43,12 @@ /// /// The to perform the calculation for. /// The HLCD file that should be used for performing the calculation. - /// The id of the ring to perform the calculation for. /// The norm to use during the calculation. /// The provider of the messages to use during the calculation. /// Thrown when or /// is null. public DesignWaterLevelCalculationActivity(HydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath, - string ringId, double norm, ICalculationMessageProvider messageProvider) { @@ -68,7 +65,6 @@ this.hydraulicBoundaryLocation = hydraulicBoundaryLocation; this.messageProvider = messageProvider; this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; - this.ringId = ringId; this.norm = norm; calculationService = new DesignWaterLevelCalculationService(); @@ -97,7 +93,6 @@ calculationService.Calculate( hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath, - ringId, norm, messageProvider); } Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r5fcfd3d73f28585c211086ad413fc5d177ecd6b2 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 5fcfd3d73f28585c211086ad413fc5d177ecd6b2) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -75,7 +75,6 @@ /// /// The hydraulic boundary location used in the calculation. /// The path which points to the hydraulic boundary database file. - /// The id of the assessment section. /// The norm of the assessment section. /// The object which is used to build log messages. /// Thrown when @@ -95,7 +94,6 @@ /// Thrown when an error occurs while performing the calculation. public void Calculate(HydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath, - string ringId, double norm, ICalculationMessageProvider messageProvider) { @@ -108,7 +106,7 @@ CalculationServiceHelper.LogCalculationBeginTime(calculationName); - calculator = HydraRingCalculatorFactory.Instance.CreateDesignWaterLevelCalculator(hlcdDirectory, ringId); + calculator = HydraRingCalculatorFactory.Instance.CreateDesignWaterLevelCalculator(hlcdDirectory); var exceptionThrown = false; Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs =================================================================== diff -u -rb2b9fdf365e70928a05c57966eeed30d9050e528 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision b2b9fdf365e70928a05c57966eeed30d9050e528) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -35,7 +35,6 @@ private readonly HydraulicBoundaryLocation hydraulicBoundaryLocation; private readonly double norm; private readonly string hydraulicBoundaryDatabaseFilePath; - private readonly string ringId; private readonly ICalculationMessageProvider messageProvider; private readonly WaveHeightCalculationService calculationService; @@ -44,14 +43,12 @@ /// /// The to perform the calculation for. /// The HLCD file that should be used for performing the calculation. - /// The id of the ring to perform the calculation for. /// The norm to use during the calculation. /// The provider of the messages to use during the calculation. /// Thrown when /// or is null. public WaveHeightCalculationActivity(HydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath, - string ringId, double norm, ICalculationMessageProvider messageProvider) { @@ -69,7 +66,6 @@ this.messageProvider = messageProvider; this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; - this.ringId = ringId; this.norm = norm; Name = messageProvider.GetActivityName(hydraulicBoundaryLocation.Name); @@ -97,7 +93,6 @@ calculationService.Calculate( hydraulicBoundaryLocation, hydraulicBoundaryDatabaseFilePath, - ringId, norm, messageProvider); } Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r5fcfd3d73f28585c211086ad413fc5d177ecd6b2 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 5fcfd3d73f28585c211086ad413fc5d177ecd6b2) +++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -76,7 +76,6 @@ /// /// The hydraulic boundary location used in the calculation. /// The path which points to the hydraulic boundary database file. - /// The id of the assessment section. /// The norm of the assessment section. /// The object which is used to build log messages. /// Thrown when is null. @@ -95,7 +94,6 @@ /// Thrown when an error occurs while performing the calculation. public void Calculate(HydraulicBoundaryLocation hydraulicBoundaryLocation, string hydraulicBoundaryDatabaseFilePath, - string ringId, double norm, ICalculationMessageProvider messageProvider) { @@ -109,7 +107,7 @@ CalculationServiceHelper.LogCalculationBeginTime(calculationName); - calculator = HydraRingCalculatorFactory.Instance.CreateWaveHeightCalculator(hlcdDirectory, ringId); + calculator = HydraRingCalculatorFactory.Instance.CreateWaveHeightCalculator(hlcdDirectory); var exceptionThrown = false; Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -rc9bd6bb2616d76ccae091516fbd2f5b575aafdfa -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision c9bd6bb2616d76ccae091516fbd2f5b575aafdfa) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -83,7 +83,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - TestDelegate test = () => guiService.CalculateDesignWaterLevels(null, Enumerable.Empty(), "", 1, null); + TestDelegate test = () => guiService.CalculateDesignWaterLevels(null, Enumerable.Empty(), 1, null); // Assert string paramName = Assert.Throws(test).ParamName; @@ -106,7 +106,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - TestDelegate test = () => guiService.CalculateDesignWaterLevels(databasePath, null, "", 1, calculationMessageProviderMock); + TestDelegate test = () => guiService.CalculateDesignWaterLevels(databasePath, null, 1, calculationMessageProviderMock); // Assert string paramName = Assert.Throws(test).ParamName; @@ -130,7 +130,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - Action call = () => guiService.CalculateDesignWaterLevels(databasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + Action call = () => guiService.CalculateDesignWaterLevels(databasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert TestHelper.AssertLogMessages(call, messages => @@ -157,7 +157,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - bool successfulCalculation = guiService.CalculateDesignWaterLevels(databasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + bool successfulCalculation = guiService.CalculateDesignWaterLevels(databasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert Assert.IsFalse(successfulCalculation); @@ -184,7 +184,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - Action call = () => guiService.CalculateDesignWaterLevels(validDatabasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + Action call = () => guiService.CalculateDesignWaterLevels(validDatabasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert TestHelper.AssertLogMessagesCount(call, 0); @@ -212,7 +212,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - bool successfulCalculation = guiService.CalculateDesignWaterLevels(validDatabasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + bool successfulCalculation = guiService.CalculateDesignWaterLevels(validDatabasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert Assert.IsTrue(successfulCalculation); @@ -251,7 +251,7 @@ { new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3) }, - "", 1, calculationMessageProviderMock); + 1, calculationMessageProviderMock); // Assert TestHelper.AssertLogMessages(call, messages => @@ -300,7 +300,7 @@ { new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3) }, - "", 1, calculationMessageProviderMock); + 1, calculationMessageProviderMock); // Assert Assert.IsTrue(successfulCalculation); @@ -318,7 +318,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - TestDelegate test = () => guiService.CalculateWaveHeights(null, Enumerable.Empty(), "", 1, null); + TestDelegate test = () => guiService.CalculateWaveHeights(null, Enumerable.Empty(), 1, null); // Assert string paramName = Assert.Throws(test).ParamName; @@ -341,7 +341,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - TestDelegate test = () => guiService.CalculateWaveHeights(databasePath, null, "", 1, calculationMessageProviderMock); + TestDelegate test = () => guiService.CalculateWaveHeights(databasePath, null, 1, calculationMessageProviderMock); // Assert string paramName = Assert.Throws(test).ParamName; @@ -365,7 +365,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - Action call = () => guiService.CalculateWaveHeights(databasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + Action call = () => guiService.CalculateWaveHeights(databasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert TestHelper.AssertLogMessages(call, messages => @@ -392,7 +392,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - bool successfulCalculation = guiService.CalculateWaveHeights(databasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + bool successfulCalculation = guiService.CalculateWaveHeights(databasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert Assert.IsFalse(successfulCalculation); @@ -420,7 +420,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - Action call = () => guiService.CalculateWaveHeights(validDatabasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + Action call = () => guiService.CalculateWaveHeights(validDatabasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert TestHelper.AssertLogMessagesCount(call, 0); @@ -448,7 +448,7 @@ var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); // Call - bool succesfulCalculation = guiService.CalculateWaveHeights(validDatabasePath, Enumerable.Empty(), "", 1, calculationMessageProviderMock); + bool succesfulCalculation = guiService.CalculateWaveHeights(validDatabasePath, Enumerable.Empty(), 1, calculationMessageProviderMock); // Assert Assert.IsTrue(succesfulCalculation); @@ -483,11 +483,11 @@ // Call Action call = () => guiService.CalculateWaveHeights(validDatabasePath, - new List() + new List { new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3) }, - "", 1, calculationMessageProviderMock); + 1, calculationMessageProviderMock); // Assert TestHelper.AssertLogMessages(call, messages => @@ -536,7 +536,7 @@ { new HydraulicBoundaryLocation(1, hydraulicLocationName, 2, 3) }, - "", 1, calculationMessageProviderMock); + 1, calculationMessageProviderMock); // Assert Assert.IsTrue(successfulCalculation); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -r1d540d2625cac50321e2400129af64df6cd21310 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 1d540d2625cac50321e2400129af64df6cd21310) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -67,7 +67,6 @@ // Call var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, 1, calculationMessageProviderMock); @@ -90,7 +89,6 @@ // Call TestDelegate call = () => new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, 1, null); @@ -111,7 +109,6 @@ // Call TestDelegate call = () => new DesignWaterLevelCalculationActivity(null, validFilePath, - string.Empty, 1, calculationMessageProviderStub); @@ -139,7 +136,6 @@ var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, inValidFilePath, - string.Empty, 1, calculationMessageProviderMock); @@ -167,7 +163,6 @@ const string locationName = "punt_flw_"; const string activityName = "GetActivityName"; const string calculationName = "locationName"; - const string ringId = "11-1"; const double norm = 1.0/30; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0); @@ -179,7 +174,6 @@ var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - ringId, norm, calculationMessageProviderMock); @@ -207,7 +201,6 @@ Assert.AreEqual(hydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId); Assert.AreEqual(testDataPath, testDesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testDesignWaterLevelCalculator.RingId); Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), designWaterLevelCalculationInput.Beta); } Assert.AreEqual(ActivityState.Executed, activity.State); @@ -237,7 +230,6 @@ var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); @@ -269,7 +261,6 @@ var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); @@ -312,7 +303,6 @@ string validFilePath = Path.Combine(testDataPath, validFile); var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, 30, calculationMessageProviderMock); @@ -358,7 +348,6 @@ const double norm = 1.0/300; var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); @@ -410,7 +399,6 @@ const double norm = 1.0/30; var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r6a8d4edb0f3b2d00d3958c48146c51487bd01247 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 6a8d4edb0f3b2d00d3958c48146c51487bd01247) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -136,7 +136,7 @@ mockRepository.ReplayAll(); // Call - TestDelegate test = () => new DesignWaterLevelCalculationService().Calculate(null, string.Empty, string.Empty, 1, calculationMessageProviderStub); + TestDelegate test = () => new DesignWaterLevelCalculationService().Calculate(null, string.Empty, 1, calculationMessageProviderStub); // Assert var exception = Assert.Throws(test); @@ -152,7 +152,6 @@ const string locationName = "punt_flw_ 1"; const string calculationName = "locationName"; const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; - const string ringId = "ringId"; const double norm = 1.0/30; var mockRepository = new MockRepository(); @@ -170,13 +169,11 @@ // Call new DesignWaterLevelCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - ringId, norm, calculationMessageProviderStub); // Assert Assert.AreEqual(testDataPath, testCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testCalculator.RingId); var expectedInput = CreateInput(hydraulicBoundaryLocation, norm); AssertInput(expectedInput, testCalculator.ReceivedInputs.First()); @@ -209,7 +206,6 @@ // Call service.Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderStub); @@ -253,7 +249,6 @@ { new DesignWaterLevelCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderMock); } @@ -312,7 +307,6 @@ { new DesignWaterLevelCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderMock); } @@ -373,7 +367,6 @@ { new DesignWaterLevelCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderMock); } Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -re1d4d3fe987bfa6504703952ea0dbd8a18f5a698 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision e1d4d3fe987bfa6504703952ea0dbd8a18f5a698) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -64,7 +64,7 @@ string validFilePath = Path.Combine(testDataPath, validFile); // Call - var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, string.Empty, 1, calculationMessageProviderMock); + var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, 1, calculationMessageProviderMock); // Assert Assert.IsInstanceOf(activity); @@ -83,7 +83,7 @@ string validFilePath = Path.Combine(testDataPath, validFile); // Call - TestDelegate call = () => new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, string.Empty, 1, null); + TestDelegate call = () => new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, 1, null); // Assert var exception = Assert.Throws(call); @@ -100,7 +100,7 @@ string validFilePath = Path.Combine(testDataPath, validFile); // Call - TestDelegate call = () => new WaveHeightCalculationActivity(null, validFilePath, string.Empty, 1, calculationMessageProviderMock); + TestDelegate call = () => new WaveHeightCalculationActivity(null, validFilePath, 1, calculationMessageProviderMock); // Assert var exception = Assert.Throws(call); @@ -124,7 +124,7 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, locationName, 0, 0); - var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, inValidFilePath, string.Empty, 1, calculationMessageProviderMock); + var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, inValidFilePath, 1, calculationMessageProviderMock); // Call Action call = () => activity.Run(); @@ -149,7 +149,6 @@ const string locationName = "locationName"; const string activityName = "GetActivityName"; const string calculationName = "locationName"; - const string ringId = "11-1"; const double norm = 1.0/30; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, locationName, 0, 0); @@ -161,7 +160,6 @@ var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, - ringId, norm, calculationMessageProviderMock); using (new HydraRingCalculatorFactoryConfig()) @@ -187,7 +185,6 @@ Assert.AreEqual(hydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId); Assert.AreEqual(testDataPath, testWaveHeightCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testWaveHeightCalculator.RingId); Assert.AreEqual(StatisticsConverter.ProbabilityToReliability(norm), waveHeightCalculationInput.Beta); } Assert.AreEqual(ActivityState.Executed, activity.State); @@ -217,7 +214,6 @@ var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); @@ -250,7 +246,6 @@ var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); @@ -294,7 +289,6 @@ var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, 30, calculationMessageProviderMock); @@ -340,7 +334,6 @@ const double norm = 1.0/300; var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); using (new HydraRingCalculatorFactoryConfig()) @@ -392,7 +385,6 @@ const double norm = 1.0/30; var activity = new WaveHeightCalculationActivity(hydraulicBoundaryLocation, validFilePath, - string.Empty, norm, calculationMessageProviderMock); Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r6a8d4edb0f3b2d00d3958c48146c51487bd01247 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 6a8d4edb0f3b2d00d3958c48146c51487bd01247) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -136,7 +136,7 @@ mockRepository.ReplayAll(); // Call - TestDelegate test = () => new WaveHeightCalculationService().Calculate(null, string.Empty, string.Empty, 1, calculationMessageProviderStub); + TestDelegate test = () => new WaveHeightCalculationService().Calculate(null, string.Empty, 1, calculationMessageProviderStub); // Assert var exception = Assert.Throws(test); @@ -152,7 +152,6 @@ const string locationName = "punt_flw_ 1"; const string calculationName = "locationName"; const string calculationNotConvergedMessage = "calculationNotConvergedMessage"; - const string ringId = "ringId"; const double norm = 1.0/30; var mockRepository = new MockRepository(); @@ -169,13 +168,11 @@ new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - ringId, norm, calculationMessageProviderMock); // Assert Assert.AreEqual(testDataPath, testCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testCalculator.RingId); var expectedInput = CreateInput(hydraulicBoundaryLocation, norm); AssertInput(expectedInput, testCalculator.ReceivedInputs.First()); @@ -207,7 +204,6 @@ // Call service.Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderStub); @@ -251,7 +247,6 @@ { new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderMock); } @@ -310,7 +305,6 @@ { new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderMock); } @@ -371,7 +365,6 @@ { new WaveHeightCalculationService().Calculate(hydraulicBoundaryLocation, validFilePath, - "ringId", norm, calculationMessageProviderMock); } Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs =================================================================== diff -u -r868ce235350ca4bdfecd80eb8469485dc3a1b50d -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 868ce235350ca4bdfecd80eb8469485dc3a1b50d) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -57,13 +57,11 @@ /// The /// that holds information about the contribution and the general inputs used in the calculation. /// The HLCD file that should be used for performing the calculation. - /// The id of the ring to perform the calculation for. /// The norm to use during the calculation. /// Thrown when any parameter is null. public void Calculate(IEnumerable locations, DuneErosionFailureMechanism failureMechanism, string hydraulicBoundaryDatabaseFilePath, - string ringId, double norm) { if (locations == null) @@ -79,7 +77,6 @@ .Select(l => new DuneErosionBoundaryCalculationActivity(l, failureMechanism, hydraulicBoundaryDatabaseFilePath, - ringId, norm)).ToArray()); } } Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationsView.cs =================================================================== diff -u -r24017e200f9b045329f298c7f1dfc60b020dce15 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationsView.cs (.../DuneLocationsView.cs) (revision 24017e200f9b045329f298c7f1dfc60b020dce15) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/Views/DuneLocationsView.cs (.../DuneLocationsView.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -178,7 +178,6 @@ CalculationGuiService.Calculate(locationsToCalculate, FailureMechanism, AssessmentSection.HydraulicBoundaryDatabase.FilePath, - AssessmentSection.Id, FailureMechanism.GetMechanismSpecificNorm(AssessmentSection.FailureMechanismContribution.Norm)); ((IObservable) Data).NotifyObservers(); Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -269,7 +269,6 @@ duneLocationCalculationGuiService.Calculate(context.WrappedData, context.FailureMechanism, context.AssessmentSection.HydraulicBoundaryDatabase.FilePath, - context.AssessmentSection.Id, context.FailureMechanism.GetMechanismSpecificNorm(context.AssessmentSection.FailureMechanismContribution.Norm)); context.NotifyObservers(); }); Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs =================================================================== diff -u -r4d7de1f1614ff778fca061558d2912ff752570fc -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs (.../DuneErosionBoundaryCalculationActivity.cs) (revision 4d7de1f1614ff778fca061558d2912ff752570fc) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationActivity.cs (.../DuneErosionBoundaryCalculationActivity.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -34,7 +34,6 @@ private readonly DuneLocation duneLocation; private readonly DuneErosionFailureMechanism failureMechanism; private readonly string hydraulicBoundaryDatabaseFilePath; - private readonly string ringId; private readonly double norm; private readonly DuneErosionBoundaryCalculationService calculationService; @@ -45,13 +44,11 @@ /// The that holds information about the contribution and /// the general inputs used in the calculation. /// The HLCD file that should be used for performing the calculation. - /// The id of the ring to perform the calculation for. /// The norm to use during the calculation. /// Thrown when any parameter is null. public DuneErosionBoundaryCalculationActivity(DuneLocation duneLocation, DuneErosionFailureMechanism failureMechanism, string hydraulicBoundaryDatabaseFilePath, - string ringId, double norm) { if (duneLocation == null) @@ -66,7 +63,6 @@ this.duneLocation = duneLocation; this.failureMechanism = failureMechanism; this.hydraulicBoundaryDatabaseFilePath = hydraulicBoundaryDatabaseFilePath; - this.ringId = ringId; this.norm = norm; calculationService = new DuneErosionBoundaryCalculationService(); @@ -84,7 +80,6 @@ calculationService.Calculate(duneLocation, failureMechanism, - ringId, norm, hydraulicBoundaryDatabaseFilePath); } Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs =================================================================== diff -u -ra6446f4410e56fb44c754aa1ce1d204d43c301f0 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision a6446f4410e56fb44c754aa1ce1d204d43c301f0) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneErosionBoundaryCalculationService.cs (.../DuneErosionBoundaryCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -53,7 +53,6 @@ /// The that holds information required to perform the calculation. /// The that holds information about the contribution and /// the general inputs used in the calculation. - /// The id of the assessment section. /// The norm of the assessment section. /// The path which points to the hydraulic boundary database file. /// Thrown when or @@ -74,7 +73,6 @@ /// Thrown when an error occurs while performing the calculation. public void Calculate(DuneLocation duneLocation, DuneErosionFailureMechanism failureMechanism, - string ringId, double norm, string hydraulicBoundaryDatabaseFilePath) { @@ -88,7 +86,7 @@ } string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); - calculator = HydraRingCalculatorFactory.Instance.CreateDunesBoundaryConditionsCalculator(hlcdDirectory, ringId); + calculator = HydraRingCalculatorFactory.Instance.CreateDunesBoundaryConditionsCalculator(hlcdDirectory); string calculationName = duneLocation.Name; Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r868ce235350ca4bdfecd80eb8469485dc3a1b50d -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 868ce235350ca4bdfecd80eb8469485dc3a1b50d) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -62,7 +62,6 @@ TestDelegate test = () => guiService.Calculate(null, failureMechanism, "path", - "id", 1.0 / 30000); // Assert @@ -83,7 +82,6 @@ TestDelegate test = () => guiService.Calculate(Enumerable.Empty(), null, "path", - "id", 1.0 / 30000); // Assert @@ -129,7 +127,6 @@ TestHelper.AssertLogMessages(() => guiService.Calculate(failureMechanism.DuneLocations, failureMechanism, validFilePath, - "13-1", 1.0 / 200), messages => { Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs =================================================================== diff -u -ra6446f4410e56fb44c754aa1ce1d204d43c301f0 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision a6446f4410e56fb44c754aa1ce1d204d43c301f0) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Integration.Test/DuneErosionBoundaryCalculationActivityIntegrationTest.cs (.../DuneErosionBoundaryCalculationActivityIntegrationTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -58,7 +58,6 @@ var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, validFilePath, - "13-1", 1.0 / 30000); using (new HydraRingCalculatorFactoryConfig()) @@ -98,7 +97,6 @@ var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, validFilePath, - "13-1", 1.0 / 30000); using (new HydraRingCalculatorFactoryConfig()) @@ -132,7 +130,6 @@ var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, validFilePath, - "13-1", 1.0 / 30000); using (new HydraRingCalculatorFactoryConfig()) Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs =================================================================== diff -u -r4d7de1f1614ff778fca061558d2912ff752570fc -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs (.../DuneErosionBoundaryCalculationActivityTest.cs) (revision 4d7de1f1614ff778fca061558d2912ff752570fc) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationActivityTest.cs (.../DuneErosionBoundaryCalculationActivityTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -42,7 +42,6 @@ var activity = new DuneErosionBoundaryCalculationActivity(duneLocation, failureMechanism, "path", - "id", 1.0 / 30000); // Assert @@ -62,7 +61,6 @@ TestDelegate test = () => new DuneErosionBoundaryCalculationActivity(null, failureMechanism, "path", - "id", 1.0 / 30000); // Assert @@ -80,7 +78,6 @@ TestDelegate test = () => new DuneErosionBoundaryCalculationActivity(duneLocation, null, "path", - "id", 1.0 / 30000); // Assert Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs =================================================================== diff -u -r2dd4e7b2186f20dacfadad09722baa2a955819f2 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 2dd4e7b2186f20dacfadad09722baa2a955819f2) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneErosionBoundaryCalculationServiceTest.cs (.../DuneErosionBoundaryCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -48,7 +48,6 @@ // Call TestDelegate test = () => new DuneErosionBoundaryCalculationService().Calculate(null, new DuneErosionFailureMechanism(), - "1", 1, validFilePath); @@ -63,7 +62,6 @@ // Call TestDelegate test = () => new DuneErosionBoundaryCalculationService().Calculate(new TestDuneLocation(), null, - "1", 1, validFilePath); @@ -82,8 +80,6 @@ }; var mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(1.0/200); - const string ringId = "1"; - var duneLocation = new DuneLocation(1300001, "test", new Point2D(0, 0), new DuneLocation.ConstructionProperties { CoastalAreaId = 0, @@ -100,13 +96,11 @@ // Call new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - "1", mechanismSpecificNorm, validFilePath); // Assert Assert.AreEqual(testDataPath, testCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testCalculator.RingId); DunesBoundaryConditionsCalculationInput expectedInput = CreateInput(duneLocation, mechanismSpecificNorm); AssertInput(expectedInput, testCalculator.ReceivedInputs.First()); @@ -147,7 +141,6 @@ // Call Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - "1", mechanismSpecificNorm, validFilePath); @@ -200,7 +193,6 @@ // Call Action test = () => new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - "1", failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); @@ -245,7 +237,6 @@ // Call service.Calculate(duneLocation, failureMechanism, - "1", failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); @@ -287,7 +278,6 @@ { new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - "1", failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); } @@ -344,7 +334,6 @@ { new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - "1", failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); } @@ -403,7 +392,6 @@ { new DuneErosionBoundaryCalculationService().Calculate(duneLocation, failureMechanism, - "1", failureMechanism.GetMechanismSpecificNorm(1.0/200), validFilePath); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r787c7ef33e68750b3e1e7208f320e5b04fbf9024 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 787c7ef33e68750b3e1e7208f320e5b04fbf9024) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -157,7 +157,7 @@ CalculationServiceHelper.LogCalculationBeginTime(calculationName); - overtoppingCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingCalculator(hlcdDirectory, assessmentSection.Id); + overtoppingCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingCalculator(hlcdDirectory); var overtoppingCalculationInput = CreateOvertoppingInput(calculation, generalInput, hydraulicBoundaryDatabaseFilePath); DikeHeightAssessmentOutput dikeHeight = null; @@ -174,7 +174,7 @@ { NotifyProgress(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Executing_dikeheight_calculation, 2, totalSteps); - dikeHeightCalculator = HydraRingCalculatorFactory.Instance.CreateDikeHeightCalculator(hlcdDirectory, assessmentSection.Id); + dikeHeightCalculator = HydraRingCalculatorFactory.Instance.CreateDikeHeightCalculator(hlcdDirectory); var norm = GetProbabilityToUse(assessmentSection.FailureMechanismContribution.Norm, generalInput, failureMechanismContribution, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r787c7ef33e68750b3e1e7208f320e5b04fbf9024 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 787c7ef33e68750b3e1e7208f320e5b04fbf9024) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -957,7 +957,6 @@ HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); Assert.AreEqual(testDataPath, testOvertoppingCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSection.Id, testOvertoppingCalculator.RingId); } } @@ -1034,7 +1033,6 @@ HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); Assert.AreEqual(testDataPath, dikeHeightCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSection.Id, dikeHeightCalculator.RingId); } } Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs =================================================================== diff -u -r95c3452dca388375373dc915a0fd68acef51833b -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 95c3452dca388375373dc915a0fd68acef51833b) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsView.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -131,7 +131,6 @@ bool successfulCalculation = CalculationGuiService.CalculateDesignWaterLevels(AssessmentSection.HydraulicBoundaryDatabase.FilePath, locations, - AssessmentSection.Id, mechanismSpecificNorm, new GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider()); if (successfulCalculation) Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs =================================================================== diff -u -r1b9d535d0b4f21bd0adb64184e5273d8bf691c4e -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 1b9d535d0b4f21bd0adb64184e5273d8bf691c4e) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Views/GrassCoverErosionOutwardsWaveHeightLocationsView.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsView.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -123,7 +123,6 @@ bool successFullCalculation = CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath, locations, - AssessmentSection.Id, mechanismSpecificNorm, new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider()); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -509,7 +509,6 @@ bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels( assessmentSection.HydraulicBoundaryDatabase.FilePath, nodeData.WrappedData, - assessmentSection.Id, mechanismSpecificNorm, new GrassCoverErosionOutwardsDesignWaterLevelCalculationMessageProvider()); @@ -566,7 +565,6 @@ bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights( assessmentSection.HydraulicBoundaryDatabase.FilePath, nodeData.WrappedData, - assessmentSection.Id, mechanismSpecificNorm, new GrassCoverErosionOutwardsWaveHeightCalculationMessageProvider()); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs =================================================================== diff -u -r66f8f4622c8742bfb8fc0501cf44c3c58fd35522 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 66f8f4622c8742bfb8fc0501cf44c3c58fd35522) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -114,13 +114,12 @@ var a = failureMechanism.GeneralInput.GeneralWaveConditionsInput.A; var b = failureMechanism.GeneralInput.GeneralWaveConditionsInput.B; var c = failureMechanism.GeneralInput.GeneralWaveConditionsInput.C; - var ringId = assessmentSection.Id; var mechanismSpecificNorm = failureMechanism.GetMechanismSpecificNorm(assessmentSection); TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count(); try { - var outputs = CalculateWaveConditions(calculationName, calculation.InputParameters, a, b, c, mechanismSpecificNorm, ringId, hlcdFilePath); + var outputs = CalculateWaveConditions(calculationName, calculation.InputParameters, a, b, c, mechanismSpecificNorm, hlcdFilePath); if (!Canceled) { Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r624268bcc5f60b5965bb056ca72cea15daff06f3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 624268bcc5f60b5965bb056ca72cea15daff06f3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -318,11 +318,11 @@ ICalculationMessageProvider messageProvider = null; HydraulicBoundaryLocation[] calculatedLocations = null; - guiServiceMock.Expect(ch => ch.CalculateDesignWaterLevels(null, null, null, 1, null)).IgnoreArguments().WhenCalled( + guiServiceMock.Expect(ch => ch.CalculateDesignWaterLevels(null, null, 1, null)).IgnoreArguments().WhenCalled( invocation => { calculatedLocations = ((IEnumerable) invocation.Arguments[1]).ToArray(); - messageProvider = (ICalculationMessageProvider) invocation.Arguments[4]; + messageProvider = (ICalculationMessageProvider) invocation.Arguments[3]; }).Return(isSuccessful); IAssessmentSection assessmentSectionStub = mockRepository.Stub(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs =================================================================== diff -u -r624268bcc5f60b5965bb056ca72cea15daff06f3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 624268bcc5f60b5965bb056ca72cea15daff06f3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsViewTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -313,11 +313,11 @@ ICalculationMessageProvider messageProvider = null; HydraulicBoundaryLocation[] calculatedLocations = null; - guiServiceMock.Expect(ch => ch.CalculateWaveHeights(null, null, null, 1, null)).IgnoreArguments().WhenCalled( + guiServiceMock.Expect(ch => ch.CalculateWaveHeights(null, null, 1, null)).IgnoreArguments().WhenCalled( invocation => { calculatedLocations = ((IEnumerable) invocation.Arguments[1]).ToArray(); - messageProvider = (ICalculationMessageProvider) invocation.Arguments[4]; + messageProvider = (ICalculationMessageProvider) invocation.Arguments[3]; }).Return(isSuccessful); IAssessmentSection assessmentSectionStub = mockRepository.Stub(); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r545b105a213ed85564861b4bcf6d2d6425dbde50 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -216,7 +216,6 @@ HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSection.Id, testWaveConditionsCosineCalculator.RingId); } } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r624268bcc5f60b5965bb056ca72cea15daff06f3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 624268bcc5f60b5965bb056ca72cea15daff06f3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -405,7 +405,6 @@ var designWaterLevelCalculationInput = testDesignWaterLevelCalculator.ReceivedInputs.First(); Assert.AreEqual(testDataPath, testDesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, testDesignWaterLevelCalculator.RingId); Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, designWaterLevelCalculationInput.HydraulicBoundaryLocationId); var expectedProbability = assessmentSectionStub.FailureMechanismContribution.Norm Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r624268bcc5f60b5965bb056ca72cea15daff06f3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 624268bcc5f60b5965bb056ca72cea15daff06f3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -450,7 +450,6 @@ var waveHeightCalculationInput = testWaveHeightCalculator.ReceivedInputs.First(); Assert.AreEqual(testDataPath, testWaveHeightCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, testWaveHeightCalculator.RingId); Assert.AreEqual(grassCoverErosionOutwardsHydraulicBoundaryLocation.Id, waveHeightCalculationInput.HydraulicBoundaryLocationId); var expectedProbability = assessmentSectionStub.FailureMechanismContribution.Norm Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -481,7 +481,6 @@ Assert.AreEqual(3, testWaveConditionsInputs.Length); Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); int waterLevelIndex = 0; foreach (WaveConditionsCosineCalculationInput actualInput in testWaveConditionsInputs) Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs =================================================================== diff -u -r0a6be471bf3a8954a107a2625f7cba502395cc8f -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 0a6be471bf3a8954a107a2625f7cba502395cc8f) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Service/HeightStructuresCalculationService.cs (.../HeightStructuresCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -132,7 +132,7 @@ StructuresOvertoppingCalculationInput input = CreateInput(calculation, failureMechanism.GeneralInput, hydraulicBoundaryDatabaseFilePath); string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); - calculator = HydraRingCalculatorFactory.Instance.CreateStructuresOvertoppingCalculator(hlcdDirectory, assessmentSection.Id); + calculator = HydraRingCalculatorFactory.Instance.CreateStructuresOvertoppingCalculator(hlcdDirectory); CalculationServiceHelper.LogCalculationBeginTime(calculationName); Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -753,7 +753,6 @@ StructuresOvertoppingCalculationInput[] overtoppingCalculationInputs = testStructuresOvertoppingCalculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, overtoppingCalculationInputs.Length); Assert.AreEqual(testDataPath, testStructuresOvertoppingCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, testStructuresOvertoppingCalculator.RingId); GeneralHeightStructuresInput generalInput = heightStructuresFailureMechanism.GeneralInput; HeightStructuresInput input = calculation.InputParameters; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs =================================================================== diff -u -rbe545e9c087e456393edebfef45e0c0880a94d4a -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs (.../DesignWaterLevelCalculator.cs) (revision be545e9c087e456393edebfef45e0c0880a94d4a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DesignWaterLevelCalculator.cs (.../DesignWaterLevelCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -39,10 +39,9 @@ /// Create a new instance of . /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - internal DesignWaterLevelCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + internal DesignWaterLevelCalculator(string hlcdDirectory) + : base(hlcdDirectory) { targetProbabilityParser = new ReliabilityIndexCalculationParser(); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs =================================================================== diff -u -rd56bec747401ad6676fac64af5eef6d5fd89c47c -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs (.../DikeHeightCalculator.cs) (revision d56bec747401ad6676fac64af5eef6d5fd89c47c) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DikeHeightCalculator.cs (.../DikeHeightCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -39,10 +39,9 @@ /// Create a new instance of . /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - internal DikeHeightCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + internal DikeHeightCalculator(string hlcdDirectory) + : base(hlcdDirectory) { targetProbabilityParser = new ReliabilityIndexCalculationParser(); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DunesBoundaryConditionsCalculator.cs =================================================================== diff -u -raee658f1df53605cc0de2cbfd76441025480b035 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DunesBoundaryConditionsCalculator.cs (.../DunesBoundaryConditionsCalculator.cs) (revision aee658f1df53605cc0de2cbfd76441025480b035) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/DunesBoundaryConditionsCalculator.cs (.../DunesBoundaryConditionsCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -40,10 +40,9 @@ /// Create a new instance of . /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - internal DunesBoundaryConditionsCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + internal DunesBoundaryConditionsCalculator(string hlcdDirectory) + : base(hlcdDirectory) { dunesBoundaryParser = new DunesBoundaryConditionsCalculationParser(); targetProbabilityParser = new ReliabilityIndexCalculationParser(); @@ -55,8 +54,11 @@ } public double WaterLevel { get; private set; } + public double WaveHeight { get; private set; } + public double WavePeriod { get; private set; } + public double ReliabilityIndex { get; private set; } public void Calculate(DunesBoundaryConditionsCalculationInput input) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs =================================================================== diff -u -r8258f2589f1a34f8c77b61877d594ea3e813b3af -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs (.../HydraRingCalculatorFactory.cs) (revision 8258f2589f1a34f8c77b61877d594ea3e813b3af) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/HydraRingCalculatorFactory.cs (.../HydraRingCalculatorFactory.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -44,49 +44,49 @@ } } - public IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory, string ringId) + public IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory) { - return new DesignWaterLevelCalculator(hlcdDirectory, ringId); + return new DesignWaterLevelCalculator(hlcdDirectory); } - public IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory, string ringId) + public IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory) { - return new DikeHeightCalculator(hlcdDirectory, ringId); + return new DikeHeightCalculator(hlcdDirectory); } - public IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory, string ringId) + public IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory) { - return new OvertoppingCalculator(hlcdDirectory, ringId); + return new OvertoppingCalculator(hlcdDirectory); } - public IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory, string ringId) + public IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory) { - return new WaveConditionsCosineCalculator(hlcdDirectory, ringId); + return new WaveConditionsCosineCalculator(hlcdDirectory); } - public IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory, string ringId) + public IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory) { - return new WaveHeightCalculator(hlcdDirectory, ringId); + return new WaveHeightCalculator(hlcdDirectory); } - public IStructuresOvertoppingCalculator CreateStructuresOvertoppingCalculator(string hlcdDirectory, string ringId) + public IStructuresOvertoppingCalculator CreateStructuresOvertoppingCalculator(string hlcdDirectory) { - return new StructuresOvertoppingCalculator(hlcdDirectory, ringId); + return new StructuresOvertoppingCalculator(hlcdDirectory); } - public IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory, string ringId) + public IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory) { - return new StructuresClosureCalculator(hlcdDirectory, ringId); + return new StructuresClosureCalculator(hlcdDirectory); } - public IStructuresStabilityPointCalculator CreateStructuresStabilityPointCalculator(string hlcdDirectory, string ringId) + public IStructuresStabilityPointCalculator CreateStructuresStabilityPointCalculator(string hlcdDirectory) { - return new StructuresStabilityPointCalculator(hlcdDirectory, ringId); + return new StructuresStabilityPointCalculator(hlcdDirectory); } - public IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory, string ringId) + public IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory) { - return new DunesBoundaryConditionsCalculator(hlcdDirectory, ringId); + return new DunesBoundaryConditionsCalculator(hlcdDirectory); } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs =================================================================== diff -u -r8258f2589f1a34f8c77b61877d594ea3e813b3af -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision 8258f2589f1a34f8c77b61877d594ea3e813b3af) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -33,81 +33,72 @@ /// Creates a calculator for calculating a design water level. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory, string ringId); + IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory); /// /// Creates a calculator for calculating a dike height. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory, string ringId); + IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory); /// /// Creates a calculator for performing an overtopping calculation. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory, string ringId); + IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory); /// /// Creates a calculator for calculating wave conditions. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory, string ringId); + IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory); /// /// Creates a calculator for calculating a wave height. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory, string ringId); + IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory); /// /// Creates a calculator for performing a calculation for structures overtopping. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IStructuresOvertoppingCalculator CreateStructuresOvertoppingCalculator(string hlcdDirectory, string ringId); + IStructuresOvertoppingCalculator CreateStructuresOvertoppingCalculator(string hlcdDirectory); /// /// Creates a calculator for performing a calculation for structures closure. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory, string ringId); + IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory); /// /// Creates a calculator for performing a calculation for structures stability point. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IStructuresStabilityPointCalculator CreateStructuresStabilityPointCalculator(string hlcdDirectory, string ringId); + IStructuresStabilityPointCalculator CreateStructuresStabilityPointCalculator(string hlcdDirectory); /// /// Creates a calculator for performing a calculation for dunes boundary conditions. /// /// The directory where the hydraulic database can be found. - /// The id of the assessment section which is used in the calculation. /// A new . /// Thrown when is null. - IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory, string ringId); + IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory); } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs =================================================================== diff -u -ra9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision a9abc3d7cf7fa7c4c4d4fb9ec80598b3325d66e1) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/HydraRingCalculatorBase.cs (.../HydraRingCalculatorBase.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -42,24 +42,21 @@ private readonly LastErrorFileParser lastErrorFileParser; private readonly string hlcdDirectory; - private readonly string ringId; private Process hydraRingProcess; /// /// Creates a new instance of with a default Hydra-Ring file parser /// initialized. /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - protected HydraRingCalculatorBase(string hlcdDirectory, string ringId) + protected HydraRingCalculatorBase(string hlcdDirectory) { if (hlcdDirectory == null) { throw new ArgumentNullException(nameof(hlcdDirectory)); } this.hlcdDirectory = hlcdDirectory; - this.ringId = ringId; lastErrorFileParser = new LastErrorFileParser(); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs =================================================================== diff -u -reb5faa58e3d91d44faf0d7544fa0c33be54c0c4a -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs (.../OvertoppingCalculator.cs) (revision eb5faa58e3d91d44faf0d7544fa0c33be54c0c4a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/OvertoppingCalculator.cs (.../OvertoppingCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -40,10 +40,9 @@ /// Create a new instance of . /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - internal OvertoppingCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + internal OvertoppingCalculator(string hlcdDirectory) + : base(hlcdDirectory) { exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser(); waveHeightParser = new OvertoppingCalculationWaveHeightParser(); @@ -54,7 +53,9 @@ } public double ExceedanceProbabilityBeta { get; private set; } + public double WaveHeight { get; private set; } + public bool IsOvertoppingDominant { get; private set; } public void Calculate(OvertoppingCalculationInput input) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresClosureCalculator.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresClosureCalculator.cs (.../StructuresClosureCalculator.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresClosureCalculator.cs (.../StructuresClosureCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -39,10 +39,9 @@ /// Creates a new instance of . /// /// The directory in which the hydraulic boundary database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - public StructuresClosureCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + public StructuresClosureCalculator(string hlcdDirectory) + : base(hlcdDirectory) { exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser(); ExceedanceProbabilityBeta = double.NaN; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresOvertoppingCalculator.cs =================================================================== diff -u -reb5faa58e3d91d44faf0d7544fa0c33be54c0c4a -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresOvertoppingCalculator.cs (.../StructuresOvertoppingCalculator.cs) (revision eb5faa58e3d91d44faf0d7544fa0c33be54c0c4a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresOvertoppingCalculator.cs (.../StructuresOvertoppingCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -39,10 +39,9 @@ /// Create a new instance of . /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - internal StructuresOvertoppingCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + internal StructuresOvertoppingCalculator(string hlcdDirectory) + : base(hlcdDirectory) { exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser(); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresStabilityPointCalculator.cs =================================================================== diff -u -rae3f19fd6f65363369b4a903ca75d35e65af8751 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresStabilityPointCalculator.cs (.../StructuresStabilityPointCalculator.cs) (revision ae3f19fd6f65363369b4a903ca75d35e65af8751) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/StructuresStabilityPointCalculator.cs (.../StructuresStabilityPointCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -39,10 +39,9 @@ /// Creates a new instance of . /// /// The directory in which the hydraulic boundary database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - public StructuresStabilityPointCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + public StructuresStabilityPointCalculator(string hlcdDirectory) + : base(hlcdDirectory) { exceedanceProbabilityCalculationParser = new ExceedanceProbabilityCalculationParser(); ExceedanceProbabilityBeta = double.NaN; Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs =================================================================== diff -u -r8905298103eb01ce13dd5c1a2f267f879d4fda3e -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs (.../WaveConditionsCosineCalculator.cs) (revision 8905298103eb01ce13dd5c1a2f267f879d4fda3e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveConditionsCosineCalculator.cs (.../WaveConditionsCosineCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -40,10 +40,9 @@ /// Create a new instance of . /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - internal WaveConditionsCosineCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + internal WaveConditionsCosineCalculator(string hlcdDirectory) + : base(hlcdDirectory) { waveConditionsCalculationParser = new WaveConditionsCalculationParser(); reliabilityIndexCalculationParser = new ReliabilityIndexCalculationParser(); @@ -56,9 +55,13 @@ } public double WaveHeight { get; private set; } + public double WaveAngle { get; private set; } + public double WavePeakPeriod { get; private set; } + public double WaveDirection { get; private set; } + public double ReliabilityIndex { get; private set; } public void Calculate(WaveConditionsCosineCalculationInput input) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs (.../WaveHeightCalculator.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/WaveHeightCalculator.cs (.../WaveHeightCalculator.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -39,10 +39,9 @@ /// Create a new instance of . /// /// The directory in which the Hydraulic Boundary Database can be found. - /// The id of the assessment section which is used in the calculation. /// Thrown when is null. - internal WaveHeightCalculator(string hlcdDirectory, string ringId) - : base(hlcdDirectory, ringId) + internal WaveHeightCalculator(string hlcdDirectory) + : base(hlcdDirectory) { targetProbabilityParser = new ReliabilityIndexCalculationParser(); @@ -51,6 +50,7 @@ } public double WaveHeight { get; private set; } + public double ReliabilityIndex { get; private set; } public void Calculate(WaveHeightCalculationInput input) Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DesignWaterLevelCalculatorTest.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DesignWaterLevelCalculatorTest.cs (.../DesignWaterLevelCalculatorTest.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DesignWaterLevelCalculatorTest.cs (.../DesignWaterLevelCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new DesignWaterLevelCalculator(string.Empty, string.Empty); + var calculator = new DesignWaterLevelCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DikeHeightCalculatorTest.cs =================================================================== diff -u -rc77a47325b9db59cceec393a2553af874a06f11f -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DikeHeightCalculatorTest.cs (.../DikeHeightCalculatorTest.cs) (revision c77a47325b9db59cceec393a2553af874a06f11f) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DikeHeightCalculatorTest.cs (.../DikeHeightCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new DikeHeightCalculator(string.Empty, string.Empty); + var calculator = new DikeHeightCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DunesBoundaryConditionsCalculatorTest.cs =================================================================== diff -u -rb002ca3566c04bde5fe85396b6e972c41ba3b9f1 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DunesBoundaryConditionsCalculatorTest.cs (.../DunesBoundaryConditionsCalculatorTest.cs) (revision b002ca3566c04bde5fe85396b6e972c41ba3b9f1) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/DunesBoundaryConditionsCalculatorTest.cs (.../DunesBoundaryConditionsCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new DunesBoundaryConditionsCalculator(string.Empty, string.Empty); + var calculator = new DunesBoundaryConditionsCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs =================================================================== diff -u -r6a5d7b40b7ba4dcb73e393075338352d194e97c2 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 6a5d7b40b7ba4dcb73e393075338352d194e97c2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -37,28 +37,18 @@ public void Constructor_WithoutHlcdDirectory_ThrowsArgumentNullException() { // Call - TestDelegate test = () => new TestHydraRingCalculator(null, null); + TestDelegate test = () => new TestHydraRingCalculator(null); // Assert string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("hlcdDirectory", paramName); } [Test] - public void Constructor_WithHlcdDirectory_InitializesOutputWithoutValues() - { - // Call - var calculator = new TestHydraRingCalculator("", null); - - // Assert - Assert.IsNull(calculator.OutputDirectory); - } - - [Test] public void Calculate_WithCustomParser_ParsersExecutedAndOutputSet() { // Setup - var calculator = new TestHydraRingCalculator("", null); + var calculator = new TestHydraRingCalculator(""); // Call calculator.PublicCalculate(); @@ -73,7 +63,7 @@ { private readonly TestParser parser; - public TestHydraRingCalculator(string hlcdDirectory, string ringId) : base(hlcdDirectory, ringId) + public TestHydraRingCalculator(string hlcdDirectory) : base(hlcdDirectory) { parser = new TestParser(); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/OvertoppingCalculatorTest.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/OvertoppingCalculatorTest.cs (.../OvertoppingCalculatorTest.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/OvertoppingCalculatorTest.cs (.../OvertoppingCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new OvertoppingCalculator(string.Empty, string.Empty); + var calculator = new OvertoppingCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresClosureCalculatorTest.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresClosureCalculatorTest.cs (.../StructuresClosureCalculatorTest.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresClosureCalculatorTest.cs (.../StructuresClosureCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new StructuresClosureCalculator(string.Empty, string.Empty); + var calculator = new StructuresClosureCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresOvertoppingCalculatorTest.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresOvertoppingCalculatorTest.cs (.../StructuresOvertoppingCalculatorTest.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresOvertoppingCalculatorTest.cs (.../StructuresOvertoppingCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new StructuresOvertoppingCalculator(string.Empty, string.Empty); + var calculator = new StructuresOvertoppingCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresStabilityPointCalculatorTest.cs =================================================================== diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresStabilityPointCalculatorTest.cs (.../StructuresStabilityPointCalculatorTest.cs) (revision bd73023d5f8926a411da214fb5ce522056a0e30a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/StructuresStabilityPointCalculatorTest.cs (.../StructuresStabilityPointCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new StructuresStabilityPointCalculator(string.Empty, string.Empty); + var calculator = new StructuresStabilityPointCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/WaveConditionsCosineCalculatorTest.cs =================================================================== diff -u -r484b07491e6cbb52ef2dc36bb236fb3b349d3141 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/WaveConditionsCosineCalculatorTest.cs (.../WaveConditionsCosineCalculatorTest.cs) (revision 484b07491e6cbb52ef2dc36bb236fb3b349d3141) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/WaveConditionsCosineCalculatorTest.cs (.../WaveConditionsCosineCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new WaveConditionsCosineCalculator(string.Empty, string.Empty); + var calculator = new WaveConditionsCosineCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/WaveHeightCalculatorTest.cs =================================================================== diff -u -rbd73023d5f8926a411da214fb5ce522056a0e30a -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/WaveHeightCalculatorTest.cs (.../WaveHeightCalculatorTest.cs) (revision bd73023d5f8926a411da214fb5ce522056a0e30a) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/WaveHeightCalculatorTest.cs (.../WaveHeightCalculatorTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -31,7 +31,7 @@ public void DefaultConstructor_InitializesOutputWithoutValues() { // Call - var calculator = new WaveHeightCalculator(string.Empty, string.Empty); + var calculator = new WaveHeightCalculator(string.Empty); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs =================================================================== diff -u -r6a8d4edb0f3b2d00d3958c48146c51487bd01247 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 6a8d4edb0f3b2d00d3958c48146c51487bd01247) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -43,66 +43,57 @@ public readonly TestStructuresStabilityPointCalculator StructuresStabilityPointCalculator = new TestStructuresStabilityPointCalculator(); public readonly TestDunesBoundaryConditionsCalculator DunesBoundaryConditionsCalculator = new TestDunesBoundaryConditionsCalculator(); - public IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory, string ringId) + public IDesignWaterLevelCalculator CreateDesignWaterLevelCalculator(string hlcdDirectory) { DesignWaterLevelCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - DesignWaterLevelCalculator.RingId = ringId; return DesignWaterLevelCalculator; } - public IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory, string ringId) + public IDikeHeightCalculator CreateDikeHeightCalculator(string hlcdDirectory) { DikeHeightCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - DikeHeightCalculator.RingId = ringId; return DikeHeightCalculator; } - public IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory, string ringId) + public IOvertoppingCalculator CreateOvertoppingCalculator(string hlcdDirectory) { OvertoppingCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - OvertoppingCalculator.RingId = ringId; return OvertoppingCalculator; } - public IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory, string ringId) + public IWaveConditionsCosineCalculator CreateWaveConditionsCosineCalculator(string hlcdDirectory) { WaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - WaveConditionsCosineCalculator.RingId = ringId; return WaveConditionsCosineCalculator; } - public IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory, string ringId) + public IWaveHeightCalculator CreateWaveHeightCalculator(string hlcdDirectory) { WaveHeightCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - WaveHeightCalculator.RingId = ringId; return WaveHeightCalculator; } - public IStructuresOvertoppingCalculator CreateStructuresOvertoppingCalculator(string hlcdDirectory, string ringId) + public IStructuresOvertoppingCalculator CreateStructuresOvertoppingCalculator(string hlcdDirectory) { StructuresOvertoppingCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - StructuresOvertoppingCalculator.RingId = ringId; return StructuresOvertoppingCalculator; } - public IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory, string ringId) + public IStructuresClosureCalculator CreateStructuresClosureCalculator(string hlcdDirectory) { StructuresClosureCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - StructuresClosureCalculator.RingId = ringId; return StructuresClosureCalculator; } - public IStructuresStabilityPointCalculator CreateStructuresStabilityPointCalculator(string hlcdDirectory, string ringId) + public IStructuresStabilityPointCalculator CreateStructuresStabilityPointCalculator(string hlcdDirectory) { StructuresStabilityPointCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - StructuresStabilityPointCalculator.RingId = ringId; return StructuresStabilityPointCalculator; } - public IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory, string ringId) + public IDunesBoundaryConditionsCalculator CreateDunesBoundaryConditionsCalculator(string hlcdDirectory) { DunesBoundaryConditionsCalculator.HydraulicBoundaryDatabaseDirectory = hlcdDirectory; - DunesBoundaryConditionsCalculator.RingId = ringId; return DunesBoundaryConditionsCalculator; } } @@ -186,7 +177,6 @@ { public readonly List ReceivedInputs = new List(); public event EventHandler CalculationFinishedHandler; - public string RingId { get; set; } public string HydraulicBoundaryDatabaseDirectory { get; set; } public bool EndInFailure { get; set; } public bool IsCanceled { get; set; } Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs =================================================================== diff -u -re468a5451f59115ec6ca32c014da1baaa38866e8 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs (.../DesignWaterLevelLocationsView.cs) (revision e468a5451f59115ec6ca32c014da1baaa38866e8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/DesignWaterLevelLocationsView.cs (.../DesignWaterLevelLocationsView.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -87,8 +87,8 @@ } bool successfulCalculation = CalculationGuiService.CalculateDesignWaterLevels(AssessmentSection.HydraulicBoundaryDatabase.FilePath, locations, - AssessmentSection.Id, - AssessmentSection.FailureMechanismContribution.Norm, new DesignWaterLevelCalculationMessageProvider()); + AssessmentSection.FailureMechanismContribution.Norm, + new DesignWaterLevelCalculationMessageProvider()); if (successfulCalculation) { AssessmentSection.HydraulicBoundaryDatabase.NotifyObservers(); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs =================================================================== diff -u -re468a5451f59115ec6ca32c014da1baaa38866e8 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs (.../WaveHeightLocationsView.cs) (revision e468a5451f59115ec6ca32c014da1baaa38866e8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/WaveHeightLocationsView.cs (.../WaveHeightLocationsView.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -88,8 +88,8 @@ bool successfulCalculation = CalculationGuiService.CalculateWaveHeights(AssessmentSection.HydraulicBoundaryDatabase.FilePath, locations, - AssessmentSection.Id, - AssessmentSection.FailureMechanismContribution.Norm, new WaveHeightCalculationMessageProvider()); + AssessmentSection.FailureMechanismContribution.Norm, + new WaveHeightCalculationMessageProvider()); if (successfulCalculation) { Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rbdc32ff91af686a45b08e5f4f4a8d5b45eaba60f -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision bdc32ff91af686a45b08e5f4f4a8d5b45eaba60f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -1319,7 +1319,6 @@ IAssessmentSection assessmentSection = nodeData.WrappedData; bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.Locations, - assessmentSection.Id, assessmentSection.FailureMechanismContribution.Norm, new DesignWaterLevelCalculationMessageProvider()); if (successfulCalculation) @@ -1354,7 +1353,6 @@ IAssessmentSection assessmentSection = nodeData.WrappedData; bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.Locations, - assessmentSection.Id, assessmentSection.FailureMechanismContribution.Norm, new WaveHeightCalculationMessageProvider()); if (successfulCalculation) Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -re468a5451f59115ec6ca32c014da1baaa38866e8 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision e468a5451f59115ec6ca32c014da1baaa38866e8) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -261,11 +261,11 @@ ICalculationMessageProvider messageProvider = null; IEnumerable locations = null; - guiServiceMock.Expect(ch => ch.CalculateDesignWaterLevels(null, null, null, 1, null)).IgnoreArguments().WhenCalled( + guiServiceMock.Expect(ch => ch.CalculateDesignWaterLevels(null, null, 1, null)).IgnoreArguments().WhenCalled( invocation => { locations = (IEnumerable) invocation.Arguments[1]; - messageProvider = (ICalculationMessageProvider) invocation.Arguments[4]; + messageProvider = (ICalculationMessageProvider) invocation.Arguments[3]; }).Return(isSuccessful); mockRepository.ReplayAll(); @@ -318,7 +318,7 @@ { var view = ShowDesignWaterLevelLocationsView(); - var assessmentSection = new ObservableTestAssessmentSectionStub() + var assessmentSection = new ObservableTestAssessmentSectionStub { HydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase() }; Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs =================================================================== diff -u -re468a5451f59115ec6ca32c014da1baaa38866e8 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision e468a5451f59115ec6ca32c014da1baaa38866e8) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -253,7 +253,7 @@ } IEnumerable locations = null; - guiServiceMock.Expect(ch => ch.CalculateWaveHeights(null, null, null, 1, null)).IgnoreArguments().WhenCalled( + guiServiceMock.Expect(ch => ch.CalculateWaveHeights(null, null, 1, null)).IgnoreArguments().WhenCalled( invocation => { locations = (IEnumerable) invocation.Arguments[1]; }).Return(isSuccessful); mockRepository.ReplayAll(); Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs =================================================================== diff -u -r1dc7aca66fba19cdc15c81d6b5d2d48f2625ebc0 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 1dc7aca66fba19cdc15c81d6b5d2d48f2625ebc0) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Service/WaveConditionsCalculationServiceBase.cs (.../WaveConditionsCalculationServiceBase.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -114,7 +114,6 @@ /// The 'b' factor decided on failure mechanism level. /// The 'c' factor decided on failure mechanism level. /// The norm to use as the target. - /// The id of the assessment section for which calculations are performed. /// The filepath of the hydraulic boundary database. /// An of . /// Thrown when is null. @@ -138,7 +137,6 @@ RoundedDouble b, RoundedDouble c, double norm, - string ringId, string hrdFilePath) { if (waveConditionsInput == null) @@ -166,7 +164,6 @@ norm, waveConditionsInput, hrdFilePath, - ringId, calculationName); if (output != null) @@ -219,7 +216,6 @@ /// The norm to use as the target. /// The input that is different per calculation. /// The path which points to the hydraulic boundary database file. - /// The id of the assessment section for which calculations are performed. /// The name used for logging. /// A if the calculation was successful; or null if it was canceled. /// Thrown when the @@ -239,11 +235,10 @@ double norm, WaveConditionsInput input, string hydraulicBoundaryDatabaseFilePath, - string ringId, string name) { string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); - calculator = HydraRingCalculatorFactory.Instance.CreateWaveConditionsCosineCalculator(hlcdDirectory, ringId); + calculator = HydraRingCalculatorFactory.Instance.CreateWaveConditionsCosineCalculator(hlcdDirectory); WaveConditionsCosineCalculationInput calculationInput = CreateInput(waterLevel, a, b, c, norm, input, hydraulicBoundaryDatabaseFilePath); var exceptionThrown = false; Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -418,11 +418,10 @@ const double norm = 0.2; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); - string ringId = "11-1"; string calculationName = "test"; // Call - TestDelegate test = () => new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, null, hcldFilePath, ringId, calculationName); + TestDelegate test = () => new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, null, hcldFilePath, calculationName); // Assert var exception = Assert.Throws(test); @@ -454,19 +453,17 @@ }; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); - string ringId = "11-1"; string calculationName = "test"; using (new HydraRingCalculatorFactoryConfig()) { var testCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).WaveConditionsCosineCalculator; // Call - new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, ringId, calculationName); + new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, calculationName); // Assert Assert.AreEqual(Path.GetDirectoryName(hcldFilePath), testCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(ringId, testCalculator.RingId); for (int i = 0; i < input.WaterLevels.Count(); i++) { WaveConditionsCosineCalculationInput expectedInput = CreateInput(input.WaterLevels.ElementAt(i), a, b, c, norm, input, useForeshore, useBreakWater); @@ -492,7 +489,6 @@ LowerBoundaryRevetment = (RoundedDouble) 3 }; - const string ringId = "11-1"; const string calculationName = "test"; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); @@ -508,7 +504,7 @@ { try { - new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, ringId, calculationName); + new WaveConditionsCalculationService().PublicCalculate(a, b, c, norm, input, hcldFilePath, calculationName); } catch (HydraRingCalculationException) { @@ -547,7 +543,6 @@ LowerBoundaryRevetment = (RoundedDouble) 3 }; - const string ringId = "11-1"; const string name = "test"; string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); @@ -559,7 +554,7 @@ testCalculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call - service.PublicCalculate(a, b, c, norm, input, hcldFilePath, ringId, name); + service.PublicCalculate(a, b, c, norm, input, hcldFilePath, name); // Assert Assert.IsTrue(testCalculator.IsCanceled); @@ -610,9 +605,9 @@ return ValidateWaveConditionsInput(waveConditionsInput, calculationName, dbFilePath, valueName); } - public void PublicCalculate(RoundedDouble a, RoundedDouble b, RoundedDouble c, double norm, WaveConditionsInput input, string dbFilePath, string ringId, string name) + public void PublicCalculate(RoundedDouble a, RoundedDouble b, RoundedDouble c, double norm, WaveConditionsInput input, string dbFilePath, string name) { - CalculateWaveConditions(name, input, a, b, c, norm, ringId, dbFilePath); + CalculateWaveConditions(name, input, a, b, c, norm, dbFilePath); } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs =================================================================== diff -u -r0a6be471bf3a8954a107a2625f7cba502395cc8f -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 0a6be471bf3a8954a107a2625f7cba502395cc8f) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Service/StabilityPointStructuresCalculationService.cs (.../StabilityPointStructuresCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -133,7 +133,7 @@ hydraulicBoundaryDatabaseFilePath); string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); - calculator = HydraRingCalculatorFactory.Instance.CreateStructuresStabilityPointCalculator(hlcdDirectory, assessmentSection.Id); + calculator = HydraRingCalculatorFactory.Instance.CreateStructuresStabilityPointCalculator(hlcdDirectory); CalculationServiceHelper.LogCalculationBeginTime(calculationName); Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Service.Test/StabilityPointStructuresCalculationServiceTest.cs (.../StabilityPointStructuresCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -910,7 +910,6 @@ StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; StabilityPointStructuresInput input = calculation.InputParameters; @@ -1028,7 +1027,6 @@ StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; StabilityPointStructuresInput input = calculation.InputParameters; @@ -1146,7 +1144,6 @@ StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; StabilityPointStructuresInput input = calculation.InputParameters; @@ -1264,7 +1261,6 @@ StructuresStabilityPointCalculationInput[] calculationInputs = calculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, calculationInputs.Length); Assert.AreEqual(testDataPath, calculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, calculator.RingId); GeneralStabilityPointStructuresInput generalInput = failureMechanism.GeneralInput; StabilityPointStructuresInput input = calculation.InputParameters; Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs =================================================================== diff -u -r4faae1433690b9b06b40c18ff322140aa16df739 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Service/StabilityStoneCoverWaveConditionsCalculationService.cs (.../StabilityStoneCoverWaveConditionsCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -119,21 +119,20 @@ var bColumns = generalWaveConditionsInput.GeneralColumnsWaveConditionsInput.B; var cColumns = generalWaveConditionsInput.GeneralColumnsWaveConditionsInput.C; - var ringId = assessmentSection.Id; var norm = assessmentSection.FailureMechanismContribution.Norm; TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count() * 2; try { log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_blocks_started, calculationName); - IEnumerable blocksOutputs = CalculateWaveConditions(calculationName, calculation.InputParameters, aBlocks, bBlocks, cBlocks, norm, ringId, hlcdFilePath); + IEnumerable blocksOutputs = CalculateWaveConditions(calculationName, calculation.InputParameters, aBlocks, bBlocks, cBlocks, norm, hlcdFilePath); log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_blocks_finished, calculationName); IEnumerable columnsOutputs = null; if (!Canceled) { log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_columns_started, calculationName); - columnsOutputs = CalculateWaveConditions(calculationName, calculation.InputParameters, aColumns, bColumns, cColumns, norm, ringId, hlcdFilePath); + columnsOutputs = CalculateWaveConditions(calculationName, calculation.InputParameters, aColumns, bColumns, cColumns, norm, hlcdFilePath); log.InfoFormat(Resources.StabilityStoneCoverWaveConditionsCalculationService_Calculate_Calculation_0_for_columns_finished, calculationName); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r4faae1433690b9b06b40c18ff322140aa16df739 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 4faae1433690b9b06b40c18ff322140aa16df739) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -170,7 +170,6 @@ WaveConditionsInput input = calculation.InputParameters; Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); int waterLevelIndex = 0; for (int i = 0; i < testWaveConditionsInputs.Length / 2; i++) Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -531,7 +531,6 @@ WaveConditionsInput input = calculation.InputParameters; Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); int waterLevelIndex = 0; for (int i = 0; i < testWaveConditionsInputs.Length/2; i++) Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs =================================================================== diff -u -r66f8f4622c8742bfb8fc0501cf44c3c58fd35522 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs) (revision 66f8f4622c8742bfb8fc0501cf44c3c58fd35522) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Service/WaveImpactAsphaltCoverWaveConditionsCalculationService.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationService.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -110,13 +110,12 @@ var b = generalWaveConditionsInput.B; var c = generalWaveConditionsInput.C; - var ringId = assessmentSection.Id; var norm = assessmentSection.FailureMechanismContribution.Norm; TotalWaterLevelCalculations = calculation.InputParameters.WaterLevels.Count(); try { - var outputs = CalculateWaveConditions(calculationName, calculation.InputParameters, a, b, c, norm, ringId, hlcdFilePath); + var outputs = CalculateWaveConditions(calculationName, calculation.InputParameters, a, b, c, norm, hlcdFilePath); if (!Canceled) { Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r545b105a213ed85564861b4bcf6d2d6425dbde50 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 545b105a213ed85564861b4bcf6d2d6425dbde50) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -173,7 +173,6 @@ HydraRingDataEqualityHelper.AreEqual(expectedInput, actualInput); Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSection.Id, testWaveConditionsCosineCalculator.RingId); } } } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r6a7a721c90be4624a149e5025747e4e2eaaf88b3 -r84db6d79354723db5626dbb9ff7361d2a70d66d1 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 6a7a721c90be4624a149e5025747e4e2eaaf88b3) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 84db6d79354723db5626dbb9ff7361d2a70d66d1) @@ -473,7 +473,6 @@ Assert.AreEqual(3, testWaveConditionsInputs.Length); Assert.AreEqual(testDataPath, testWaveConditionsCosineCalculator.HydraulicBoundaryDatabaseDirectory); - Assert.AreEqual(assessmentSectionStub.Id, testWaveConditionsCosineCalculator.RingId); int waterLevelIndex = 0; foreach (WaveConditionsCosineCalculationInput actualInput in testWaveConditionsInputs)