Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs =================================================================== diff -u -r3522 -r3617 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 3617) @@ -71,7 +71,8 @@ public enum MStabSearchMethod { Grid, - GeneticAlgorithm + GeneticAlgorithm, + BeeSwarm } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs =================================================================== diff -u -r3522 -r3617 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamInput.cs (.../DamInput.cs) (revision 3617) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. +// Copyright (C) Stichting Deltares 2022. All rights reserved. // // This file is part of the Dam Engine. // Index: DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs =================================================================== diff -u -r3522 -r3617 --- DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Io/DamOutput.cs (.../DamOutput.cs) (revision 3617) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2021. All rights reserved. +// Copyright (C) Stichting Deltares 2022. All rights reserved. // // This file is part of the Dam Engine. // Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs =================================================================== diff -u -r3522 -r3617 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3617) @@ -50,14 +50,15 @@ /// public static MStabSearchMethod ConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm) { - if (searchAlgorithm != SearchAlgorithm.Grid && searchAlgorithm != SearchAlgorithm.Genetic) + if (searchAlgorithm != SearchAlgorithm.Grid && searchAlgorithm != SearchAlgorithm.Genetic && searchAlgorithm != SearchAlgorithm.Beeswarm) { throw new ArgumentException(String.Format("Unsupported search algorithm: {0}", searchAlgorithm)); } var translationTable = new Dictionary() { {SearchAlgorithm.Genetic, MStabSearchMethod.GeneticAlgorithm}, - {SearchAlgorithm.Grid, MStabSearchMethod.Grid} + {SearchAlgorithm.Grid, MStabSearchMethod.Grid}, + {SearchAlgorithm.Beeswarm, MStabSearchMethod.BeeSwarm} }; return translationTable[searchAlgorithm]; } @@ -71,7 +72,8 @@ var translationTable = new Dictionary() { {MStabSearchMethod.GeneticAlgorithm, SearchAlgorithm.Genetic}, - {MStabSearchMethod.Grid, SearchAlgorithm.Grid} + {MStabSearchMethod.Grid, SearchAlgorithm.Grid}, + {MStabSearchMethod.BeeSwarm, SearchAlgorithm.Beeswarm} }; return translationTable[mStabSearchMethod]; } Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r3522 -r3617 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3522) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 3617) @@ -597,6 +597,11 @@ public const int InputSearchMethodGenetic = 1; /// + /// The input search method BeeSwarm + /// + public const int InputSearchMethodBeeSwarm = 2; + + /// /// Converts to input search method. /// /// The search method. @@ -606,7 +611,8 @@ var translationTable = new Dictionary() { {MStabSearchMethod.Grid, InputSearchMethodGrid}, - {MStabSearchMethod.GeneticAlgorithm, InputSearchMethodGenetic} + {MStabSearchMethod.GeneticAlgorithm, InputSearchMethodGenetic}, + {MStabSearchMethod.BeeSwarm, InputSearchMethodBeeSwarm} }; return translationTable[searchMethod]; } @@ -621,7 +627,8 @@ var translationTable = new Dictionary() { {InputSearchMethodGrid, MStabSearchMethod.Grid}, - {InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm} + {InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm}, + {InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm} }; return translationTable[searchMethod]; } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r3520 -r3617 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3520) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3617) @@ -43,13 +43,14 @@ [Test] [TestCase(SearchAlgorithm.Grid, MStabSearchMethod.Grid)] [TestCase(SearchAlgorithm.Genetic, MStabSearchMethod.GeneticAlgorithm)] + [TestCase(SearchAlgorithm.Beeswarm, MStabSearchMethod.BeeSwarm)] public void CanConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm, MStabSearchMethod mStabSearchMethod) { Assert.AreEqual(mStabSearchMethod, ConversionHelper.ConvertToDamSearchMethod(searchAlgorithm)); } [ExpectedException(typeof(ArgumentException))] - [TestCase(SearchAlgorithm.Beeswarm)] + [TestCase(SearchAlgorithm.BeeswarmAndLevenbergMarquardt)] [TestCase(SearchAlgorithm.LevenbergMarquardt)] [TestCase(SearchAlgorithm.Single)] public void CanConvertToDamSearchMethodHandleException(SearchAlgorithm searchAlgorithm) @@ -60,6 +61,7 @@ [Test] [TestCase(MStabSearchMethod.Grid, SearchAlgorithm.Grid)] [TestCase(MStabSearchMethod.GeneticAlgorithm, SearchAlgorithm.Genetic)] + [TestCase(MStabSearchMethod.BeeSwarm, SearchAlgorithm.Beeswarm)] public void ConvertToMacroStabilitySearchMethod(MStabSearchMethod mStabSearchMethod, SearchAlgorithm searchAlgorithm) { Assert.AreEqual(searchAlgorithm, ConversionHelper.ConvertToMacroStabilitySearchMethod(mStabSearchMethod)); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r3520 -r3617 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3520) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 3617) @@ -295,6 +295,7 @@ [Test] [TestCase(MStabSearchMethod.Grid, ConversionHelper.InputSearchMethodGrid)] [TestCase(MStabSearchMethod.GeneticAlgorithm, ConversionHelper.InputSearchMethodGenetic)] + [TestCase(MStabSearchMethod.BeeSwarm, ConversionHelper.InputSearchMethodBeeSwarm)] public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, int inputSearchMethod) { Assert.AreEqual(inputSearchMethod, ConversionHelper.ConvertToInputSearchMethod(searchMethod)); @@ -303,6 +304,7 @@ [Test] [TestCase(ConversionHelper.InputSearchMethodGrid, MStabSearchMethod.Grid)] [TestCase(ConversionHelper.InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm)] + [TestCase(ConversionHelper.InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm)] public void CanConvertToSearchMethod(int inputSearchMethod, MStabSearchMethod searchMethod) { Assert.AreEqual(searchMethod, ConversionHelper.ConvertToSearchMethod(inputSearchMethod));