Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs =================================================================== diff -u -r6cd7ed9865da9f211a6e1e3cd4a0ac86b321eef0 -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs (.../HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs) (revision 6cd7ed9865da9f211a6e1e3cd4a0ac86b321eef0) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs (.../HydraulicBoundaryLocationCalculationsGroupBaseProperties.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -62,10 +62,11 @@ protected IEnumerable> GetHydraulicBoundaryLocationCalculationsForLocation(HydraulicBoundaryLocation location) { - return calculationsPerCategoryBoundary.Select(boundaryCalculations => - new Tuple( - boundaryCalculations.Item1, - boundaryCalculations.Item2.Single(calculation => ReferenceEquals(calculation.HydraulicBoundaryLocation, location)))); + return calculationsPerCategoryBoundary.Select( + boundaryCalculations => + new Tuple( + boundaryCalculations.Item1, + boundaryCalculations.Item2.Single(calculation => ReferenceEquals(calculation.HydraulicBoundaryLocation, location)))).ToArray(); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs =================================================================== diff -u -r91259c905e8a5a16d7a242bdbe217bda9266b428 -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs (.../DesignWaterLevelCalculationPropertiesTest.cs) (revision 91259c905e8a5a16d7a242bdbe217bda9266b428) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationPropertiesTest.cs (.../DesignWaterLevelCalculationPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -25,7 +25,6 @@ using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.Data.TestUtil.IllustrationPoints; using Ringtoets.Common.Forms.PropertyClasses; namespace Ringtoets.Common.Forms.Test.PropertyClasses @@ -84,21 +83,13 @@ public void GetProperties_Always_ReturnsExpectedValues() { // Setup - var random = new Random(); + var random = new Random(39); double designWaterLevel = random.NextDouble(); var convergence = random.NextEnumValue(); - var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(designWaterLevel, - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - convergence, - new TestGeneralResultSubMechanismIllustrationPoint()); - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) { - Output = hydraulicBoundaryLocationCalculationOutput + Output = new TestHydraulicBoundaryLocationCalculationOutput(designWaterLevel, convergence) }; // Call Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsGroupPropertiesTest.cs =================================================================== diff -u -r6cd7ed9865da9f211a6e1e3cd4a0ac86b321eef0 -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsGroupPropertiesTest.cs (.../DesignWaterLevelCalculationsGroupPropertiesTest.cs) (revision 6cd7ed9865da9f211a6e1e3cd4a0ac86b321eef0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsGroupPropertiesTest.cs (.../DesignWaterLevelCalculationsGroupPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -76,25 +76,27 @@ public void GetProperties_WithData_ReturnExpectedValues() { // Setup + const string categoryBoundaryName = "A"; var location = new TestHydraulicBoundaryLocation(); // Call - var properties = new DesignWaterLevelCalculationsGroupProperties(new[] - { - location - }, - new[] - { - new Tuple>("A", new[] - { - new HydraulicBoundaryLocationCalculation(location) - }) - }); + var properties = new DesignWaterLevelCalculationsGroupProperties( + new[] + { + location + }, + new[] + { + new Tuple>(categoryBoundaryName, new[] + { + new HydraulicBoundaryLocationCalculation(location) + }) + }); // Assert DesignWaterLevelHydraulicBoundaryLocationProperties locationProperties = properties.Locations.Single(); Assert.AreSame(location, locationProperties.Data); - Assert.AreEqual("A", locationProperties.CategoryBoundaries.Single().CategoryBoundaryName); + Assert.AreEqual(categoryBoundaryName, locationProperties.CategoryBoundaries.Single().CategoryBoundaryName); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs =================================================================== diff -u -r04ffe9435f3031323b2eeac4718e85dfd6022dbe -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs (.../DesignWaterLevelCalculationsPropertiesTest.cs) (revision 04ffe9435f3031323b2eeac4718e85dfd6022dbe) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelCalculationsPropertiesTest.cs (.../DesignWaterLevelCalculationsPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -33,7 +33,7 @@ [TestFixture] public class DesignWaterLevelCalculationsPropertiesTest { - private const int requiredLocationsPropertyIndex = 0; + private const int locationsPropertyIndex = 0; [Test] public void Constructor_WithHydraulicBoundaryLocationCalculations_ExpectedValues() @@ -62,7 +62,7 @@ PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); Assert.AreEqual(1, dynamicProperties.Count); - PropertyDescriptor locationsProperty = dynamicProperties[requiredLocationsPropertyIndex]; + PropertyDescriptor locationsProperty = dynamicProperties[locationsPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(locationsProperty, "Algemeen", "Locaties", @@ -74,10 +74,7 @@ public void GetProperties_WithData_ReturnExpectedValues() { // Setup - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) - { - Output = new TestHydraulicBoundaryLocationCalculationOutput(1.5) - }; + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); // Call var properties = new DesignWaterLevelCalculationsProperties(new ObservableList Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelHydraulicBoundaryLocationPropertiesTest.cs =================================================================== diff -u -re9602557466ba57cb9d288377cf0a3ab0fb0426c -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelHydraulicBoundaryLocationPropertiesTest.cs (.../DesignWaterLevelHydraulicBoundaryLocationPropertiesTest.cs) (revision e9602557466ba57cb9d288377cf0a3ab0fb0426c) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/DesignWaterLevelHydraulicBoundaryLocationPropertiesTest.cs (.../DesignWaterLevelHydraulicBoundaryLocationPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -87,9 +87,10 @@ Output = new TestHydraulicBoundaryLocationCalculationOutput() }; + const string categoryBoundaryName = "A"; var calculations = new[] { - new Tuple("A", hydraulicBoundaryLocationCalculation) + new Tuple(categoryBoundaryName, hydraulicBoundaryLocationCalculation) }; // Call @@ -98,7 +99,7 @@ // Assert DesignWaterLevelCalculationCategoryBoundaryProperties categoryBoundaryCalculation = properties.CategoryBoundaries.Single(); - Assert.AreEqual("A", categoryBoundaryCalculation.CategoryBoundaryName); + Assert.AreEqual(categoryBoundaryName, categoryBoundaryCalculation.CategoryBoundaryName); Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, categoryBoundaryCalculation.Result); Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.CalculationConvergence, categoryBoundaryCalculation.Convergence); } Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationBasePropertiesTest.cs =================================================================== diff -u -rbb29d09db7cda2fbce4c36d2d544f5ef74c7c103 -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationBasePropertiesTest.cs (.../HydraulicBoundaryLocationBasePropertiesTest.cs) (revision bb29d09db7cda2fbce4c36d2d544f5ef74c7c103) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationBasePropertiesTest.cs (.../HydraulicBoundaryLocationBasePropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -128,14 +128,10 @@ const string name = ""; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y); - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) - { - Output = new TestHydraulicBoundaryLocationCalculationOutput() - }; var calculations = new[] { - new Tuple("A", hydraulicBoundaryLocationCalculation) + new Tuple("A", new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)) }; // Call Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryPropertiesTest.cs =================================================================== diff -u -re9602557466ba57cb9d288377cf0a3ab0fb0426c -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationCategoryBoundaryPropertiesTest.cs) (revision e9602557466ba57cb9d288377cf0a3ab0fb0426c) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationCategoryBoundaryPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationCategoryBoundaryPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -269,13 +269,7 @@ const string categoryBoundaryName = "A-Z"; var calculationConvergence = random.NextEnumValue(); - var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - calculationConvergence, - null); + var hydraulicBoundaryLocationCalculationOutput = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble(), calculationConvergence); // Call var properties = new TestHydraulicBoundaryLocationCalculationCategoryBoundaryProperties(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) @@ -287,10 +281,11 @@ // Assert Assert.AreEqual(categoryBoundaryName, properties.CategoryBoundaryName); Assert.AreEqual(calculationConvergence, properties.Convergence); + Assert.AreEqual(hydraulicBoundaryLocationCalculationOutput.Result, properties.Result); } [Test] - public void ToString_Always_ReturnsNameAndLocation() + public void ToString_Always_ReturnsCategoryBoundaryName() { // Setup const string categoryBoundaryName = "C"; Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs =================================================================== diff -u -r04ffe9435f3031323b2eeac4718e85dfd6022dbe -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationPropertiesTest.cs) (revision 04ffe9435f3031323b2eeac4718e85dfd6022dbe) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationPropertiesTest.cs (.../HydraulicBoundaryLocationCalculationPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -51,17 +51,6 @@ private const int illustrationPointsIndex = 13; [Test] - public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException() - { - // Call - TestDelegate test = () => new TestHydraulicBoundaryLocationCalculationProperties(null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("hydraulicBoundaryLocationCalculation", paramName); - } - - [Test] public void Constructor_ExpectedProperties() { // Setup @@ -72,6 +61,7 @@ // Assert Assert.IsInstanceOf(properties); + Assert.AreSame(hydraulicBoundaryLocationCalculation, properties.Data); } [Test] @@ -290,18 +280,9 @@ const string name = ""; var calculationConvergence = random.NextEnumValue(); - var hydraulicBoundaryLocationCalculationOutput = new HydraulicBoundaryLocationCalculationOutput(random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - random.NextDouble(), - calculationConvergence, - null); - - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, name, x, y); - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation) + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(id, name, x, y)) { - Output = hydraulicBoundaryLocationCalculationOutput + Output = new TestHydraulicBoundaryLocationCalculationOutput(random.NextDouble(), calculationConvergence) }; // Call Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBasePropertiesTest.cs =================================================================== diff -u -rbb29d09db7cda2fbce4c36d2d544f5ef74c7c103 -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBasePropertiesTest.cs (.../HydraulicBoundaryLocationCalculationsGroupBasePropertiesTest.cs) (revision bb29d09db7cda2fbce4c36d2d544f5ef74c7c103) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/HydraulicBoundaryLocationCalculationsGroupBasePropertiesTest.cs (.../HydraulicBoundaryLocationCalculationsGroupBasePropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -25,6 +25,7 @@ using Core.Common.Gui.PropertyBag; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.PropertyClasses; namespace Ringtoets.Common.Forms.Test.PropertyClasses @@ -71,11 +72,54 @@ Assert.AreSame(locations, properties.Data); } + [Test] + public void GetHydraulicBoundaryLocationCalculationsForLocation_Always_ReturnsExpectedData() + { + // Setup + var location = new TestHydraulicBoundaryLocation(); + var calculation = new HydraulicBoundaryLocationCalculation(location); + var properties = new TestHydraulicBoundaryLocationCalculationGroupProperties( + new[] + { + location + }, + new[] + { + new Tuple>("A", new[] + { + calculation, + new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) + }), + new Tuple>("B", new[] + { + calculation + }) + }); + + // Call + IEnumerable> calculationsForLocation = properties.PublicGetHydraulicBoundaryLocationCalculationsForLocation(location); + + // Assert + Assert.AreEqual(2, calculationsForLocation.Count()); + Tuple calculationBoundaryA = calculationsForLocation.First(); + Assert.AreEqual("A", calculationBoundaryA.Item1); + Assert.AreSame(calculation, calculationBoundaryA.Item2); + + Tuple calculationBoundaryB = calculationsForLocation.ElementAt(1); + Assert.AreEqual("B", calculationBoundaryB.Item1); + Assert.AreSame(calculation, calculationBoundaryB.Item2); + } + private class TestHydraulicBoundaryLocationCalculationGroupProperties : HydraulicBoundaryLocationCalculationsGroupBaseProperties { public TestHydraulicBoundaryLocationCalculationGroupProperties(IEnumerable locations, IEnumerable>> calculationsPerCategoryBoundary) : base(locations, calculationsPerCategoryBoundary) {} + + public IEnumerable> PublicGetHydraulicBoundaryLocationCalculationsForLocation(HydraulicBoundaryLocation location) + { + return GetHydraulicBoundaryLocationCalculationsForLocation(location); + } } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsGroupPropertiesTest.cs =================================================================== diff -u -rbb29d09db7cda2fbce4c36d2d544f5ef74c7c103 -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsGroupPropertiesTest.cs (.../WaveHeightCalculationsGroupPropertiesTest.cs) (revision bb29d09db7cda2fbce4c36d2d544f5ef74c7c103) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsGroupPropertiesTest.cs (.../WaveHeightCalculationsGroupPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -76,25 +76,27 @@ public void GetProperties_WithData_ReturnExpectedValues() { // Setup + const string categoryBoundaryName = "A"; var location = new TestHydraulicBoundaryLocation(); // Call - var properties = new WaveHeightCalculationsGroupProperties(new[] - { - location - }, - new[] - { - new Tuple>("A", new[] - { - new HydraulicBoundaryLocationCalculation(location) - }) - }); + var properties = new WaveHeightCalculationsGroupProperties( + new[] + { + location + }, + new[] + { + new Tuple>(categoryBoundaryName, new[] + { + new HydraulicBoundaryLocationCalculation(location) + }) + }); // Assert WaveHeightHydraulicBoundaryLocationProperties locationProperties = properties.Locations.Single(); Assert.AreSame(location, locationProperties.Data); - Assert.AreEqual(1, locationProperties.CategoryBoundaries.Length); + Assert.AreEqual(categoryBoundaryName, locationProperties.CategoryBoundaries.Single().CategoryBoundaryName); } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs =================================================================== diff -u -r04ffe9435f3031323b2eeac4718e85dfd6022dbe -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs (.../WaveHeightCalculationsPropertiesTest.cs) (revision 04ffe9435f3031323b2eeac4718e85dfd6022dbe) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightCalculationsPropertiesTest.cs (.../WaveHeightCalculationsPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -74,10 +74,7 @@ public void GetProperties_WithData_ReturnExpectedValues() { // Setup - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) - { - Output = new TestHydraulicBoundaryLocationCalculationOutput(1.5) - }; + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); // Call var properties = new WaveHeightCalculationsProperties(new ObservableList Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightHydraulicBoundaryLocationPropertiesTest.cs =================================================================== diff -u -re9602557466ba57cb9d288377cf0a3ab0fb0426c -r07ee3d6f4986ef01277906824f02ef1fe7406221 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightHydraulicBoundaryLocationPropertiesTest.cs (.../WaveHeightHydraulicBoundaryLocationPropertiesTest.cs) (revision e9602557466ba57cb9d288377cf0a3ab0fb0426c) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/WaveHeightHydraulicBoundaryLocationPropertiesTest.cs (.../WaveHeightHydraulicBoundaryLocationPropertiesTest.cs) (revision 07ee3d6f4986ef01277906824f02ef1fe7406221) @@ -87,9 +87,10 @@ Output = new TestHydraulicBoundaryLocationCalculationOutput() }; + const string categoryBoundaryName = "A"; var calculations = new[] { - new Tuple("A", hydraulicBoundaryLocationCalculation) + new Tuple(categoryBoundaryName, hydraulicBoundaryLocationCalculation) }; // Call @@ -98,7 +99,7 @@ // Assert WaveHeightCalculationCategoryBoundaryProperties categoryBoundaryCalculation = properties.CategoryBoundaries.Single(); - Assert.AreEqual("A", categoryBoundaryCalculation.CategoryBoundaryName); + Assert.AreEqual(categoryBoundaryName, categoryBoundaryCalculation.CategoryBoundaryName); Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, categoryBoundaryCalculation.Result); Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.CalculationConvergence, categoryBoundaryCalculation.Convergence); }