Fisheye: Tag 5622c01c7f65869743cc23c4f884bc32f970fb44 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyCategory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyGroupLimits.cs =================================================================== diff -u --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyGroupLimits.cs (revision 0) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssemblyGroupLimits.cs (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -0,0 +1,50 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Riskeer.AssemblyTool.Data +{ + /// + /// Assembly category base. + /// + public abstract class AssemblyGroupLimits + { + /// + /// Creates a new instance of . + /// + /// The lower boundary of the category. + /// The upper boundary of the category. + protected AssemblyGroupLimits(double lowerBoundary, double upperBoundary) + { + LowerBoundary = lowerBoundary; + UpperBoundary = upperBoundary; + } + + /// + /// Gets the lower boundary of the assembly group. + /// + public double LowerBoundary { get; } + + /// + /// Gets the upper boundary of the assembly group. + /// + public double UpperBoundary { get; } + } +} \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyCategory.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyCategory.cs (.../AssessmentSectionAssemblyCategory.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/AssessmentSectionAssemblyCategory.cs (.../AssessmentSectionAssemblyCategory.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -24,7 +24,7 @@ /// /// Assembly category for assessment section. /// - public class AssessmentSectionAssemblyCategory : AssemblyCategory + public class AssessmentSectionAssemblyCategory : AssemblyGroupLimits { /// /// Creates a new instance of . Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismAssemblyCategory.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismAssemblyCategory.cs (.../FailureMechanismAssemblyCategory.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismAssemblyCategory.cs (.../FailureMechanismAssemblyCategory.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -24,7 +24,7 @@ /// /// Assembly category for a failure mechanism. /// - public class FailureMechanismAssemblyCategory : AssemblyCategory + public class FailureMechanismAssemblyCategory : AssemblyGroupLimits { /// /// Creates a new instance of . Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyCategory.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyCategory.cs (.../FailureMechanismSectionAssemblyCategory.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyCategory.cs (.../FailureMechanismSectionAssemblyCategory.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -24,7 +24,7 @@ /// /// Assembly category for failure mechanism section. /// - public class FailureMechanismSectionAssemblyCategory : AssemblyCategory + public class FailureMechanismSectionAssemblyCategory : AssemblyGroupLimits { /// /// Creates a new instance of . Fisheye: Tag 5622c01c7f65869743cc23c4f884bc32f970fb44 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroupBoundaries.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroupLimits.cs =================================================================== diff -u --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroupLimits.cs (revision 0) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/FailureMechanismSectionAssemblyGroupLimits.cs (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -0,0 +1,46 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Riskeer.AssemblyTool.Data +{ + /// + /// Class that holds the limits for a + /// + public class FailureMechanismSectionAssemblyGroupLimits : AssemblyGroupLimits + { + /// + /// Creates a new instance of . + /// + /// The group of the failure mechanism section assembly. + /// The lower boundary of the assembly group. + /// The upper boundary of the assembly group. + public FailureMechanismSectionAssemblyGroupLimits(FailureMechanismSectionAssemblyGroup group, double lowerBoundary, double upperBoundary) + : base(lowerBoundary, upperBoundary) + { + Group = group; + } + + /// + /// Gets the . + /// + public FailureMechanismSectionAssemblyGroup Group { get; } + } +} \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Riskeer.AssemblyTool.Data.csproj =================================================================== diff -u -rea195062546c9510b475b468797bea8f20bb4cbe -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Riskeer.AssemblyTool.Data.csproj (.../Riskeer.AssemblyTool.Data.csproj) (revision ea195062546c9510b475b468797bea8f20bb4cbe) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.Data/Riskeer.AssemblyTool.Data.csproj (.../Riskeer.AssemblyTool.Data.csproj) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -1,11 +1,11 @@  - - ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll - - - + + ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll + + + Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyGroupBoundariesCalculator.cs =================================================================== diff -u --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyGroupBoundariesCalculator.cs (revision 0) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Calculators/Categories/IAssemblyGroupBoundariesCalculator.cs (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -0,0 +1,28 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Riskeer.AssemblyTool.KernelWrapper.Calculators.Categories +{ + /// + /// Interface representing an assembly group limits calculator. + /// + public interface IAssemblyGroupBoundariesCalculator {} +} \ No newline at end of file Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs =================================================================== diff -u -r7fd6bac98b5183948c7e550187f05f4207bc3a71 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 7fd6bac98b5183948c7e550187f05f4207bc3a71) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Creators/AssemblyCategoryCreator.cs (.../AssemblyCategoryCreator.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -30,7 +30,7 @@ namespace Riskeer.AssemblyTool.KernelWrapper.Creators { /// - /// Creates instances. + /// Creates instances. /// internal static class AssemblyCategoryCreator { Index: Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj =================================================================== diff -u -refffeffbef15761667281ffcf6b2cb48280e4a29 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj (.../Riskeer.AssemblyTool.KernelWrapper.csproj) (revision efffeffbef15761667281ffcf6b2cb48280e4a29) +++ Riskeer/AssemblyTool/src/Riskeer.AssemblyTool.KernelWrapper/Riskeer.AssemblyTool.KernelWrapper.csproj (.../Riskeer.AssemblyTool.KernelWrapper.csproj) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -1,14 +1,14 @@  - - ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll - - - ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll - - - + + ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.Old.dll + + + ..\..\..\..\lib\Plugins\AssemblyTool\Assembly.Kernel.dll + + + @@ -19,14 +19,16 @@ + + + True + True + Resources.resx + + + + - - True - True - Resources.resx - - - ResXFileCodeGenerator Resources.Designer.cs Fisheye: Tag 5622c01c7f65869743cc23c4f884bc32f970fb44 refers to a dead (removed) revision in file `Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssemblyCategoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssemblyGroupLimitsTest.cs =================================================================== diff -u --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssemblyGroupLimitsTest.cs (revision 0) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssemblyGroupLimitsTest.cs (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -0,0 +1,52 @@ +// Copyright (C) Stichting Deltares 2021. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using NUnit.Framework; + +namespace Riskeer.AssemblyTool.Data.Test +{ + [TestFixture] + public class AssemblyGroupLimitsTest + { + [Test] + public void Constructor_ExpectedValues() + { + var random = new Random(11); + + double lowerBoundary = random.NextDouble(); + double upperBoundary = random.NextDouble(); + + // Call + var category = new SimpleGroupLimits(lowerBoundary, upperBoundary); + + // Assert + Assert.AreEqual(lowerBoundary, category.LowerBoundary); + Assert.AreEqual(upperBoundary, category.UpperBoundary); + } + + private class SimpleGroupLimits : AssemblyGroupLimits + { + public SimpleGroupLimits(double lowerBoundary, double upperBoundary) + : base(lowerBoundary, upperBoundary) {} + } + } +} \ No newline at end of file Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryTest.cs (.../AssessmentSectionAssemblyCategoryTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/AssessmentSectionAssemblyCategoryTest.cs (.../AssessmentSectionAssemblyCategoryTest.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -41,7 +41,7 @@ var category = new AssessmentSectionAssemblyCategory(lowerBoundary, upperBoundary, categoryType); // Assert - Assert.IsInstanceOf(category); + Assert.IsInstanceOf(category); Assert.AreEqual(lowerBoundary, category.LowerBoundary); Assert.AreEqual(upperBoundary, category.UpperBoundary); Assert.AreEqual(categoryType, category.Group); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismAssemblyCategoryTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismAssemblyCategoryTest.cs (.../FailureMechanismAssemblyCategoryTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismAssemblyCategoryTest.cs (.../FailureMechanismAssemblyCategoryTest.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -41,7 +41,7 @@ var category = new FailureMechanismAssemblyCategory(lowerBoundary, upperBoundary, categoryType); // Assert - Assert.IsInstanceOf(category); + Assert.IsInstanceOf(category); Assert.AreEqual(lowerBoundary, category.LowerBoundary); Assert.AreEqual(upperBoundary, category.UpperBoundary); Assert.AreEqual(categoryType, category.Group); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyCategoryTest.cs =================================================================== diff -u -rfa3389c99cd0c94dfad0be6cb9c8a6a43df45e35 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyCategoryTest.cs (.../FailureMechanismSectionAssemblyCategoryTest.cs) (revision fa3389c99cd0c94dfad0be6cb9c8a6a43df45e35) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyCategoryTest.cs (.../FailureMechanismSectionAssemblyCategoryTest.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -41,7 +41,7 @@ var category = new FailureMechanismSectionAssemblyCategory(lowerBoundary, upperBoundary, categoryType); // Assert - Assert.IsInstanceOf(category); + Assert.IsInstanceOf(category); Assert.AreEqual(lowerBoundary, category.LowerBoundary); Assert.AreEqual(upperBoundary, category.UpperBoundary); Assert.AreEqual(categoryType, category.Group); Index: Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupBoundariesTest.cs =================================================================== diff -u -r3a3e5f9a31f4398d399bd3fc23008bf5b09abb8d -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupBoundariesTest.cs (.../FailureMechanismSectionAssemblyGroupBoundariesTest.cs) (revision 3a3e5f9a31f4398d399bd3fc23008bf5b09abb8d) +++ Riskeer/AssemblyTool/test/Riskeer.AssemblyTool.Data.Test/FailureMechanismSectionAssemblyGroupBoundariesTest.cs (.../FailureMechanismSectionAssemblyGroupBoundariesTest.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -38,10 +38,10 @@ double upperBoundary = random.NextDouble(); // Call - var boundaries = new FailureMechanismSectionAssemblyGroupBoundaries(group, lowerBoundary, upperBoundary); + var boundaries = new FailureMechanismSectionAssemblyGroupLimits(group, lowerBoundary, upperBoundary); // Assert - Assert.IsInstanceOf(boundaries); + Assert.IsInstanceOf(boundaries); Assert.AreEqual(lowerBoundary, boundaries.LowerBoundary); Assert.AreEqual(upperBoundary, boundaries.UpperBoundary); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyCategoriesTable.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyCategoriesTable.cs (.../AssemblyCategoriesTable.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyCategoriesTable.cs (.../AssemblyCategoriesTable.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -30,7 +30,7 @@ namespace Riskeer.Integration.Forms.Views { /// - /// This class defines a table in which properties of instances are displayed. + /// This class defines a table in which properties of instances are displayed. /// /// The type of the enum to display in the table rows. public class AssemblyCategoriesTable : DataGridViewControl @@ -49,7 +49,7 @@ /// are shown in the table. /// /// The collection of . - public void SetData(IEnumerable> categories) + public void SetData(IEnumerable> categories) { SetDataSource(categories?.Select(category => new AssemblyCategoryRow(category.Item1, category.Item2, category.Item3)).ToArray()); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyCategoryRow.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyCategoryRow.cs (.../AssemblyCategoryRow.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyCategoryRow.cs (.../AssemblyCategoryRow.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -29,7 +29,7 @@ namespace Riskeer.Integration.Forms.Views { /// - /// This class represents a row displaying the properties of a . + /// This class represents a row displaying the properties of a . /// /// The type of the enum to display. internal class AssemblyCategoryRow @@ -38,12 +38,12 @@ /// /// Creates a new instance of . /// - /// The to use. + /// The to use. /// The belonging to this category. /// The category group of this category. /// Thrown when /// is null. - public AssemblyCategoryRow(AssemblyCategory assemblyCategory, + public AssemblyCategoryRow(AssemblyGroupLimits assemblyCategory, Color assemblyColor, T assemblyCategoryGroup) { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultCategoriesView.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultCategoriesView.cs (.../AssemblyResultCategoriesView.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssemblyResultCategoriesView.cs (.../AssemblyResultCategoriesView.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -92,7 +92,7 @@ { assemblyCategoriesTable.SetData( getAssemblyCategoriesFunc().Select( - category => new Tuple( + category => new Tuple( category, AssemblyCategoryGroupColorHelper.GetFailureMechanismAssemblyCategoryGroupColor(category.Group), category.Group)).ToArray()); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.cs (.../AssessmentSectionAssemblyCategoriesView.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/AssessmentSectionAssemblyCategoriesView.cs (.../AssessmentSectionAssemblyCategoriesView.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -90,7 +90,7 @@ AssemblyToolCategoriesFactory.CreateAssessmentSectionAssemblyCategories( FailureMechanismContribution.SignalingNorm, FailureMechanismContribution.LowerLimitNorm) - .Select(category => new Tuple( + .Select(category => new Tuple( category, AssemblyCategoryGroupColorHelper.GetAssessmentSectionAssemblyCategoryGroupColor(category.Group), category.Group)).ToArray()); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismAssemblyCategoriesView.cs =================================================================== diff -u -r2e1ab6663d2d1e55b101f212f276ad1bb25eadc1 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismAssemblyCategoriesView.cs (.../FailureMechanismAssemblyCategoriesView.cs) (revision 2e1ab6663d2d1e55b101f212f276ad1bb25eadc1) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/FailureMechanismAssemblyCategoriesView.cs (.../FailureMechanismAssemblyCategoriesView.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -109,14 +109,14 @@ { failureMechanismAssemblyCategoriesTable.SetData( getFailureMechanismAssemblyCategoriesFunc().Select( - category => new Tuple( + category => new Tuple( category, AssemblyCategoryGroupColorHelper.GetFailureMechanismAssemblyCategoryGroupColor(category.Group), category.Group)).ToArray()); failureMechanismSectionAssemblyCategoriesTable.SetData( getFailureMechanismSectionAssemblyCategoriesFunc().Select( - category => new Tuple( + category => new Tuple( category, AssemblyCategoryGroupColorHelper.GetFailureMechanismSectionAssemblyCategoryGroupColor(category.Group), category.Group)).ToArray()); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.cs =================================================================== diff -u -r2e1ab6663d2d1e55b101f212f276ad1bb25eadc1 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.cs (.../MacroStabilityOutwardsAssemblyCategoriesView.cs) (revision 2e1ab6663d2d1e55b101f212f276ad1bb25eadc1) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Views/MacroStabilityOutwardsAssemblyCategoriesView.cs (.../MacroStabilityOutwardsAssemblyCategoriesView.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -99,7 +99,7 @@ { failureMechanismSectionAssemblyCategoriesTable.SetData( getFailureMechanismSectionAssemblyCategoriesFunc().Select( - category => new Tuple( + category => new Tuple( category, AssemblyCategoryGroupColorHelper.GetFailureMechanismSectionAssemblyCategoryGroupColor(category.Group), category.Group)).ToArray()); Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyCategoriesTableTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyCategoriesTableTest.cs (.../AssemblyCategoriesTableTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyCategoriesTableTest.cs (.../AssemblyCategoriesTableTest.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -79,7 +79,7 @@ // Setup using (var table = new AssemblyCategoriesTable()) { - Tuple[] categories = + Tuple[] categories = { CreateAssessmentSectionAssemblyCategory(), CreateAssessmentSectionAssemblyCategory(), @@ -100,7 +100,7 @@ // Setup using (var table = new AssemblyCategoriesTable()) { - Tuple[] categories = + Tuple[] categories = { CreateAssessmentSectionAssemblyCategory(), CreateAssessmentSectionAssemblyCategory(), @@ -127,7 +127,7 @@ CreateAssessmentSectionAssemblyCategory() }); - Tuple[] newCategories = + Tuple[] newCategories = { CreateAssessmentSectionAssemblyCategory(), CreateAssessmentSectionAssemblyCategory(), @@ -148,7 +148,7 @@ // Setup using (var table = new AssemblyCategoriesTable()) { - Tuple[] categories = + Tuple[] categories = { CreateAssessmentSectionAssemblyCategory(), CreateAssessmentSectionAssemblyCategory(), @@ -162,7 +162,7 @@ Assert.AreEqual(categories.Length, table.Rows.Count); for (var i = 0; i < table.Rows.Count; i++) { - Tuple category = categories[i]; + Tuple category = categories[i]; DataGridViewCellCollection rowCells = table.Rows[i].Cells; Assert.AreEqual(category.Item3, rowCells[categoryGroupColumnIndex].Value); @@ -173,15 +173,15 @@ } } - private static Tuple CreateAssessmentSectionAssemblyCategory() + private static Tuple CreateAssessmentSectionAssemblyCategory() { var random = new Random(39); - return new Tuple(new TestAssemblyCategory(random.NextDouble(), random.NextDouble()), - Color.FromKnownColor(random.NextEnumValue()), - random.NextEnumValue()); + return new Tuple(new TestAssemblyCategory(random.NextDouble(), random.NextDouble()), + Color.FromKnownColor(random.NextEnumValue()), + random.NextEnumValue()); } - private class TestAssemblyCategory : AssemblyCategory + private class TestAssemblyCategory : AssemblyGroupLimits { public TestAssemblyCategory(double lowerBoundary, double upperBoundary) : base(lowerBoundary, upperBoundary) {} Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyCategoryRowTest.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r5622c01c7f65869743cc23c4f884bc32f970fb44 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyCategoryRowTest.cs (.../AssemblyCategoryRowTest.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Views/AssemblyCategoryRowTest.cs (.../AssemblyCategoryRowTest.cs) (revision 5622c01c7f65869743cc23c4f884bc32f970fb44) @@ -79,7 +79,7 @@ nameof(AssemblyCategoryRow.UpperBoundary)); } - private class TestAssemblyCategory : AssemblyCategory + private class TestAssemblyCategory : AssemblyGroupLimits { public TestAssemblyCategory(double lowerBoundary, double upperBoundary) : base(lowerBoundary, upperBoundary) {}