Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs =================================================================== diff -u -r5702 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5702) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/MStabParameters.cs (.../MStabParameters.cs) (revision 5793) @@ -47,31 +47,6 @@ } } -public class HorizontalBalanceArea : IAssignable, ICloneable -{ - public double XLeft { get; set; } - public double XRight { get; set; } - public double YTop { get; set; } - public double YBottom { get; set; } - public int PlaneCount { get; set; } - - public void Assign(HorizontalBalanceArea horizontalBalanceArea) - { - XLeft = horizontalBalanceArea.XLeft; - XRight = horizontalBalanceArea.XRight; - YTop = horizontalBalanceArea.YTop; - YBottom = horizontalBalanceArea.YBottom; - PlaneCount = horizontalBalanceArea.PlaneCount; - } - - public HorizontalBalanceArea Clone() - { - var horizontalBalanceArea = new HorizontalBalanceArea(); - horizontalBalanceArea.Assign(this); - return horizontalBalanceArea; - } -} - public class SlipCircleDefinition : IAssignable, ICloneable { public double XCoordinateLowestUpliftFactorPoint { get; set; } @@ -232,62 +207,33 @@ { public MStabParameters() { - IsCalculateAllStabilityProjectsAtOnce = true; - IsOverrulePlLineCreationMethod = false; - PlLineCreationMethod = PlLineCreationMethod.ExpertKnowledgeRRD; Model = MStabModelType.Bishop; SearchMethod = MStabSearchMethod.Grid; GridPosition = MStabGridPosition.Right; CalculationOptions = new MStabCalculationOptions(); GeometryCreationOptions = new MStabGeometryCreationOptions(); SheetPiling = null; - HorizontalBalanceArea = new HorizontalBalanceArea(); SlipCircleDefinition = new SlipCircleDefinition(); } - public bool IsCalculateAllStabilityProjectsAtOnce { get; set; } - - // Normally PLLine creation is specified per location. - // If IsOverrulePLLineCreationMethod is set to true the settings in the locations will be - // overruled with the value in PLLineCreationMethod - public bool IsOverrulePlLineCreationMethod { get; set; } - public PlLineCreationMethod PlLineCreationMethod { get; set; } - public MStabModelType Model { get; set; } - - public MStabShearStrength ShearStrength { get; set; } - public MStabSearchMethod SearchMethod { get; set; } public bool IsProbabilistic { get; set; } public string ProjectFileName { get; set; } public string SoilDatabaseName { get; set; } public MStabForbiddenZone ForbiddenZone { get; set; } public MStabGeometryCreationOptions GeometryCreationOptions { get; set; } public SheetPiling SheetPiling { get; set; } - public HorizontalBalanceArea HorizontalBalanceArea { get; set; } [Validate] public SlipCircleDefinition SlipCircleDefinition { get; set; } public MStabCalculationOptions CalculationOptions { get; set; } public MStabGridPosition GridPosition { get; set; } - public MStabZonesType ZonesType - { - get - { - return CalculationOptions.ZonesType; - } - set - { - CalculationOptions.ZonesType = value; - } - } - public void Assign(MStabParameters mstabParameters) { Model = mstabParameters.Model; - ShearStrength = mstabParameters.ShearStrength; SearchMethod = mstabParameters.SearchMethod; IsProbabilistic = mstabParameters.IsProbabilistic; GridPosition = mstabParameters.GridPosition; @@ -329,15 +275,6 @@ SheetPiling = null; } - if (HorizontalBalanceArea != null) - { - HorizontalBalanceArea.Assign(mstabParameters.HorizontalBalanceArea); - } - else - { - HorizontalBalanceArea = null; - } - SoilDatabaseName = mstabParameters.SoilDatabaseName; if (SlipCircleDefinition != null) { @@ -366,12 +303,7 @@ { mstabParameters.SheetPiling = SheetPiling.Clone(); } - - if (HorizontalBalanceArea != null) - { - mstabParameters.HorizontalBalanceArea = HorizontalBalanceArea.Clone(); - } - + if (SlipCircleDefinition != null) { mstabParameters.SlipCircleDefinition = SlipCircleDefinition.Clone(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs =================================================================== diff -u -r5155 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5155) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/MacroStabilityCommon/MacroStabilityIo/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5793) @@ -125,9 +125,6 @@ var translationTable = new Dictionary { { - SearchAlgorithm.Genetic, MStabSearchMethod.GeneticAlgorithm - }, - { SearchAlgorithm.Grid, MStabSearchMethod.Grid }, { @@ -146,9 +143,6 @@ var translationTable = new Dictionary { { - MStabSearchMethod.GeneticAlgorithm, SearchAlgorithm.Genetic - }, - { MStabSearchMethod.Grid, SearchAlgorithm.Grid }, { Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs =================================================================== diff -u -r5662 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5662) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5793) @@ -289,7 +289,6 @@ [Test] [TestCase(MStabSearchMethod.Grid, ConversionHelper.InputSearchMethodGrid)] - [TestCase(MStabSearchMethod.GeneticAlgorithm, ConversionHelper.InputSearchMethodGenetic)] [TestCase(MStabSearchMethod.BeeSwarm, ConversionHelper.InputSearchMethodBeeSwarm)] public void CanConvertToInputSearchMethod(MStabSearchMethod searchMethod, int inputSearchMethod) { @@ -298,7 +297,6 @@ [Test] [TestCase(ConversionHelper.InputSearchMethodGrid, MStabSearchMethod.Grid)] - [TestCase(ConversionHelper.InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm)] [TestCase(ConversionHelper.InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm)] public void CanConvertToSearchMethod(int inputSearchMethod, MStabSearchMethod searchMethod) { @@ -412,15 +410,8 @@ [Test] [TestCase(MStabModelType.Bishop, ConversionHelper.MStabModelTypeBishop)] - [TestCase(MStabModelType.Spencer, ConversionHelper.MStabModelTypeSpencer)] - [TestCase(MStabModelType.Fellenius, ConversionHelper.MStabModelTypeFellenius)] [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] - [TestCase(MStabModelType.UpliftSpencer, ConversionHelper.MStabModelTypeUpliftSpencer)] - [TestCase(MStabModelType.BishopRandomField, ConversionHelper.MStabModelTypeBishopRandomField)] - [TestCase(MStabModelType.HorizontalBalance, ConversionHelper.MStabModelTypeHorizontalBalance)] [TestCase(MStabModelType.BishopUpliftVan, ConversionHelper.MStabModelTypeBishopUpliftVan)] - [TestCase(MStabModelType.SpencerHigh, ConversionHelper.MStabModelTypeSpencerHigh)] - [TestCase(MStabModelType.SpencerLow, ConversionHelper.MStabModelTypeSpencerLow)] [TestCase(MStabModelType.UpliftVan, ConversionHelper.MStabModelTypeUpliftVan)] public void CanConvertToOutputMStabModelType(MStabModelType mStabModelType, int outputMStabModelType) { @@ -429,15 +420,8 @@ [Test] [TestCase(ConversionHelper.MStabModelTypeBishop, MStabModelType.Bishop)] - [TestCase(ConversionHelper.MStabModelTypeSpencer, MStabModelType.Spencer)] - [TestCase(ConversionHelper.MStabModelTypeFellenius, MStabModelType.Fellenius)] [TestCase(ConversionHelper.MStabModelTypeUpliftVan, MStabModelType.UpliftVan)] - [TestCase(ConversionHelper.MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer)] - [TestCase(ConversionHelper.MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField)] - [TestCase(ConversionHelper.MStabModelTypeHorizontalBalance, MStabModelType.HorizontalBalance)] [TestCase(ConversionHelper.MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan)] - [TestCase(ConversionHelper.MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh)] - [TestCase(ConversionHelper.MStabModelTypeSpencerLow, MStabModelType.SpencerLow)] public void CanConvertToMStabModelType(int outputMStabModelType, MStabModelType mStabModelType) { Assert.That(ConversionHelper.ConvertToMStabModelType(outputMStabModelType), Is.EqualTo(mStabModelType)); Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs =================================================================== diff -u -r5720 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 5720) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/StabilityEnumerations.cs (.../StabilityEnumerations.cs) (revision 5793) @@ -27,17 +27,8 @@ public enum MStabModelType { Bishop, - Spencer, - Fellenius, UpliftVan, - UpliftSpencer, - BishopRandomField, - HorizontalBalance, - BishopUpliftVan, - SpencerHigh, // #Bka added SpencerHigh/SpencerLow as quick fix. Should be replaced with options for Spencer later! These enums should be removed. - SpencerLow, - BishopWti, // #Bka: for now, only UpliftVanWti is to be used of all Wti options. - UpliftSpencerWti + BishopUpliftVan } /// @@ -53,25 +44,11 @@ } /// -/// Types of shear strength model. -/// -public enum MStabShearStrength -{ - CPhi, - StressTables, - CuCalculated, - CuMeasured, - CuGradient, - Default -} - -/// /// Types of search method. /// public enum MStabSearchMethod { Grid, - GeneticAlgorithm, BeeSwarm } Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs =================================================================== diff -u -r5508 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 5508) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Dike.cs (.../Dike.cs) (revision 5793) @@ -83,8 +83,6 @@ public bool IsRemoveStiFiles { get; set; } - public MStabShearStrength ShearStrengthModel { get; set; } - public virtual string Name { get; set; } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs =================================================================== diff -u -r5155 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5155) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/ConversionHelperTests.cs (.../ConversionHelperTests.cs) (revision 5793) @@ -133,7 +133,6 @@ [Test] [TestCase(SearchAlgorithm.Grid, MStabSearchMethod.Grid)] - [TestCase(SearchAlgorithm.Genetic, MStabSearchMethod.GeneticAlgorithm)] [TestCase(SearchAlgorithm.BeeswarmAndLevenbergMarquardt, MStabSearchMethod.BeeSwarm)] public void CanConvertToDamSearchMethod(SearchAlgorithm searchAlgorithm, MStabSearchMethod mStabSearchMethod) { @@ -150,7 +149,6 @@ [Test] [TestCase(MStabSearchMethod.Grid, SearchAlgorithm.Grid)] - [TestCase(MStabSearchMethod.GeneticAlgorithm, SearchAlgorithm.Genetic)] [TestCase(MStabSearchMethod.BeeSwarm, SearchAlgorithm.BeeswarmAndLevenbergMarquardt)] public void ConvertToMacroStabilitySearchMethod(MStabSearchMethod mStabSearchMethod, SearchAlgorithm searchAlgorithm) { @@ -184,31 +182,13 @@ Assert.That(ConversionHelper.ConvertToModelOptionsOutput(mStabModelType), Is.EqualTo(modelOption)); } - [TestCase(MStabModelType.UpliftSpencer)] - [TestCase(MStabModelType.SpencerLow)] - [TestCase(MStabModelType.SpencerHigh)] [TestCase(MStabModelType.BishopUpliftVan)] - [TestCase(MStabModelType.BishopRandomField)] - [TestCase(MStabModelType.Fellenius)] - [TestCase(MStabModelType.BishopWti)] - [TestCase(MStabModelType.HorizontalBalance)] - [TestCase(MStabModelType.Spencer)] - [TestCase(MStabModelType.UpliftSpencerWti)] public void CanConvertToModelOptionsHandleException(MStabModelType mStabModelType) { Assert.That(() => ConversionHelper.ConvertToModelOptions(mStabModelType), Throws.InstanceOf()); } - [TestCase(MStabModelType.UpliftSpencer)] - [TestCase(MStabModelType.SpencerLow)] - [TestCase(MStabModelType.SpencerHigh)] [TestCase(MStabModelType.BishopUpliftVan)] - [TestCase(MStabModelType.BishopRandomField)] - [TestCase(MStabModelType.Fellenius)] - [TestCase(MStabModelType.BishopWti)] - [TestCase(MStabModelType.HorizontalBalance)] - [TestCase(MStabModelType.Spencer)] - [TestCase(MStabModelType.UpliftSpencerWti)] public void CanConvertToModelOptionsOutputHandleException(MStabModelType mStabModelType) { Assert.That(() => ConversionHelper.ConvertToModelOptionsOutput(mStabModelType), Throws.InstanceOf()); Index: DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs =================================================================== diff -u -r5664 -r5793 --- DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5664) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface/ConversionHelper.cs (.../ConversionHelper.cs) (revision 5793) @@ -981,9 +981,6 @@ MStabSearchMethod.Grid, InputSearchMethodGrid }, { - MStabSearchMethod.GeneticAlgorithm, InputSearchMethodGenetic - }, - { MStabSearchMethod.BeeSwarm, InputSearchMethodBeeSwarm } }; @@ -1003,9 +1000,6 @@ InputSearchMethodGrid, MStabSearchMethod.Grid }, { - InputSearchMethodGenetic, MStabSearchMethod.GeneticAlgorithm - }, - { InputSearchMethodBeeSwarm, MStabSearchMethod.BeeSwarm } }; @@ -1187,7 +1181,7 @@ } /// - /// Converts the dilatancy type to soil dilatancy dilatancy. + /// Converts the dilatancy type to soil dilatancy. /// /// Type of the dilatancy. /// @@ -1281,31 +1275,10 @@ MStabModelTypeBishop, MStabModelType.Bishop }, { - MStabModelTypeSpencer, MStabModelType.Spencer - }, - { - MStabModelTypeFellenius, MStabModelType.Fellenius - }, - { MStabModelTypeUpliftVan, MStabModelType.UpliftVan }, { - MStabModelTypeUpliftSpencer, MStabModelType.UpliftSpencer - }, - { - MStabModelTypeBishopRandomField, MStabModelType.BishopRandomField - }, - { - MStabModelTypeHorizontalBalance, MStabModelType.HorizontalBalance - }, - { MStabModelTypeBishopUpliftVan, MStabModelType.BishopUpliftVan - }, - { - MStabModelTypeSpencerHigh, MStabModelType.SpencerHigh - }, - { - MStabModelTypeSpencerLow, MStabModelType.SpencerLow } }; return translationTable[inputMStabModelType]; @@ -1324,31 +1297,10 @@ MStabModelType.Bishop, MStabModelTypeBishop }, { - MStabModelType.Spencer, MStabModelTypeSpencer - }, - { - MStabModelType.Fellenius, MStabModelTypeFellenius - }, - { MStabModelType.UpliftVan, MStabModelTypeUpliftVan }, { - MStabModelType.UpliftSpencer, MStabModelTypeUpliftSpencer - }, - { - MStabModelType.BishopRandomField, MStabModelTypeBishopRandomField - }, - { - MStabModelType.HorizontalBalance, MStabModelTypeHorizontalBalance - }, - { MStabModelType.BishopUpliftVan, MStabModelTypeBishopUpliftVan - }, - { - MStabModelType.SpencerHigh, MStabModelTypeSpencerHigh - }, - { - MStabModelType.SpencerLow, MStabModelTypeSpencerLow } }; return translationTable[mStabModelType];