Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationOptionsPropertyControl.cs (.../DamProjectCalculationOptionsPropertyControl.cs) (revision 6977) @@ -30,14 +30,14 @@ { public partial class DamProjectCalculationOptionsPropertyControl : UserControl, IPropertyControl { - private DamStabilityParameters currentSpecification; + private StabilityParameters currentSpecification; private DamProjectCalculationSpecification currentCalculatioSpecification; public DamProjectCalculationOptionsPropertyControl() { InitializeComponent(); - BindSupport.BindTextAndValue(SearchMethodPanelControl, SearchMethodLabel, SearchMethodCombobox, p => p.SearchMethod); - BindSupport.BindTextAndValue(SearchMethodPanelControl, IsUpliftVanRunOnlyWhenUpliftOccursLabel, IsUpliftVanRunOnlyWhenUpliftOccursCheckBox, p => p.IsUpliftVanRunOnlyWhenUpliftOccurs); + BindSupport.BindTextAndValue(SearchMethodPanelControl, SearchMethodLabel, SearchMethodCombobox, p => p.SearchMethod); + BindSupport.BindTextAndValue(SearchMethodPanelControl, IsUpliftVanRunOnlyWhenUpliftOccursLabel, IsUpliftVanRunOnlyWhenUpliftOccursCheckBox, p => p.IsUpliftVanRunOnlyWhenUpliftOccurs); BindSupport.BindTextAndValue(CircleDefinitionPanelControl, UpliftVanGridCreationLabel, UpliftVanGridCreationComboBox, p => p.UpliftVanGridSizeDetermination); @@ -78,7 +78,7 @@ } set { - if (value is DamStabilityParameters specification) + if (value is StabilityParameters specification) { currentSpecification = specification; BindSupport.Assign(SearchMethodPanelControl, currentSpecification); @@ -97,22 +97,22 @@ private void DataEventPublisher_OnAfterChange(object sender, PublishEventArgs e) { - if (sender is DamStabilityParameters specification) + if (sender is StabilityParameters specification) { currentSpecification = specification; SetSelectedDamCalculationSpecification(); } if (sender is DamProjectCalculationSpecification calculationSpecification) { - currentSpecification = calculationSpecification.DamStabilityParameters; + currentSpecification = calculationSpecification.StabilityParameters; SetSelectedDamCalculationSpecification(); } if (sender is DamProject pd) { currentCalculatioSpecification = pd.DamProjectData.DamProjectCalculationSpecification; - currentSpecification = pd.DamProjectData.DamProjectCalculationSpecification.DamStabilityParameters; + currentSpecification = pd.DamProjectData.DamProjectCalculationSpecification.StabilityParameters; SetSelectedDamCalculationSpecification(); } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ProjectLoader.cs (.../ProjectLoader.cs) (revision 6977) @@ -46,14 +46,14 @@ private static DamProjectCalculationSpecification CreateDefaultFailureMechanismCalculationSpecification( DamProjectData damProjectData) { - var damStabilityParameters = new DamStabilityParameters + var stabilityParameters = new StabilityParameters { SearchMethod = StabilitySearchMethod.Grid }; var damCalculationSpecification = new DamProjectCalculationSpecification { StabilityModelType = StabilityModelType.Bishop, - DamStabilityParameters = damStabilityParameters, + StabilityParameters = stabilityParameters, FailureMechanismSystemType = FailureMechanismSystemType.StabilityOutside }; DamProjectCalculationSpecification.SelectedAnalysisType = AnalysisType.AdaptGeometry; Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillDamUiFromXmlOutputTests.cs (.../FillDamUiFromXmlOutputTests.cs) (revision 6977) @@ -84,7 +84,7 @@ output = DamXmlSerialization.LoadOutputFromXmlString(outputString); var actualDamProjectData = new DamProjectData(); actualDamProjectData.Dike = new Dike(); - actualDamProjectData.DamProjectCalculationSpecification.DamStabilityParameters = new DamStabilityParameters(); + actualDamProjectData.DamProjectCalculationSpecification.StabilityParameters = new StabilityParameters(); Assert.That(() => FillDamUiFromXmlOutput.AddOutputToDamProjectData(actualDamProjectData, output), Throws.InstanceOf()); } @@ -100,8 +100,8 @@ output = DamXmlSerialization.LoadOutputFromXmlString(outputString); var actualDamProjectData = new DamProjectData(); actualDamProjectData.Dike = new Dike(); - actualDamProjectData.DamProjectCalculationSpecification.DamStabilityParameters = - new DamStabilityParameters(); + actualDamProjectData.DamProjectCalculationSpecification.StabilityParameters = + new StabilityParameters(); actualDamProjectData = FillDamUiFromXmlOutput.AddOutputToDamProjectData(actualDamProjectData, output); Assert.That(string.IsNullOrEmpty(actualDamProjectData.DesignCalculations.First().BaseFileName), Is.False, "BaseFileName should be reset"); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs (.../FillXmlInputFromDamUiTests.cs) (revision 6977) @@ -43,6 +43,7 @@ using Soil = Deltares.Geotechnics.Soils.Soil; using SoilProfile1D = Deltares.Geotechnics.Soils.SoilProfile1D; using SoilProfile2D = Deltares.DamEngine.Io.XmlInput.SoilProfile2D; +using StabilityParameters = Deltares.Dam.Data.StabilityParameters; using TimeSerie = Deltares.Dam.Data.TimeSerie; namespace Deltares.Dam.Tests.DamEngineIo @@ -910,8 +911,8 @@ private static void FillStabilityParameters(DamProjectData damProjectData) { // Note: DamProjectCalculationSpecification created and filled by FillAnalysisSpecification - DamStabilityParameters currentSpecification = - damProjectData.DamProjectCalculationSpecification.DamStabilityParameters; + StabilityParameters currentSpecification = + damProjectData.DamProjectCalculationSpecification.StabilityParameters; currentSpecification.SearchMethod = StabilitySearchMethod.Grid; currentSpecification.IsUpliftVanRunOnlyWhenUpliftOccurs = false; currentSpecification.SlipCircleDefinition = new SlipCircleDefinition Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillXmlInputFromDamUi.cs (.../FillXmlInputFromDamUi.cs) (revision 6977) @@ -367,7 +367,7 @@ private static void TransferAnalysisSpecification(DamProjectData damProjectData, Input input) { input.DamProjectType = ConversionHelper.ConvertToInputDamProjectType(damProjectData.DamProjectType); - if (damProjectData.DamProjectCalculationSpecification.DamStabilityParameters != null) + if (damProjectData.DamProjectCalculationSpecification.StabilityParameters != null) { input.FailureMechanismSystemType = ConversionHelper.ConvertToInputFailureMechanismSystemType(damProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType); @@ -394,9 +394,9 @@ private static void TransferStabilityParameters(DamProjectData damProjectData, Input input) { - if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.DamStabilityParameters != null) + if (damProjectData.DamProjectCalculationSpecification != null && damProjectData.DamProjectCalculationSpecification.StabilityParameters != null) { - DamStabilityParameters curSpec = damProjectData.DamProjectCalculationSpecification.DamStabilityParameters; + StabilityParameters curSpec = damProjectData.DamProjectCalculationSpecification.StabilityParameters; input.StabilityParameters = new DamEngine.Io.XmlInput.StabilityParameters(); input.StabilityParameters.SearchMethod = ConversionHelper.ConvertToInputSearchMethod(curSpec.SearchMethod); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs =================================================================== diff -u -r6968 -r6977 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 6968) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectCalculationSpecification.cs (.../DamProjectCalculationSpecification.cs) (revision 6977) @@ -45,13 +45,13 @@ private PipingModelType pipingModelType = PipingModelType.Wti2017; private StabilityModelType stabilityModelType = StabilityModelType.UpliftVan; private Enum calculationModel = StabilityModelType.UpliftVan; - private DamStabilityParameters damStabilityParameters = new(); + private StabilityParameters stabilityParameters = new(); private Boolean firstTime = true; public DamProjectCalculationSpecification() { failureMechanismSystemType = FailureMechanismSystemType.StabilityInside; - damStabilityParameters.SlipCircleDefinition.Specification = this; + stabilityParameters.SlipCircleDefinition.Specification = this; DataEventPublisher.OnAfterChange += DataEventPublisher_OnAfterChange; } @@ -60,9 +60,9 @@ { var damFailureMechanismCalculation = new DamProjectCalculationSpecification(); - if (damStabilityParameters != null) + if (stabilityParameters != null) { - damFailureMechanismCalculation.DamStabilityParameters = damStabilityParameters.Clone(); + damFailureMechanismCalculation.StabilityParameters = stabilityParameters.Clone(); } damFailureMechanismCalculation.Assign(this); @@ -87,15 +87,15 @@ /// /// The stability parameters. /// - public DamStabilityParameters DamStabilityParameters + public StabilityParameters StabilityParameters { get { - return damStabilityParameters; + return stabilityParameters; } set { - damStabilityParameters = value; + stabilityParameters = value; DataEventPublisher.AfterChange(this); } } @@ -206,7 +206,7 @@ stabilityModelType = (StabilityModelType) value; if (stabilityModelType != StabilityModelType.Bishop) { - damStabilityParameters.SearchMethod = StabilitySearchMethod.BeeSwarm; + stabilityParameters.SearchMethod = StabilitySearchMethod.BeeSwarm; } } @@ -280,7 +280,7 @@ switch (property) { case "SelectedAnalysisType": return Location.DamProjectType == DamProjectType.Design; - case "DamStabilityParameters": return FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || + case "StabilityParameters": return FailureMechanismSystemType == FailureMechanismSystemType.StabilityInside || FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside; default: return true; } @@ -301,7 +301,7 @@ private void DataEventPublisher_OnAfterChange(object sender, PublishEventArgs e) { - if (sender == damStabilityParameters) + if (sender == stabilityParameters) { DataEventPublisher.AfterChange(this); } @@ -313,13 +313,13 @@ calculationModel = damFailureMechanismCalculation.CalculationModel; pipingModelType = damFailureMechanismCalculation.PipingModelType; stabilityModelType = damFailureMechanismCalculation.StabilityModelType; - if (DamStabilityParameters != null) + if (StabilityParameters != null) { - DamStabilityParameters.Assign(damFailureMechanismCalculation.DamStabilityParameters); + StabilityParameters.Assign(damFailureMechanismCalculation.StabilityParameters); } else { - DamStabilityParameters = null; + StabilityParameters = null; } } Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamEngineIo/FillDamUiFromXmlInput.cs (.../FillDamUiFromXmlInput.cs) (revision 6977) @@ -215,7 +215,7 @@ { if (damProjectData.DamProjectCalculationSpecification != null) { - DamStabilityParameters curSpec = damProjectData.DamProjectCalculationSpecification.DamStabilityParameters; + StabilityParameters curSpec = damProjectData.DamProjectCalculationSpecification.StabilityParameters; if (curSpec != null) { curSpec.SearchMethod = ConversionHelper.ConvertToSearchMethod(input.StabilityParameters.SearchMethod); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.TestHelper/ComputeHelper.cs (.../ComputeHelper.cs) (revision 6977) @@ -66,7 +66,7 @@ // Specify calculation damProjectData.MaxCalculationCores = computeStabilityProjectParameters.MaxCores; damProjectData.DamProjectCalculationSpecification.StabilityModelType = computeStabilityProjectParameters.ModelType; - damProjectData.DamProjectCalculationSpecification.DamStabilityParameters.SearchMethod = StabilitySearchMethod.Grid; + damProjectData.DamProjectCalculationSpecification.StabilityParameters.SearchMethod = StabilitySearchMethod.Grid; if (computeStabilityProjectParameters.IsStabilityInside) { damProjectData.DamProjectCalculationSpecification.FailureMechanismSystemType = FailureMechanismSystemType.StabilityInside; Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs (.../DamProjectCalculationSpecificationPropertyControl.cs) (revision 6977) @@ -64,7 +64,6 @@ if (sender is DamProject pd) { damProjectCalculationSpecification = pd.DamProjectData.DamProjectCalculationSpecification; - //currentSpecification = pd.DamProjectData.DamProjectCalculationSpecification.DamStabilityParameters; SetSelectedDamCalculationSpecification(); } } @@ -74,7 +73,7 @@ DamProjectCalculationSpecification selection = damProjectCalculationSpecification; if (selection != null) { - selection.DamStabilityParameters.SlipCircleDefinition.Specification = selection; + selection.StabilityParameters.SlipCircleDefinition.Specification = selection; BindSupport.Assign(damProjectCalculationOptionsPropertyControl1, selection); if (firstEdit) { Fisheye: Tag 6977 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamStabilityParametersTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 6946 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/StabilityParameters.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamProjectDataTests.cs =================================================================== diff -u -r6964 -r6977 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamProjectDataTests.cs (.../DamProjectDataTests.cs) (revision 6964) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamProjectDataTests.cs (.../DamProjectDataTests.cs) (revision 6977) @@ -135,7 +135,7 @@ }; damProjectData.DamProjectCalculationSpecification = damCalculationSpecification; - damProjectData.DamProjectCalculationSpecification.DamStabilityParameters = new DamStabilityParameters(); + damProjectData.DamProjectCalculationSpecification.StabilityParameters = new StabilityParameters(); } private static DamSoil CreateValidDamSoil() Fisheye: Tag 6977 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamStabilityParameters.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamStabilityParametersTest.cs =================================================================== diff -u -r6968 -r6977 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamStabilityParametersTest.cs (.../DamStabilityParametersTest.cs) (revision 6968) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data.Tests/DamStabilityParametersTest.cs (.../StabilityParametersTest.cs) (revision 6977) @@ -25,16 +25,16 @@ namespace Deltares.Dam.Tests { [TestFixture] - public class DamStabilityParametersTest + public class StabilityParametersTest { [Test] public void Constructor_ExpectedValues() { // Call - var parameters = new DamStabilityParameters(); + var parameters = new StabilityParameters(); // Assert - Assert.That(parameters, Is.InstanceOf>()); + Assert.That(parameters, Is.InstanceOf>()); Assert.That(parameters, Is.InstanceOf()); Assert.Multiple(() =>