Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/LogNormalHydraRingVariable.cs =================================================================== diff -u -r8acfb6734b3968d7874de486e0d21a3ff647b583 -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/LogNormalHydraRingVariable.cs (.../LogNormalHydraRingVariable.cs) (revision 8acfb6734b3968d7874de486e0d21a3ff647b583) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/LogNormalHydraRingVariable.cs (.../LogNormalHydraRingVariable.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -47,9 +47,7 @@ { get { - return !double.IsNaN(shift) - ? shift - : base.Parameter3; + return shift; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RandomHydraRingVariable.cs =================================================================== diff -u -r8acfb6734b3968d7874de486e0d21a3ff647b583 -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RandomHydraRingVariable.cs (.../RandomHydraRingVariable.cs) (revision 8acfb6734b3968d7874de486e0d21a3ff647b583) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RandomHydraRingVariable.cs (.../RandomHydraRingVariable.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -31,7 +31,7 @@ private readonly double variance; /// - /// Creates a new instance of + /// Creates a new instance of . /// /// The Hydra-Ring id corresponding to the variable that is considered. /// The deviation type of the variable. Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RayleighNHydraRingVariable.cs =================================================================== diff -u -r69ae0d0b75f56831b0058a4fcac37442a998e84e -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision 69ae0d0b75f56831b0058a4fcac37442a998e84e) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Variables/RayleighNHydraRingVariable.cs (.../RayleighNHydraRingVariable.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -31,11 +31,11 @@ /// /// The Hydra-Ring id corresponding to the variable that is considered. /// The deviation type of the variable. - /// The n value of the variable. - /// The standardDeviation value of the variable. + /// The N value of the variable. + /// The variance value of the variable. public RayleighNHydraRingVariable(int variableId, HydraRingDeviationType deviationType, - double n, double standardDeviation) - : base(variableId, deviationType, standardDeviation, n) {} + double n, double variance) + : base(variableId, deviationType, variance, n) { } // Note: Pass the N as "variability" and the variance as "mean" public override HydraRingDistributionType DistributionType { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/LogNormalHydraRingVariableTest.cs =================================================================== diff -u -r8acfb6734b3968d7874de486e0d21a3ff647b583 -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/LogNormalHydraRingVariableTest.cs (.../LogNormalHydraRingVariableTest.cs) (revision 8acfb6734b3968d7874de486e0d21a3ff647b583) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/LogNormalHydraRingVariableTest.cs (.../LogNormalHydraRingVariableTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -31,13 +31,24 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + const int variableId = 1; + const HydraRingDeviationType deviationType = HydraRingDeviationType.Standard; + const double mean = 2.2; + const double variance = 3.3; + const double shift = 4.4; + // Call - var hydraRingVariable = new LogNormalHydraRingVariable(1, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4); + var hydraRingVariable = new LogNormalHydraRingVariable(variableId, deviationType, mean, variance, shift); // Assert Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(HydraRingDistributionType.LogNormal, hydraRingVariable.DistributionType); - Assert.AreEqual(4.4, hydraRingVariable.Parameter3); + Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); + Assert.AreEqual(variableId, hydraRingVariable.VariableId); + Assert.AreEqual(mean, hydraRingVariable.Parameter1); + Assert.AreEqual(variance, hydraRingVariable.Parameter2); + Assert.AreEqual(shift, hydraRingVariable.Parameter3); } [Test] Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/NormalHydraRingVariableTest.cs =================================================================== diff -u -r69ae0d0b75f56831b0058a4fcac37442a998e84e -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/NormalHydraRingVariableTest.cs (.../NormalHydraRingVariableTest.cs) (revision 69ae0d0b75f56831b0058a4fcac37442a998e84e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/NormalHydraRingVariableTest.cs (.../NormalHydraRingVariableTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -31,12 +31,22 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + const int variableId = 1; + const HydraRingDeviationType deviationType = HydraRingDeviationType.Standard; + const double mean = 2.2; + const double variance = 3.3; + // Call - var hydraRingVariable = new NormalHydraRingVariable(1, HydraRingDeviationType.Standard, 2.2, 3.3); + var hydraRingVariable = new NormalHydraRingVariable(variableId, deviationType, mean, variance); // Assert Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(HydraRingDistributionType.Normal, hydraRingVariable.DistributionType); + Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); + Assert.AreEqual(variableId, hydraRingVariable.VariableId); + Assert.AreEqual(mean, hydraRingVariable.Parameter1); + Assert.AreEqual(variance, hydraRingVariable.Parameter2); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RandomHydraRingVariableTest.cs =================================================================== diff -u -r8acfb6734b3968d7874de486e0d21a3ff647b583 -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RandomHydraRingVariableTest.cs (.../RandomHydraRingVariableTest.cs) (revision 8acfb6734b3968d7874de486e0d21a3ff647b583) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RandomHydraRingVariableTest.cs (.../RandomHydraRingVariableTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -50,8 +50,8 @@ private class TestRandomHydraRingVariable : RandomHydraRingVariable { - public TestRandomHydraRingVariable(int variableId, HydraRingDeviationType deviationType, double parameter1, double parameter2) - : base(variableId, deviationType, parameter1, parameter2) {} + public TestRandomHydraRingVariable(int variableId, HydraRingDeviationType deviationType, double mean, double variance) + : base(variableId, deviationType, mean, variance) {} public override HydraRingDistributionType DistributionType { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RayleighNHydraRingVariableTest.cs =================================================================== diff -u -r69ae0d0b75f56831b0058a4fcac37442a998e84e -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RayleighNHydraRingVariableTest.cs (.../RayleighNHydraRingVariableTest.cs) (revision 69ae0d0b75f56831b0058a4fcac37442a998e84e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/RayleighNHydraRingVariableTest.cs (.../RayleighNHydraRingVariableTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -31,12 +31,22 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + const int variableId = 1; + const HydraRingDeviationType deviationType = HydraRingDeviationType.Standard; + const double n = 2.2; + const double variance = 3.3; + // Call - var hydraRingVariable = new RayleighNHydraRingVariable(1, HydraRingDeviationType.Standard, 3.3, 2.2); + var hydraRingVariable = new RayleighNHydraRingVariable(variableId, deviationType, n, variance); // Assert Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(HydraRingDistributionType.RayleighN, hydraRingVariable.DistributionType); + Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); + Assert.AreEqual(variableId, hydraRingVariable.VariableId); + Assert.AreEqual(variance, hydraRingVariable.Parameter1); + Assert.AreEqual(n, hydraRingVariable.Parameter2); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/TruncatedNormalHydraRingVariableTest.cs =================================================================== diff -u -r69ae0d0b75f56831b0058a4fcac37442a998e84e -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/TruncatedNormalHydraRingVariableTest.cs (.../TruncatedNormalHydraRingVariableTest.cs) (revision 69ae0d0b75f56831b0058a4fcac37442a998e84e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Variables/TruncatedNormalHydraRingVariableTest.cs (.../TruncatedNormalHydraRingVariableTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -1,4 +1,5 @@ -// Copyright (C) Stichting Deltares 2016. All rights reserved. + +// Copyright (C) Stichting Deltares 2016. All rights reserved. // // This file is part of Ringtoets. // @@ -31,14 +32,26 @@ [Test] public void Constructor_ExpectedValues() { + // Setup + const int variableId = 1; + const HydraRingDeviationType deviationType = HydraRingDeviationType.Standard; + const double mean = 2.2; + const double variance = 3.3; + const double lowerBoundary = 4.4; + const double upperBoundary = 5.5; + // Call - var hydraRingVariable = new TruncatedNormalHydraRingVariable(1, HydraRingDeviationType.Standard, 2.2, 3.3, 4.4, 5.5); + var hydraRingVariable = new TruncatedNormalHydraRingVariable(variableId, deviationType, mean, variance, lowerBoundary, upperBoundary); // Assert Assert.IsInstanceOf(hydraRingVariable); Assert.AreEqual(HydraRingDistributionType.TruncatedNormal, hydraRingVariable.DistributionType); - Assert.AreEqual(4.4, hydraRingVariable.Parameter3); - Assert.AreEqual(5.5, hydraRingVariable.Parameter4); + Assert.AreEqual(deviationType, hydraRingVariable.DeviationType); + Assert.AreEqual(variableId, hydraRingVariable.VariableId); + Assert.AreEqual(mean, hydraRingVariable.Parameter1); + Assert.AreEqual(variance, hydraRingVariable.Parameter2); + Assert.AreEqual(lowerBoundary, hydraRingVariable.Parameter3); + Assert.AreEqual(upperBoundary, hydraRingVariable.Parameter4); } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs =================================================================== diff -u -r1e56b3a0272cbd173b118eb3bcc48a3adbe87e59 -r64ff18d2a822650da1a0e8a30656477c1c8cd58e --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 1e56b3a0272cbd173b118eb3bcc48a3adbe87e59) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Services/HydraRingConfigurationServiceTest.cs (.../HydraRingConfigurationServiceTest.cs) (revision 64ff18d2a822650da1a0e8a30656477c1c8cd58e) @@ -121,9 +121,19 @@ "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 1, 8, 9, 10, 11.11, 12.12, 13.13, 14.14, 15, 1, 16, 17, 18.18, 19.19, 20.2, 21);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 0, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 2, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 4, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 19, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 18, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine + "INSERT INTO [CalculationProfiles] VALUES (1, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + @@ -247,15 +257,45 @@ "INSERT INTO [Numerics] VALUES (3, 1, 1, 1, 1, 208, 209, 210, 211.11, 212.12, 213.13, 214.14, 215, 1, 216, 217, 218.18, 219.19, 220.2, 221);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [VariableDatas];" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 0, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 2, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 4, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 19, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 1, 1, 1, 26, 0, 18, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 0, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 2, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 4, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 19, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (2, 1, 1, 1, 26, 0, 18, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 0, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 2, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 2, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 4, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 4, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 19, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 19, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 1, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 1.1, 18, 2.2, 3.3, 4.4, 5.5, 0, 6.6, 300);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (3, 1, 1, 1, 26, 0, 18, 0, NULL, NULL, NULL, 1, 0, 300);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [CalculationProfiles];" + Environment.NewLine + "INSERT INTO [CalculationProfiles] VALUES (1, 1, 1.1, 2.2, 3.3);" + Environment.NewLine + @@ -383,9 +423,19 @@ { get { + yield return new TestHydraRingVariable(26, HydraRingDistributionType.Deterministic, HydraRingDeviationType.Standard, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); yield return new TestHydraRingVariable(26, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); - yield return new TestHydraRingVariable(26, HydraRingDistributionType.Normal, HydraRingDeviationType.Variation, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.Normal, HydraRingDeviationType.Variation, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); yield return new TestHydraRingVariable(26, HydraRingDistributionType.Normal, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Standard, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Variation, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.LogNormal, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.TruncatedNormal, HydraRingDeviationType.Standard, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.TruncatedNormal, HydraRingDeviationType.Variation, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.TruncatedNormal, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.RayleighN, HydraRingDeviationType.Standard, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.RayleighN, HydraRingDeviationType.Variation, 1.1, 2.2, 3.3, 4.4, 5.5, 6.6); + yield return new TestHydraRingVariable(26, HydraRingDistributionType.RayleighN, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN, double.NaN); } }