Index: Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/DikeProfile.cs =================================================================== diff -u -rd72334d478bef4a955d95ed0b0ea240656447092 -r0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7 --- Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/DikeProfile.cs (.../DikeProfile.cs) (revision d72334d478bef4a955d95ed0b0ea240656447092) +++ Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/DikeProfile.cs (.../DikeProfile.cs) (revision 0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7) @@ -194,24 +194,24 @@ /// /// Gets or sets the value for . /// - public string Name { get; set; } + public string Name { internal get; set; } /// /// Gets or sets the value for . /// - public double X0 { get; set; } + public double X0 { internal get; set; } /// /// Gets or sets the value for . /// - public double Orientation { get; set; } + public double Orientation { internal get; set; } /// /// Gets or sets the value for . /// /// will be rounded to the /// of . - public double DikeHeight { get; set; } + public double DikeHeight { internal get; set; } } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs =================================================================== diff -u -rd72334d478bef4a955d95ed0b0ea240656447092 -r0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7 --- Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs (.../ForeshoreProfile.cs) (revision d72334d478bef4a955d95ed0b0ea240656447092) +++ Ringtoets/Common/src/Ringtoets.Common.Data/DikeProfiles/ForeshoreProfile.cs (.../ForeshoreProfile.cs) (revision 0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7) @@ -136,19 +136,19 @@ /// /// Gets or sets the value for . /// - public string Name { get; set; } + public string Name { internal get; set; } /// /// Gets or sets the value for . /// - public double X0 { get; set; } + public double X0 { internal get; set; } /// /// Gets or sets the value for . /// /// will be rounded to the /// of . - public double Orientation { get; set; } + public double Orientation { internal get; set; } } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs =================================================================== diff -u -r065af7e201b59ec19a17c42e9d772f5e86b31338 -r0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7 --- Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs (.../StructureBase.cs) (revision 065af7e201b59ec19a17c42e9d772f5e86b31338) +++ Ringtoets/Common/src/Ringtoets.Common.Data/StructureBase.cs (.../StructureBase.cs) (revision 0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7) @@ -112,23 +112,23 @@ /// /// Gets or sets the name of the structure. /// - public string Name { get; set; } + public string Name { internal get; set; } /// /// Gets or sets the identifier of the structure. /// - public string Id { get; set; } + public string Id { internal get; set; } /// /// Gets or sets the location of the structure. /// - public Point2D Location { get; set; } + public Point2D Location { internal get; set; } /// /// Gets or sets the orientation of the closing structure, relative to north. /// [degrees] /// - public double StructureNormalOrientation { get; set; } + public double StructureNormalOrientation { internal get; set; } } } } \ No newline at end of file Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationOutput.cs =================================================================== diff -u -ra67c46f098a4f3b87a41e991f14d2f71778c2b28 -r0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationOutput.cs (.../DuneLocationOutput.cs) (revision a67c46f098a4f3b87a41e991f14d2f71778c2b28) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Data/DuneLocationOutput.cs (.../DuneLocationOutput.cs) (revision 0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7) @@ -48,6 +48,18 @@ WaveHeight = new RoundedDouble(2, constructionProperties.WaveHeight); WavePeriod = new RoundedDouble(2, constructionProperties.WavePeriod); + if (!ProbabilityHelper.IsValidProbability(constructionProperties.TargetProbability)) + { + throw new ArgumentOutOfRangeException(nameof(TargetProbability), constructionProperties.TargetProbability, + RingtoetsCommonDataResources.Probability_Must_be_in_range_zero_to_one); + } + + if (!ProbabilityHelper.IsValidProbability(constructionProperties.CalculatedProbability)) + { + throw new ArgumentOutOfRangeException(nameof(CalculatedProbability), constructionProperties.CalculatedProbability, + RingtoetsCommonDataResources.Probability_Must_be_in_range_zero_to_one); + } + TargetProbability = constructionProperties.TargetProbability; TargetReliability = new RoundedDouble(5, constructionProperties.TargetReliability); CalculatedProbability = constructionProperties.CalculatedProbability; @@ -108,9 +120,6 @@ /// public class ConstructionProperties { - private double calculatedProbability; - private double targetProbability; - /// /// Creates a new instance of . /// @@ -143,23 +152,7 @@ /// /// Gets the target probability. /// - /// Thrown when the value falls outside the [0.0, 1.0] range. - public double TargetProbability - { - internal get - { - return targetProbability; - } - set - { - if (!ProbabilityHelper.IsValidProbability(value)) - { - throw new ArgumentOutOfRangeException(nameof(TargetProbability), value, - RingtoetsCommonDataResources.Probability_Must_be_in_range_zero_to_one); - } - targetProbability = value; - } - } + public double TargetProbability { internal get; set; } /// /// Gets the target beta. @@ -169,23 +162,7 @@ /// /// Gets the calculated probability. /// - /// Thrown when the value falls outside the [0.0, 1.0] range. - public double CalculatedProbability - { - internal get - { - return calculatedProbability; - } - set - { - if (!ProbabilityHelper.IsValidProbability(value)) - { - throw new ArgumentOutOfRangeException(nameof(CalculatedProbability), value, - RingtoetsCommonDataResources.Probability_Must_be_in_range_zero_to_one); - } - calculatedProbability = value; - } - } + public double CalculatedProbability { internal get; set; } /// /// Gets the calculated reliability. Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs =================================================================== diff -u -r139f1c2f826579b27dbea3a98a21dfb6797a8eb0 -r0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs (.../PipingCalculatorInput.cs) (revision 139f1c2f826579b27dbea3a98a21dfb6797a8eb0) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/PipingCalculatorInput.cs (.../PipingCalculatorInput.cs) (revision 0889bad3f2ccb9a46bfdc4c4231a90f7e5d207e7) @@ -221,142 +221,142 @@ /// Gets the volumetric weight of water. /// [kN/m³] /// - public double WaterVolumetricWeight { get; set; } + public double WaterVolumetricWeight { internal get; set; } /// /// Gets the calculation value used to account for uncertainty in the model for uplift. /// - public double UpliftModelFactor { get; set; } + public double UpliftModelFactor { internal get; set; } /// /// Gets the outside high water level. /// [m] /// - public double AssessmentLevel { get; set; } + public double AssessmentLevel { internal get; set; } /// /// Gets the piezometric head at the exit point. /// [m] /// - public double PiezometricHeadExit { get; set; } + public double PiezometricHeadExit { internal get; set; } /// /// Gets the damping factor at the exit point. /// - public double DampingFactorExit { get; set; } + public double DampingFactorExit { internal get; set; } /// /// Gets the phreatic level at the exit point. /// [m] /// - public double PhreaticLevelExit { get; set; } + public double PhreaticLevelExit { internal get; set; } /// /// Gets the critical exit gradient for heave. /// - public double CriticalHeaveGradient { get; set; } + public double CriticalHeaveGradient { internal get; set; } /// /// Gets the total thickness of the coverage layer at the exit point. /// [m] /// - public double ThicknessCoverageLayer { get; set; } + public double ThicknessCoverageLayer { internal get; set; } /// /// Gets the effective thickness of the coverage layer at the exit point. /// [m] /// - public double EffectiveThicknessCoverageLayer { get; set; } + public double EffectiveThicknessCoverageLayer { internal get; set; } /// /// Gets the calculation value used to account for uncertainty in the model for Sellmeijer. /// - public double SellmeijerModelFactor { get; set; } + public double SellmeijerModelFactor { internal get; set; } /// /// Gets the reduction factor Sellmeijer. /// - public double SellmeijerReductionFactor { get; set; } + public double SellmeijerReductionFactor { internal get; set; } /// /// Gets the horizontal distance between entry and exit point. /// [m] /// - public double SeepageLength { get; set; } + public double SeepageLength { internal get; set; } /// /// Gets the (lowerbound) volumic weight of sand grain material of a sand layer under water. /// [kN/m³] /// - public double SandParticlesVolumicWeight { get; set; } + public double SandParticlesVolumicWeight { internal get; set; } /// /// Gets the White's drag coefficient. /// - public double WhitesDragCoefficient { get; set; } + public double WhitesDragCoefficient { internal get; set; } /// /// Gets the sieve size through which 70% of the grains of the top part of the aquifer pass. /// [m] /// - public double Diameter70 { get; set; } + public double Diameter70 { internal get; set; } /// /// Gets the Darcy-speed with which water flows through the aquifer layer. /// [m/s] /// - public double DarcyPermeability { get; set; } + public double DarcyPermeability { internal get; set; } /// /// Gets the kinematic viscosity of water at 10 °C. /// [m²/s] /// - public double WaterKinematicViscosity { get; set; } + public double WaterKinematicViscosity { internal get; set; } /// /// Gets the gravitational acceleration. /// [m/s²] /// - public double Gravity { get; set; } + public double Gravity { internal get; set; } /// /// Gets the thickness of the aquifer layer. /// [m] /// - public double ThicknessAquiferLayer { get; set; } + public double ThicknessAquiferLayer { internal get; set; } /// /// Gets the mean diameter of small scale tests applied to different kinds of sand, on which the formula of Sellmeijer has been fit. /// [m] /// - public double MeanDiameter70 { get; set; } + public double MeanDiameter70 { internal get; set; } /// /// Gets the angle of the force balance representing the amount in which sand grains resist rolling. /// [°] /// - public double BeddingAngle { get; set; } + public double BeddingAngle { internal get; set; } /// /// Gets the X-coordinate of the exit point. /// [m] /// - public double ExitPointXCoordinate { get; set; } + public double ExitPointXCoordinate { internal get; set; } /// /// Gets the surface line. /// - public RingtoetsPipingSurfaceLine SurfaceLine { get; set; } + public RingtoetsPipingSurfaceLine SurfaceLine { internal get; set; } /// /// Gets the profile which contains a 1 dimensional definition of soil layers with properties. /// - public PipingSoilProfile SoilProfile { get; set; } + public PipingSoilProfile SoilProfile { internal get; set; } /// /// Gets the volumic weight of the coverage layer when saturated. /// - public double SaturatedVolumicWeightOfCoverageLayer { get; set; } + public double SaturatedVolumicWeightOfCoverageLayer { internal get; set; } #endregion