Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs =================================================================== diff -u -r106 -r107 --- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 106) +++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs (.../DSoilModelContext.cs) (revision 107) @@ -43,204 +43,6 @@ StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), }; - - private readonly HashSet dGeoStabilityProperties = new HashSet - { - // "AbovePhreaticLevel", - "AbovePhreaticLevelStochast", - // "BelowPhreaticLevel", - "BelowPhreaticLevelStochast", - // "Cohesion", - "CohesionStochast", - //"CuBottom", - //"CuGradient", - //"CuTop", - // "FrictionAngle", - "FrictionAngleStochast", - //"OCR", - //"POP", - "RatioCuPc", - //"RatioCuPcActive", - //"RatioCuPcPassive", - //"RestSlope", - "ShearStrengthModel", - //"StressTable" - "StrengthIncreaseExponentStochast" - }; - - private readonly HashSet dGeoStabilityCPhiModelProperties = new HashSet - { - "Cohesion", - "FrictionAngle", - "ShearStrengthModel", - "StressTable" - }; - - private readonly HashSet dGeoStabilitySuMeasuredProperties = new HashSet - { - "CuBottom", - "CuTop", - "ShearStrengthModel", - "StressTable" - }; - - private readonly HashSet dGeoStabilitySuCalculatedProperties = new HashSet - { - "OCR", - "POP", - "RatioCuPc", - "RatioCuPcActive", - "RatioCuPcPassive", - "ShearStrengthModel", - "StressTable" - }; - - private readonly HashSet dGeoStabilitySuGradientProperties = new HashSet - { - "CuGradient", - "CuTop", - "ShearStrengthModel" - }; - - private readonly HashSet shearStrengthParametersProperties = new HashSet - { - "BondStressTable", - "Cohesion", - "CohesionStochast", - "CuActiveBottom", - "CuActiveBottomStochast", - "CuActiveTop", - "CuActiveTopStochast", - "CuBottom", - "CuBottomStochast", - "CuGradient", - "CuGradientStochast", - "CuPassiveBottom", - "CuPassiveBottomStochast", - "CuPassiveTop", - "CuPassiveTopStochast", - "CuTop", - "CuTopStochast", - "FrictionAngle", - "OCR", - "OCRStochast", - "POP", - "POPStochast", - "RatioCuPc", - "RatioCuPcActive", - "RatioCuPcActiveStochast", - "RatioCuPcPassive", - "RatioCuPcPassiveStochast", - "RatioCuPcStochast", - "StressTable" - }; - - private readonly HashSet shearStrengthInputProperties = new HashSet - { - "InputModeReliabilityAnalysisOption" - }; - - private readonly HashSet shearStrengthModelProperties = new HashSet - { - "DilatancyType", - "ShearStrengthModel", - "StrengthIncreaseExponent", - "StrengthIncreaseExponentStochast", - "UsePop" - }; - - private readonly HashSet unitWeightFilterProperties = new HashSet - { - "AbovePhreaticLevel", - "AbovePhreaticLevelStochast", - "BelowPhreaticLevel", - "BelowPhreaticLevelStochast", - "DryUnitWeight" - }; - - private readonly HashSet probabilisticProperties = new HashSet - { - "ExcessPorePressure", - "PorePressureFactor", - "UseDefaultProbabilisticValues" - }; - - private readonly HashSet stiffnessParametersProperties = new HashSet - { - "EMod", - "FrictionAngleStochast" - }; - - private readonly HashSet bishopProbabilisticProperties = new HashSet - { - "CorrelationCPhi", - "Cu", - "CuStochast", - "FormReferencePn", - "Pn", - "PnStochast", - "RRatio", - "RRatioStochast" - }; - - private readonly HashSet pipingProperties = new HashSet - { - "AbovePhreaticLevelStochast", - "BelowPhreaticLevelStochast", - "DryUnitWeight", - "DiameterD70Stochast", - "DiameterD50Stochast", - "PermeabKxStochast", - "WhitesConstant", - "BeddingAngle" -// "BeddingAngleStochast", -// "DiameterD70", -// "DiameterD90", -// "PermeabKx", -// "WhitesConstantStochast" - }; - - private readonly HashSet flowSlideGlobalDetailedProperties = new HashSet - { - "DiameterD15", - "DiameterD50", - "DiameterD50Stochast" - }; - - private readonly HashSet flowSlideAdvancedLiquefactionProperties = new HashSet - { - "Evoldm", - "FrictionAngle", - "GammaKorrel", - "Ks0", - "MaxPorosity", - "MinPorosity", - "ParM", - "ParR", - "ParS2", - "ParU", - "ParV", - "Porosity", - "RelativeDensity" - }; - - private readonly HashSet flowSlideAdvancedBreachingProperties = new HashSet - { - "AlphaGrd", - "CalculationPoints", - "ComputedPermeability", - "DiameterD15", - "DiameterD50", - "DiameterD50Stochast", - "Equilibrium", - "FlowWidth", - "FrictionAngle", - "GammaKorrel", - "Iterations", - "Porosity", - "Vwal" - }; - #endregion /// @@ -451,70 +253,6 @@ { return pipingRingtoetsProperties; } - case UserColumnFilters.DGeoStability: - { - return dGeoStabilityProperties; - } - case UserColumnFilters.DGeoStabilityCPhiModel: - { - return dGeoStabilityCPhiModelProperties; - } - case UserColumnFilters.DGeoStabilitySuMeasured: - { - return dGeoStabilitySuMeasuredProperties; - } - case UserColumnFilters.DGeoStabilitySuCalculated: - { - return dGeoStabilitySuCalculatedProperties; - } - case UserColumnFilters.DGeoStabilitySuGradient: - { - return dGeoStabilitySuGradientProperties; - } - case UserColumnFilters.ShearStrengthParameters: - { - return shearStrengthParametersProperties; - } - case UserColumnFilters.ShearStrengthInput: - { - return shearStrengthInputProperties; - } - case UserColumnFilters.ShearStrengthModel: - { - return shearStrengthModelProperties; - } - case UserColumnFilters.UnitWeightFilter: - { - return unitWeightFilterProperties; - } - case UserColumnFilters.Probabilistic: - { - return probabilisticProperties; - } - case UserColumnFilters.StiffnessParameters: - { - return stiffnessParametersProperties; - } - case UserColumnFilters.BishopProbabilistic: - { - return bishopProbabilisticProperties; - } - case UserColumnFilters.Piping: - { - return pipingProperties; - } - case UserColumnFilters.FlowSlideGlobalDetailed: - { - return flowSlideGlobalDetailedProperties; - } - case UserColumnFilters.FlowSlideAdvancedLiquefaction: - { - return flowSlideAdvancedLiquefactionProperties; - } - case UserColumnFilters.FlowSlideAdvancedBreaching: - { - return flowSlideAdvancedBreachingProperties; - } } } @@ -523,14 +261,16 @@ private bool? VisibleAccordingSoilUserFilter(string member) { + if (alwaysVisibleProperties.Contains(member)) + { + return true; + } var filteredProperties = GetFilteredProperties(SoilUserFilter); if (filteredProperties == null) { return null; } - filteredProperties.UnionWith(alwaysVisibleProperties); - return filteredProperties.Contains(member); } Index: src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs =================================================================== diff -u -r7 -r107 --- src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 7) +++ src/Deltares.DSoilModel.Tests/DSoilModelContextTest.cs (.../DSoilModelContextTest.cs) (revision 107) @@ -33,10 +33,8 @@ #endregion - [TestCase(UserColumnFilters.DGeoStability, Mechanism.Stability)] - [TestCase(UserColumnFilters.Piping, Mechanism.Piping), Category("Work_In_Progress")] - [TestCase(UserColumnFilters.Piping, Mechanism.PipingUpliftGradient), Category("Work_In_Progress")] - [TestCase(UserColumnFilters.FlowSlideGlobalDetailed, Mechanism.FlowSlide)] + [TestCase(UserColumnFilters.MacrostabilityBasicModule, Mechanism.Stability)] + [TestCase(UserColumnFilters.PipingRingtoets, Mechanism.Piping)] public void SoilFiltering_UserColumnFilterForMechanism_HasMembersWithSameMechanism(UserColumnFilters filter, Mechanism mechanism) { var membersInFilterDefinition = GetFilterDefinition(filter); @@ -113,309 +111,42 @@ } } - [Test, Category("Work_In_Progress")] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterDGeoStability() - { - var visibleProperties = new List - { - "AbovePhreaticLevel", - "AbovePhreaticLevelStochast", - "BelowPhreaticLevel", - "BelowPhreaticLevelStochast", - "Cohesion", - "CuBottom", - "CuGradient", - "CuTop", - "FrictionAngle", - "OCR", - "POP", - "RatioCuPc", - "RatioCuPcActive", - "RatioCuPcPassive", - "RestSlope", - "ShearStrengthModel", - "StressTable" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.DGeoStability, visibleProperties); - } - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterDGeoStabilityCPhiModel() + public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterMacrostabilityBasicModule() { var visibleProperties = new List { - "Cohesion", - "FrictionAngle", - "ShearStrengthModel", - "StressTable" + StaticReflection.GetMemberName(s => s.AbovePhreaticLevel), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevel), + StaticReflection.GetMemberName(s => s.Cohesion), + StaticReflection.GetMemberName(s => s.FrictionAngle), + StaticReflection.GetMemberName(s => s.RatioCuPc), + StaticReflection.GetMemberName(s => s.StrengthIncreaseExponent), + StaticReflection.GetMemberName(s => s.POP), + StaticReflection.GetMemberName(s => s.ShearStrengthModel), + StaticReflection.GetMemberName(s => s.UsePop) }; visibleProperties.AddRange(alwaysVisibleProperties); - AdhereToFilter(UserColumnFilters.DGeoStabilityCPhiModel, visibleProperties); + AdhereToFilter(UserColumnFilters.MacrostabilityBasicModule, visibleProperties); } [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterDGeoStabilitySuMeasured() + public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPipingRingToets() { var visibleProperties = new List { - "CuBottom", - "CuTop", - "ShearStrengthModel", - "StressTable" + StaticReflection.GetMemberName(s => s.DiameterD70Stochast), + StaticReflection.GetMemberName(s => s.PermeabKxStochast), + StaticReflection.GetMemberName(s => s.AbovePhreaticLevelStochast), + StaticReflection.GetMemberName(s => s.BelowPhreaticLevelStochast), }; visibleProperties.AddRange(alwaysVisibleProperties); - AdhereToFilter(UserColumnFilters.DGeoStabilitySuMeasured, visibleProperties); + AdhereToFilter(UserColumnFilters.PipingRingtoets, visibleProperties); } [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterDGeoStabilitySuCalculated() - { - var visibleProperties = new List - { - "OCR", - "POP", - "RatioCuPc", - "RatioCuPcActive", - "RatioCuPcPassive", - "ShearStrengthModel", - "StressTable" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.DGeoStabilitySuCalculated, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterDGeoStabilitySuGradient() - { - var visibleProperties = new List - { - "CuGradient", - "CuTop", - "ShearStrengthModel", - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.DGeoStabilitySuGradient, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterShearStrengthParameters() - { - var visibleProperties = new List - { - "BondStressTable", - "Cohesion", - "CohesionStochast", - "CuActiveBottom", - "CuActiveBottomStochast", - "CuActiveTop", - "CuActiveTopStochast", - "CuBottom", - "CuBottomStochast", - "CuGradient", - "CuGradientStochast", - "CuPassiveBottom", - "CuPassiveBottomStochast", - "CuPassiveTop", - "CuPassiveTopStochast", - "CuTop", - "CuTopStochast", - "FrictionAngle", - "OCR", - "OCRStochast", - "POP", - "POPStochast", - "RatioCuPc", - "RatioCuPcActive", - "RatioCuPcActiveStochast", - "RatioCuPcPassive", - "RatioCuPcPassiveStochast", - "RatioCuPcStochast", - "StressTable" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.ShearStrengthParameters, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterShearStrengthInput() - { - var visibleProperties = new List - { - "InputModeReliabilityAnalysisOption" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.ShearStrengthInput, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterShearStrengthModel() - { - var visibleProperties = new List - { - "DilatancyType", - "ShearStrengthModel", - "StrengthIncreaseExponent", - "StrengthIncreaseExponentStochast", - "UsePop" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.ShearStrengthModel, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterUnitWeightFilter() - { - var visibleProperties = new List - { - "AbovePhreaticLevel", - "AbovePhreaticLevelStochast", - "BelowPhreaticLevel", - "BelowPhreaticLevelStochast", - "DryUnitWeight" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.UnitWeightFilter, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterProbabilistic() - { - var visibleProperties = new List - { - "ExcessPorePressure", - "PorePressureFactor", - "UseDefaultProbabilisticValues" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.Probabilistic, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterStiffnessParameters() - { - var visibleProperties = new List - { - "EMod", - "FrictionAngleStochast" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.StiffnessParameters, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterBishopProbabilistic() - { - var visibleProperties = new List - { - "CorrelationCPhi", - "Cu", - "CuStochast", - "FormReferencePn", - "Pn", - "PnStochast", - "RRatio", - "RRatioStochast" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.BishopProbabilistic, visibleProperties); - } - - [Test, Category("Work_In_Progress")] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterPiping() - { - var visibleProperties = new List - { - "BeddingAngle", - "BeddingAngleStochast", - "DiameterD70", - "DiameterD70Stochast", - "DiameterD90", - "PermeabKx", - "PermeabKxStochast", - "WhitesConstant", - "WhitesConstantStochast" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.Piping, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterFlowSlideGlobalDetailed() - { - var visibleProperties = new List - { - "DiameterD15", - "DiameterD50", - "DiameterD50Stochast" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.FlowSlideGlobalDetailed, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterFlowSlideAdvancedLiquefaction() - { - var visibleProperties = new List - { - "Evoldm", - "FrictionAngle", - "GammaKorrel", - "Ks0", - "MaxPorosity", - "MinPorosity", - "ParM", - "ParR", - "ParS2", - "ParU", - "ParV", - "Porosity", - "RelativeDensity" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.FlowSlideAdvancedLiquefaction, visibleProperties); - } - - [Test] - public void DSoilModelContext_SoilMemberIsVisible_AdhereToFilterFlowSlideAdvancedBreaching() - { - var visibleProperties = new List - { - "AlphaGrd", - "CalculationPoints", - "ComputedPermeability", - "DiameterD15", - "DiameterD50", - "DiameterD50Stochast", - "Equilibrium", - "FlowWidth", - "FrictionAngle", - "GammaKorrel", - "Iterations", - "Porosity", - "Vwal" - }; - visibleProperties.AddRange(alwaysVisibleProperties); - - AdhereToFilter(UserColumnFilters.FlowSlideAdvancedBreaching, visibleProperties); - } - - [Test] public void DSoilModelContext_ParameterViewForPreconsolidationStress_Visibility() { var dSoilModelContext = SetupDSoilModelContext(null);