Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rb2ba7b44c143bc91056e634e2fb8b329994501cd -rc7814fa3fc22bf7efe81f387e9366a3582019469 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b2ba7b44c143bc91056e634e2fb8b329994501cd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c7814fa3fc22bf7efe81f387e9366a3582019469) @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.34209 +// Runtime Version:4.0.30319.18444 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -98,6 +98,15 @@ } /// + /// Looks up a localized string similar to Hydraulische gegevens. + /// + public static string Categories_HydraulicData { + get { + return ResourceManager.GetString("Categories_HydraulicData", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Modelfactoren. /// public static string Categories_ModelFactors { @@ -116,6 +125,24 @@ } /// + /// Looks up a localized string similar to Modelinstellingen. + /// + public static string Categories_ModelSettings { + get { + return ResourceManager.GetString("Categories_ModelSettings", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Schematization. + /// + public static string Categories_Schematization { + get { + return ResourceManager.GetString("Categories_Schematization", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Semi-probabilistische parameters. /// public static string Categories_SemiProbabilisticParameters { @@ -134,6 +161,15 @@ } /// + /// Looks up a localized string similar to Grondeigenschappen. + /// + public static string Categories_SoilProperties { + get { + return ResourceManager.GetString("Categories_SoilProperties", resourceCulture); + } + } + + /// /// Looks up a localized string similar to &Wis uitvoer.... /// public static string Clear_output { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx =================================================================== diff -u -rb2ba7b44c143bc91056e634e2fb8b329994501cd -rc7814fa3fc22bf7efe81f387e9366a3582019469 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision b2ba7b44c143bc91056e634e2fb8b329994501cd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.resx (.../Resources.resx) (revision c7814fa3fc22bf7efe81f387e9366a3582019469) @@ -598,4 +598,16 @@ Toetspeil moet een geldige waarde hebben. + + Hydraulische gegevens + + + Modelinstellingen + + + Schematization + + + Grondeigenschappen + \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs =================================================================== diff -u -rb2ba7b44c143bc91056e634e2fb8b329994501cd -rc7814fa3fc22bf7efe81f387e9366a3582019469 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision b2ba7b44c143bc91056e634e2fb8b329994501cd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs (.../PipingInputContextProperties.cs) (revision c7814fa3fc22bf7efe81f387e9366a3582019469) @@ -25,7 +25,6 @@ using System.Drawing.Design; using Core.Common.Base.Data; -using Core.Common.Base.TypeConverters; using Core.Common.Gui.PropertyBag; using Core.Common.Utils.Attributes; using Ringtoets.HydraRing.Data; @@ -68,47 +67,67 @@ { return data.AvailableHydraulicBoundaryLocations; } + + #region Hydraulic data - private RoundedDouble AssessmentLevel + [Editor(typeof(PipingInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))] + [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_HydraulicBoundaryLocation_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_HydraulicBoundaryLocation_Description")] + public HydraulicBoundaryLocation HydraulicBoundaryLocation { get { - return data.WrappedData.AssessmentLevel; + return data.WrappedData.HydraulicBoundaryLocation; } set { - data.WrappedData.AssessmentLevel = value; + if (double.IsNaN(value.DesignWaterLevel)) + { + string message = string.Format(Resources.PipingInputContextProperties_HydraulicBoundaryLocation_Could_not_set_Location_0_Cause_1_, + value.Name, + Resources.PipingInputContextProperties_AssessmentLevel_cannot_be_NaN); + throw new ArgumentException(message); + } + + data.WrappedData.AssessmentLevel = (RoundedDouble)value.DesignWaterLevel; + data.WrappedData.HydraulicBoundaryLocation = value; data.WrappedData.NotifyObservers(); } } - private double PiezometricHeadExit + [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_AssessmentLevel_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_AssessmentLevel_Description")] + public RoundedDouble AssessmentLevel { get { - return data.WrappedData.PiezometricHeadExit; + return data.WrappedData.AssessmentLevel; } - set - { - data.WrappedData.PiezometricHeadExit = value; - data.WrappedData.NotifyObservers(); - } } - private DesignVariable DampingFactorExit + [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_PiezometricHeadExit_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_PiezometricHeadExit_Description")] + public double PiezometricHeadExit { get { - return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedData); + return data.WrappedData.PiezometricHeadExit; } set { - data.WrappedData.DampingFactorExit = value.Distribution; + data.WrappedData.PiezometricHeadExit = value; data.WrappedData.NotifyObservers(); } } - private DesignVariable PhreaticLevelExit + [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))] + [ResourcesCategory(typeof(Resources), "Categories_HydraulicData")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_PhreaticLevelExit_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_PhreaticLevelExit_Description")] + public DesignVariable PhreaticLevelExit { get { @@ -121,23 +140,12 @@ } } - private DesignVariable ThicknessCoverageLayer - { - get - { - return PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(data.WrappedData); - } - set - { - data.WrappedData.ThicknessCoverageLayer = value.Distribution; - data.WrappedData.NotifyObservers(); - } - } + #endregion - #region General + #region Schematization [Editor(typeof(PipingInputContextSurfaceLineSelectionEditor), typeof(UITypeEditor))] - [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_SurfaceLine_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_SurfaceLine_Description")] public RingtoetsPipingSurfaceLine SurfaceLine @@ -154,7 +162,7 @@ } [Editor(typeof(PipingInputContextSoilProfileSelectionEditor), typeof(UITypeEditor))] - [ResourcesCategory(typeof(Resources), "Categories_General")] + [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_SoilProfile_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_SoilProfile_Description")] public PipingSoilProfile SoilProfile @@ -170,104 +178,7 @@ } } - [Editor(typeof(PipingInputContextHydraulicBoundaryLocationEditor), typeof(UITypeEditor))] - [ResourcesCategory(typeof(Resources), "Categories_General")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_HydraulicBoundaryLocation_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_HydraulicBoundaryLocation_Description")] - public HydraulicBoundaryLocation HydraulicBoundaryLocation - { - get - { - return data.WrappedData.HydraulicBoundaryLocation; - } - set - { - if (double.IsNaN(value.DesignWaterLevel)) - { - string message = string.Format(Resources.PipingInputContextProperties_HydraulicBoundaryLocation_Could_not_set_Location_0_Cause_1_, - value.Name, - Resources.PipingInputContextProperties_AssessmentLevel_cannot_be_NaN); - throw new ArgumentException(message); - } - - data.WrappedData.AssessmentLevel = (RoundedDouble)value.DesignWaterLevel; - data.WrappedData.HydraulicBoundaryLocation = value; - data.WrappedData.NotifyObservers(); - } - } - - #endregion - - #region Heave - - [ResourcesCategory(typeof(Resources), "Categories_Heave")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_PiezometricHeadExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_PiezometricHeadExit_Description")] - public double PiezometricHeadExitHeave - { - get - { - return PiezometricHeadExit; - } - set - { - PiezometricHeadExit = value; - } - } - - [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Heave")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessCoverageLayer_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_ThicknessCoverageLayer_Description")] - public DesignVariable ThicknessCoverageLayerHeave - { - get - { - return ThicknessCoverageLayer; - } - set - { - ThicknessCoverageLayer = value; - } - } - - [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Heave")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_DampingFactorExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_DampingFactorExit_Description")] - public DesignVariable DampingFactorExitHeave - { - get - { - return DampingFactorExit; - } - set - { - DampingFactorExit = value; - } - } - - [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Heave")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_PhreaticLevelExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_PhreaticLevelExit_Description")] - public DesignVariable PhreaticLevelExitHeave - { - get - { - return PhreaticLevelExit; - } - set - { - PhreaticLevelExit = value; - } - } - - #endregion - - #region Uplift - - [ResourcesCategory(typeof(Resources), "Categories_Uplift")] + [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_EntryPointL_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_EntryPointL_Description")] public RoundedDouble EntryPointL @@ -283,7 +194,7 @@ } } - [ResourcesCategory(typeof(Resources), "Categories_Uplift")] + [ResourcesCategory(typeof(Resources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "PipingInput_ExitPointL_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_ExitPointL_Description")] public RoundedDouble ExitPointL @@ -295,134 +206,84 @@ set { data.WrappedData.SetExitPointL(value); - data.WrappedData.NotifyObservers(); + data.WrappedData.NotifyObservers(); } } - [ResourcesCategory(typeof(Resources), "Categories_Uplift")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_AssessmentLevel_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_AssessmentLevel_Description")] - public RoundedDouble AssessmentLevelUplift + [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] + [ResourcesCategory(typeof(Resources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_SeepageLength_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_SeepageLength_Description")] + public DesignVariable SeepageLength { get { - return AssessmentLevel; + return PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(data.WrappedData); } - } - - [ResourcesCategory(typeof(Resources), "Categories_Uplift")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_PiezometricHeadExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_PiezometricHeadExit_Description")] - public double PiezometricHeadExitUplift - { - get - { - return PiezometricHeadExit; - } set { - PiezometricHeadExit = value; + data.WrappedData.SeepageLength = value.Distribution; + data.WrappedData.NotifyObservers(); } } [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Uplift")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_DampingFactorExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_DampingFactorExit_Description")] - public DesignVariable DampingFactorExitUplift + [ResourcesCategory(typeof(Resources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessCoverageLayer_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_ThicknessCoverageLayer_Description")] + public DesignVariable ThicknessCoverageLayer { get { - return DampingFactorExit; + return PipingSemiProbabilisticDesignValueFactory.GetThicknessCoverageLayer(data.WrappedData); } set { - DampingFactorExit = value; + data.WrappedData.ThicknessCoverageLayer = value.Distribution; + data.WrappedData.NotifyObservers(); } } - [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Uplift")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_PhreaticLevelExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_PhreaticLevelExit_Description")] - public DesignVariable PhreaticLevelExitUplift + [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] + [ResourcesCategory(typeof(Resources), "Categories_Schematization")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessAquiferLayer_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_ThicknessAquiferLayer_Description")] + public DesignVariable ThicknessAquiferLayer { get { - return PhreaticLevelExit; + return PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(data.WrappedData); } set { - PhreaticLevelExit = value; + data.WrappedData.ThicknessAquiferLayer = value.Distribution; + data.WrappedData.NotifyObservers(); } } #endregion - #region Sellmeijer + #region Soil Properties - [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_AssessmentLevel_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_AssessmentLevel_Description")] - public RoundedDouble AssessmentLevelSellmeijer - { - get - { - return AssessmentLevel; - } - } - - [TypeConverter(typeof(NormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_PhreaticLevelExit_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_PhreaticLevelExit_Description")] - public DesignVariable PhreaticLevelExitSellmeijer - { - get - { - return PhreaticLevelExit; - } - set - { - PhreaticLevelExit = value; - } - } - [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessCoverageLayer_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_ThicknessCoverageLayer_Description")] - public DesignVariable ThicknessCoverageLayerSellmeijer + [ResourcesCategory(typeof(Resources), "Categories_SoilProperties")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_DarcyPermeability_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_DarcyPermeability_Description")] + public DesignVariable DarcyPermeability { get { - return ThicknessCoverageLayer; + return PipingSemiProbabilisticDesignValueFactory.GetDarcyPermeability(data.WrappedData); } set { - ThicknessCoverageLayer = value; - } - } - - [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_SeepageLength_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_SeepageLength_Description")] - public DesignVariable SeepageLength - { - get - { - return PipingSemiProbabilisticDesignValueFactory.GetSeepageLength(data.WrappedData); - } - set - { - data.WrappedData.SeepageLength = value.Distribution; + data.WrappedData.DarcyPermeability = value.Distribution; data.WrappedData.NotifyObservers(); } } [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")] + [ResourcesCategory(typeof(Resources), "Categories_SoilProperties")] [ResourcesDisplayName(typeof(Resources), "PipingInput_Diameter70_DisplayName")] [ResourcesDescription(typeof(Resources), "PipingInput_Diameter70_Description")] public DesignVariable Diameter70 @@ -438,36 +299,25 @@ } } - [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_DarcyPermeability_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_DarcyPermeability_Description")] - public DesignVariable DarcyPermeability - { - get - { - return PipingSemiProbabilisticDesignValueFactory.GetDarcyPermeability(data.WrappedData); - } - set - { - data.WrappedData.DarcyPermeability = value.Distribution; - data.WrappedData.NotifyObservers(); - } - } + // TODO: Verzadigd gewicht deklaag + #endregion + + #region Model Settings + [TypeConverter(typeof(LognormalDistributionDesignVariableTypeConverter))] - [ResourcesCategory(typeof(Resources), "Categories_Sellmeijer")] - [ResourcesDisplayName(typeof(Resources), "PipingInput_ThicknessAquiferLayer_DisplayName")] - [ResourcesDescription(typeof(Resources), "PipingInput_ThicknessAquiferLayer_Description")] - public DesignVariable ThicknessAquiferLayer + [ResourcesCategory(typeof(Resources), "Categories_ModelSettings")] + [ResourcesDisplayName(typeof(Resources), "PipingInput_DampingFactorExit_DisplayName")] + [ResourcesDescription(typeof(Resources), "PipingInput_DampingFactorExit_Description")] + public DesignVariable DampingFactorExit { get { - return PipingSemiProbabilisticDesignValueFactory.GetThicknessAquiferLayer(data.WrappedData); + return PipingSemiProbabilisticDesignValueFactory.GetDampingFactorExit(data.WrappedData); } set { - data.WrappedData.ThicknessAquiferLayer = value.Distribution; + data.WrappedData.DampingFactorExit = value.Distribution; data.WrappedData.NotifyObservers(); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs =================================================================== diff -u -rb2ba7b44c143bc91056e634e2fb8b329994501cd -rc7814fa3fc22bf7efe81f387e9366a3582019469 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision b2ba7b44c143bc91056e634e2fb8b329994501cd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingInputContextPropertiesTest.cs (.../PipingInputContextPropertiesTest.cs) (revision c7814fa3fc22bf7efe81f387e9366a3582019469) @@ -69,21 +69,15 @@ }; // Call & Assert - Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExitHeave.Distribution); - Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExitSellmeijer.Distribution); - Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExitUplift.Distribution); - Assert.AreSame(inputParameters.DampingFactorExit, properties.DampingFactorExitUplift.Distribution); - Assert.AreSame(inputParameters.DampingFactorExit, properties.DampingFactorExitHeave.Distribution); - Assert.AreSame(inputParameters.ThicknessCoverageLayer, properties.ThicknessCoverageLayerHeave.Distribution); - Assert.AreSame(inputParameters.ThicknessCoverageLayer, properties.ThicknessCoverageLayerSellmeijer.Distribution); + Assert.AreSame(inputParameters.PhreaticLevelExit, properties.PhreaticLevelExit.Distribution); + Assert.AreSame(inputParameters.DampingFactorExit, properties.DampingFactorExit.Distribution); + Assert.AreSame(inputParameters.ThicknessCoverageLayer, properties.ThicknessCoverageLayer.Distribution); Assert.AreSame(inputParameters.Diameter70, properties.Diameter70.Distribution); Assert.AreSame(inputParameters.DarcyPermeability, properties.DarcyPermeability.Distribution); Assert.AreSame(inputParameters.ThicknessAquiferLayer, properties.ThicknessAquiferLayer.Distribution); - Assert.AreEqual(inputParameters.PiezometricHeadExit, properties.PiezometricHeadExitHeave); - Assert.AreEqual(inputParameters.PiezometricHeadExit, properties.PiezometricHeadExitUplift); - Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevelSellmeijer); - Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevelUplift); + Assert.AreEqual(inputParameters.PiezometricHeadExit, properties.PiezometricHeadExit); + Assert.AreEqual(inputParameters.AssessmentLevel, properties.AssessmentLevel); Assert.AreSame(inputParameters.SeepageLength, properties.SeepageLength.Distribution); Assert.AreEqual(inputParameters.SeepageLength.Mean, properties.ExitPointL - properties.EntryPointL); @@ -164,10 +158,10 @@ Enumerable.Empty(), Enumerable.Empty(), assessmentSectionMock), - PiezometricHeadExitUplift = piezometricHeadExit, - DampingFactorExitHeave = new LognormalDistributionDesignVariable(dampingFactorExit), - PhreaticLevelExitHeave = new NormalDistributionDesignVariable(phreaticLevelExit), - ThicknessCoverageLayerSellmeijer = new LognormalDistributionDesignVariable(thicknessCoverageLayer), + PiezometricHeadExit = piezometricHeadExit, + DampingFactorExit = new LognormalDistributionDesignVariable(dampingFactorExit), + PhreaticLevelExit = new NormalDistributionDesignVariable(phreaticLevelExit), + ThicknessCoverageLayer = new LognormalDistributionDesignVariable(thicknessCoverageLayer), SeepageLength = new LognormalDistributionDesignVariable(seepageLength), Diameter70 = new LognormalDistributionDesignVariable(diameter70), DarcyPermeability = new LognormalDistributionDesignVariable(darcyPermeability), @@ -383,8 +377,7 @@ var message = string.Format("Kan locatie '{0}' niet gebruiken als invoer. Toetspeil moet een geldige waarde hebben.", testName); TestHelper.AssertThrowsArgumentExceptionAndTestMessage(test, message); - Assert.AreEqual(originalRoundedAssessmentLevel, properties.AssessmentLevelSellmeijer.Value); - Assert.AreEqual(originalRoundedAssessmentLevel, properties.AssessmentLevelUplift.Value); + Assert.AreEqual(originalRoundedAssessmentLevel, properties.AssessmentLevel.Value); mocks.VerifyAll(); } @@ -420,8 +413,7 @@ properties.HydraulicBoundaryLocation = hydraulicBoundaryLocation; // Assert - Assert.AreEqual(testLevel, properties.AssessmentLevelSellmeijer.Value, 1e-2); - Assert.AreEqual(testLevel, properties.AssessmentLevelUplift.Value, 1e-2); + Assert.AreEqual(testLevel, properties.AssessmentLevel.Value, 1e-2); mocks.VerifyAll(); } Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -rb902215a3a5f2ea3547a1c85b1adfc1e11391694 -rc7814fa3fc22bf7efe81f387e9366a3582019469 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision b902215a3a5f2ea3547a1c85b1adfc1e11391694) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/LognormalDistributionDesignVariableTypeConverterTest.cs (.../LognormalDistributionDesignVariableTypeConverterTest.cs) (revision c7814fa3fc22bf7efe81f387e9366a3582019469) @@ -155,15 +155,15 @@ inputParameters.Attach(observer); - DesignVariable dampingFactorExitHeave = inputParameterContextProperties.DampingFactorExitHeave; - var properties = new LognormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, dampingFactorExitHeave); + DesignVariable dampingFactorExit = inputParameterContextProperties.DampingFactorExit; + var properties = new LognormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, dampingFactorExit); // Precondition Assert.IsNotNull(properties); // Event const double newDoubleValue = 2.3; - properties[propertyIndexToChange].SetValue(dampingFactorExitHeave, (RoundedDouble)newDoubleValue); + properties[propertyIndexToChange].SetValue(dampingFactorExit, (RoundedDouble)newDoubleValue); // Result switch (propertyIndexToChange) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs =================================================================== diff -u -rb902215a3a5f2ea3547a1c85b1adfc1e11391694 -rc7814fa3fc22bf7efe81f387e9366a3582019469 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision b902215a3a5f2ea3547a1c85b1adfc1e11391694) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TypeConverters/NormalDistributionDesignVariableTypeConverterTest.cs (.../NormalDistributionDesignVariableTypeConverterTest.cs) (revision c7814fa3fc22bf7efe81f387e9366a3582019469) @@ -153,15 +153,15 @@ inputParameters.Attach(observer); - DesignVariable phreaticLevelExitHeave = inputParameterContextProperties.PhreaticLevelExitHeave; - PropertyDescriptorCollection properties = new NormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, phreaticLevelExitHeave); + DesignVariable phreaticLevelExit = inputParameterContextProperties.PhreaticLevelExit; + PropertyDescriptorCollection properties = new NormalDistributionDesignVariableTypeConverter().GetProperties(typeDescriptorContextMock, phreaticLevelExit); // Precondition Assert.IsNotNull(properties); // Event const double newValue = 2.3; - properties[propertyIndexToChange].SetValue(phreaticLevelExitHeave, (RoundedDouble)newValue); + properties[propertyIndexToChange].SetValue(phreaticLevelExit, (RoundedDouble)newValue); // Result switch (propertyIndexToChange)