Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -35,7 +35,7 @@ private readonly double factorStormDurationOpenStructure; private readonly double failureProbabilityOpenStructure; private readonly double failureProbabilityReparation; - private readonly double identicalApertures; + private readonly int identicalApertures; private readonly double allowedLevelIncreaseStorageMean; private readonly double allowedLevelIncreaseStorageStandardDeviation; private readonly double modelFactorStorageVolumeMean; @@ -86,7 +86,7 @@ double factorStormDurationOpenStructure, double failureProbabilityOpenStructure, double failureProbabilityReparation, - double identicalApertures, + int identicalApertures, double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, double storageStructureAreaMean, double storageStructureAreaVariation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInput.cs (.../StructuresClosureFloodedCulvertCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -76,7 +76,7 @@ double factorStormDurationOpenStructure, double failureProbabilityOpenStructure, double failureProbabilityReparation, - double identicalApertures, + int identicalApertures, double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, double storageStructureAreaMean, double storageStructureAreaVariation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureLowSillCalculationInput.cs (.../StructuresClosureLowSillCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -84,7 +84,7 @@ double factorStormDurationOpenStructure, double failureProbabilityOpenStructure, double failureProbabilityReparation, - double identicalApertures, + int identicalApertures, double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, double storageStructureAreaMean, double storageStructureAreaVariation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureVerticalWallCalculationInput.cs (.../StructuresClosureVerticalWallCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -84,7 +84,7 @@ double factorStormDurationOpenStructure, double failureProbabilityOpenStructure, double failureProbabilityReparation, - double identicalApertures, + int identicalApertures, double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, double storageStructureAreaMean, double storageStructureAreaVariation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -52,7 +52,7 @@ private readonly double shipMassVariation; private readonly double shipVelocityMean; private readonly double shipVelocityVariation; - private readonly double levelingCount; + private readonly int levelingCount; private readonly double probabilityCollisionSecondaryStructure; private readonly double flowVelocityStructureClosableMean; private readonly double flowVelocityStructureClosableStandardDeviation; @@ -157,7 +157,7 @@ double modelFactorCollisionLoadMean, double modelFactorCollisionLoadVariation, double shipMassMean, double shipMassVariation, double shipVelocityMean, double shipVelocityVariation, - double levelingCount, + int levelingCount, double probabilityCollisionSecondaryStructure, double flowVelocityStructureClosableMean, double flowVelocityStructureClosableStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -120,7 +120,7 @@ double modelFactorCollisionLoadMean, double modelFactorCollisionLoadVariation, double shipMassMean, double shipMassVariation, double shipVelocityMean, double shipVelocityVariation, - double levelingCount, + int levelingCount, double probabilityCollisionSecondaryStructure, double flowVelocityStructureClosableMean, double flowVelocityStructureClosableStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -120,7 +120,7 @@ double modelFactorCollisionLoadMean, double modelFactorCollisionLoadVariation, double shipMassMean, double shipMassVariation, double shipVelocityMean, double shipVelocityVariation, - double levelingCount, + int levelingCount, double probabilityCollisionSecondaryStructure, double flowVelocityStructureClosableMean, double flowVelocityStructureClosableStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInput.cs (.../StructuresStabilityPointLowSillLinearCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -120,7 +120,7 @@ double modelFactorCollisionLoadMean, double modelFactorCollisionLoadVariation, double shipMassMean, double shipMassVariation, double shipVelocityMean, double shipVelocityVariation, - double levelingCount, + int levelingCount, double probabilityCollisionSecondaryStructure, double flowVelocityStructureClosableMean, double flowVelocityStructureClosableStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs =================================================================== diff -u -r6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 6d2dc542d5e9e58331efbca4c6a4b6a5bd221b16) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInput.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInput.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -120,7 +120,7 @@ double modelFactorCollisionLoadMean, double modelFactorCollisionLoadVariation, double shipMassMean, double shipMassVariation, double shipVelocityMean, double shipVelocityVariation, - double levelingCount, + int levelingCount, double probabilityCollisionSecondaryStructure, double flowVelocityStructureClosableMean, double flowVelocityStructureClosableStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -46,7 +46,7 @@ const double factorStormDurationOpenStructure = 2.2; const double failureProbabilityOpenStructure = 3.3; const double failureProbabilityReparation = 4.4; - const double identicalApertures = 5.5; + const int identicalApertures = 5; const double allowedLevelIncreaseStorageMean = 6.6; const double allowedLevelIncreaseStorageStandardDeviation = 7.7; const double modelFactorStorageVolumeMean = 8.8; @@ -99,7 +99,7 @@ yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); yield return new HydraRingVariable(96, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 10.0, 11.1, double.NaN); @@ -120,7 +120,7 @@ double factorStormDurationOpenStructure, double failureProbabilityOpenStructure, double failureProbabilityReparation, - double identicalApertures, + int identicalApertures, double allowedLevelIncreaseStorageMean, double allowedLevelIncreaseStorageStandardDeviation, double modelFactorStorageVolumeMean, double modelFactorStorageVolumeStandardDeviation, double storageStructureAreaMean, double storageStructureAreaVariation, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -44,7 +44,7 @@ const double factorStormDurationOpenStructure = 2.2; const double failureProbabilityOpenStructure = 3.3; const double failureProbabilityReparation = 4.4; - const double identicalApertures = 5.5; + const int identicalApertures = 5; const double allowedLevelIncreaseStorageMean = 6.6; const double allowedLevelIncreaseStorageStandardDeviation = 7.7; const double modelFactorStorageVolumeMean = 8.8; @@ -111,7 +111,7 @@ var input = new StructuresClosureFloodedCulvertCalculationInput(111, new HydraRingSection(1, double.NaN, double.NaN), Enumerable.Empty(), new HydraRingBreakWater(1, 1.1), - 1.1, 222, 333, 5.5, 6.6, 7.7, 8.8, 11, 22, 33, 44, 55, + 1.1, 222, 333, 5.5, 6, 7.7, 8.8, 11, 22, 33, 44, 55, 66, 77, 88, 99, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21); // Call @@ -129,7 +129,7 @@ yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 23.3, 24.4, double.NaN); yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 25.5, 26.6, double.NaN); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -44,7 +44,7 @@ const double factorStormDurationOpenStructure = 2.2; const double failureProbabilityOpenStructure = 3.3; const double failureProbabilityReparation = 4.4; - const double identicalApertures = 5.5; + const int identicalApertures = 5; const double allowedLevelIncreaseStorageMean = 6.6; const double allowedLevelIncreaseStorageStandardDeviation = 7.7; const double modelFactorStorageVolumeMean = 8.8; @@ -117,7 +117,7 @@ var input = new StructuresClosureLowSillCalculationInput(111, new HydraRingSection(1, double.NaN, double.NaN), Enumerable.Empty(), new HydraRingBreakWater(1, 1.1), - 1.1, 222, 333, 5.5, 6.6, 7.7, 8.8, 11, 22, 33, 44, 55, + 1.1, 222, 333, 5.5, 6, 7.7, 8.8, 11, 22, 33, 44, 55, 66, 77, 88, 99, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25); @@ -137,7 +137,7 @@ yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 25.5, 26.6, double.NaN); yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 27.7, 28.8, double.NaN); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -44,7 +44,7 @@ const double factorStormDurationOpenStructure = 2.2; const double failureProbabilityOpenStructure = 3.3; const double failureProbabilityReparation = 4.4; - const double identicalApertures = 5.5; + const int identicalApertures = 5; const double allowedLevelIncreaseStorageMean = 6.6; const double allowedLevelIncreaseStorageStandardDeviation = 7.7; const double modelFactorStorageVolumeMean = 8.8; @@ -118,7 +118,7 @@ var input = new StructuresClosureVerticalWallCalculationInput(111, new HydraRingSection(1, double.NaN, double.NaN), Enumerable.Empty(), new HydraRingBreakWater(1, 1.1), - 1.1, 222, 333, 5.5, 6.6, 7.7, 8.8, 11, 22, 33, 44, 55, + 1.1, 222, 333, 5.5, 6, 7.7, 8.8, 11, 22, 33, 44, 55, 66, 77, 88, 99, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25); @@ -138,7 +138,7 @@ yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, 3.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, 4.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, 5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(72, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 6.6, 7.7, double.NaN); yield return new HydraRingVariable(95, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 8.8, 9.9, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -63,7 +63,7 @@ const double shipMassVariation = 19.9; const double shipVelocityMean = 20.0; const double shipVelocityVariation = 21.1; - const double levelingCount = 22.2; + const int levelingCount = 22; const double probabilityCollisionSecondaryStructure = 23.3; const double flowVelocityStructureClosableMean = 24.4; const double flowVelocityStructureClosableStandardDeviation = 25.5; @@ -157,7 +157,7 @@ yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); @@ -196,7 +196,7 @@ double modelFactorCollisionLoadMean, double modelFactorCollisionLoadVariation, double shipMassMean, double shipMassVariation, double shipVelocityMean, double shipVelocityVariation, - double levelingCount, + int levelingCount, double probabilityCollisionSecondaryStructure, double flowVelocityStructureClosableMean, double flowVelocityStructureClosableStandardDeviation, double insideWaterLevelMean, double insideWaterLevelStandardDeviation, Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -61,7 +61,7 @@ const double shipMassVariation = 19.9; const double shipVelocityMean = 20.0; const double shipVelocityVariation = 21.1; - const double levelingCount = 22.2; + const int levelingCount = 22; const double probabilityCollisionSecondaryStructure = 23.3; const double flowVelocityStructureClosableMean = 24.4; const double flowVelocityStructureClosableStandardDeviation = 25.5; @@ -167,7 +167,7 @@ new HydraRingBreakWater(1, 1.1), 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, - 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, + 18.18, 19.19, 20.20, 21.21, 22, 23.23, 24.24, 25.25, 26.26, 27.27, 28.28, 29.29, 30.30, 31.31, 32.32, 33.33, 34.34, 35.35, 36.36, 37.37, 38.38, 39.39, 40.40, 41.41, 42.42, 43.43, 44.44, 45.45, @@ -200,7 +200,7 @@ yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -61,7 +61,7 @@ const double shipMassVariation = 19.9; const double shipVelocityMean = 20.0; const double shipVelocityVariation = 21.1; - const double levelingCount = 22.2; + const int levelingCount = 22; const double probabilityCollisionSecondaryStructure = 23.3; const double flowVelocityStructureClosableMean = 24.4; const double flowVelocityStructureClosableStandardDeviation = 25.5; @@ -167,7 +167,7 @@ new HydraRingBreakWater(1, 1.1), 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, - 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, + 18.18, 19.19, 20.20, 21.21, 22, 23.23, 24.24, 25.25, 26.26, 27.27, 28.28, 29.29, 30.30, 31.31, 32.32, 33.33, 34.34, 35.35, 36.36, 37.37, 38.38, 39.39, 40.40, 41.41, 42.42, 43.43, 44.44, 45.45, @@ -200,7 +200,7 @@ yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -61,7 +61,7 @@ const double shipMassVariation = 19.9; const double shipVelocityMean = 20.0; const double shipVelocityVariation = 21.1; - const double levelingCount = 22.2; + const int levelingCount = 22; const double probabilityCollisionSecondaryStructure = 23.3; const double flowVelocityStructureClosableMean = 24.4; const double flowVelocityStructureClosableStandardDeviation = 25.5; @@ -167,7 +167,7 @@ new HydraRingBreakWater(1, 1.1), 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, - 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, + 18.18, 19.19, 20.20, 21.21, 22, 23.23, 24.24, 25.25, 26.26, 27.27, 28.28, 29.29, 30.30, 31.31, 32.32, 33.33, 34.34, 35.35, 36.36, 37.37, 38.38, 39.39, 40.40, 41.41, 42.42, 43.43, 44.44, 45.45, @@ -199,7 +199,7 @@ yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs =================================================================== diff -u -r43ad0c9b404b358982f0cfff038d93561ad3604e -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 43ad0c9b404b358982f0cfff038d93561ad3604e) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -61,7 +61,7 @@ const double shipMassVariation = 19.9; const double shipVelocityMean = 20.0; const double shipVelocityVariation = 21.1; - const double levelingCount = 22.2; + const int levelingCount = 22; const double probabilityCollisionSecondaryStructure = 23.3; const double flowVelocityStructureClosableMean = 24.4; const double flowVelocityStructureClosableStandardDeviation = 25.5; @@ -167,7 +167,7 @@ new HydraRingBreakWater(1, 1.1), 1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8, 9.9, 10.10, 11.11, 12.12, 13.13, 14.14, 15.15, 16.16, 17.17, - 18.18, 19.19, 20.20, 21.21, 22.22, 23.23, 24.24, + 18.18, 19.19, 20.20, 21.21, 22, 23.23, 24.24, 25.25, 26.26, 27.27, 28.28, 29.29, 30.30, 31.31, 32.32, 33.33, 34.34, 35.35, 36.36, 37.37, 38.38, 39.39, 40.40, 41.41, 42.42, 43.43, 44.44, 45.45, @@ -199,7 +199,7 @@ yield return new HydraRingVariable(87, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 16.6, 17.7, double.NaN); yield return new HydraRingVariable(88, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(89, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 20.0, 21.1, double.NaN); - yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, 22, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); yield return new HydraRingVariable(93, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 26.6, 27.7, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r4372d557e868f50a1cecc2f22e28645fa6d44083 -r22ad308890d0ae52cc989b25d2f326973357bb93 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 4372d557e868f50a1cecc2f22e28645fa6d44083) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 22ad308890d0ae52cc989b25d2f326973357bb93) @@ -774,7 +774,7 @@ hydraRingConfigurationService.AddHydraRingCalculationInput( new StructuresClosureFloodedCulvertCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, breakWater, - 1.1, 2.2, 3.3, 4.4, 5.5, + 1.1, 2.2, 3.3, 4.4, 5, 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, @@ -804,7 +804,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 67, 0, 4, 23.3, 24.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 68, 3.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 71, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 71, 5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 93, 0, 2, 25.5, 26.6, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 94, 0, 4, 6.6, 7.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 95, 0, 4, 8.8, 9.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + @@ -887,7 +887,7 @@ hydraRingConfigurationService.AddHydraRingCalculationInput( new StructuresClosureLowSillCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, breakWater, - 1.1, 2.2, 3.3, 4.4, 5.5, + 1.1, 2.2, 3.3, 4.4, 5, 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, @@ -919,7 +919,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 65, 0, 2, 25.5, 26.6, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 68, 3.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 71, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 71, 5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 93, 0, 2, 27.7, 28.8, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 94, 0, 4, 6.6, 7.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 95, 0, 4, 8.8, 9.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + @@ -1003,7 +1003,7 @@ hydraRingConfigurationService.AddHydraRingCalculationInput( new StructuresClosureVerticalWallCalculationInput(hydraulicBoundaryLocationId, section, forelandPoints, breakWater, - 1.1, 2.2, 3.3, 4.4, 5.5, + 1.1, 2.2, 3.3, 4.4, 5, 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, @@ -1035,7 +1035,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 63, 2.2, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 68, 3.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 71, 5.5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 71, 5, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 72, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 94, 0, 4, 6.6, 7.7, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 95, 0, 4, 8.8, 9.9, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + @@ -1124,7 +1124,7 @@ 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, - 19.9, 20.0, 21.1, 22.2, + 19.9, 20.0, 21.1, 22, 23.3, 24.4, 25.5, 26.6, 27.7, 28.8, 29.9, 30.0, 31.1, 32.2, 33.3, 34.4, @@ -1174,7 +1174,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 87, 0, 2, 16.6, NULL, NULL, NULL, 0, 17.7, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 88, 0, 2, 18.8, NULL, NULL, NULL, 0, 19.9, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1271,7 +1271,7 @@ 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, - 19.9, 20.0, 21.1, 22.2, + 19.9, 20.0, 21.1, 22, 23.3, 24.4, 25.5, 26.6, 27.7, 28.8, 29.9, 30.0, 31.1, 32.2, 33.3, 34.4, @@ -1321,7 +1321,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 87, 0, 2, 16.6, NULL, NULL, NULL, 0, 17.7, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 88, 0, 2, 18.8, NULL, NULL, NULL, 0, 19.9, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1418,7 +1418,7 @@ 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, - 19.9, 20.0, 21.1, 22.2, + 19.9, 20.0, 21.1, 22, 23.3, 24.4, 25.5, 26.6, 27.7, 28.8, 29.9, 30.0, 31.1, 32.2, 33.3, 34.4, @@ -1467,7 +1467,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 87, 0, 2, 16.6, NULL, NULL, NULL, 0, 17.7, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 88, 0, 2, 18.8, NULL, NULL, NULL, 0, 19.9, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1565,7 +1565,7 @@ 6.6, 7.7, 8.8, 9.9, 10.0, 11.1, 12.2, 13.3, 14.4, 15.5, 16.6, 17.7, 18.8, - 19.9, 20.0, 21.1, 22.2, + 19.9, 20.0, 21.1, 22, 23.3, 24.4, 25.5, 26.6, 27.7, 28.8, 29.9, 30.0, 31.1, 32.2, 33.3, 34.4, @@ -1614,7 +1614,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 87, 0, 2, 16.6, NULL, NULL, NULL, 0, 17.7, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 88, 0, 2, 18.8, NULL, NULL, NULL, 0, 19.9, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 89, 0, 2, 20, NULL, NULL, NULL, 0, 21.1, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22.2, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 90, 22, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 92, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 93, 0, 2, 26.6, 27.7, NULL, NULL, 1, 0, 50);" + Environment.NewLine +