Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs =================================================================== diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs (.../ExceedanceProbabilityCalculationInput.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ExceedanceProbabilityCalculationInput.cs (.../ExceedanceProbabilityCalculationInput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -22,8 +22,8 @@ namespace Ringtoets.HydraRing.Calculation.Data.Input { /// - /// Container of all data necessary for performing a type I calculation via Hydra-Ring: - /// Given a set of random variables, compute the probability of failure. + /// Container of all data necessary for performing Hydra-Ring calculations that compute a + /// probability of failure. /// public abstract class ExceedanceProbabilityCalculationInput : HydraRingCalculationInput { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs =================================================================== diff -u -r5e6eacaf76f765ba77febee673e9e94895e46feb -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 5e6eacaf76f765ba77febee673e9e94895e46feb) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/HydraRingCalculationInput.cs (.../HydraRingCalculationInput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -117,7 +117,7 @@ /// /// Gets the reliability index to use during the calculation. /// - /// Only relevant for type II computations. + /// Only relevant for calculations that iterate towards a reliability index. public virtual double Beta { get Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs =================================================================== diff -u -r03b153b8f94dc5ff3619bdd52c79394a0d7fde85 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs (.../ReliabilityIndexCalculationInput.cs) (revision 03b153b8f94dc5ff3619bdd52c79394a0d7fde85) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/ReliabilityIndexCalculationInput.cs (.../ReliabilityIndexCalculationInput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -24,8 +24,8 @@ namespace Ringtoets.HydraRing.Calculation.Data.Input { /// - /// Container of all data necessary for performing a type II calculation via Hydra-Ring: - /// Iterate towards a reliability index. + /// Container of all data necessary for performing Hydra-Ring calculations that + /// iterate towards a reliability index. /// public abstract class ReliabilityIndexCalculationInput : HydraRingCalculationInput { @@ -46,7 +46,7 @@ { get { - return 2; + return 9; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs =================================================================== diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresClosureCalculationInput.cs (.../StructuresClosureCalculationInput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -155,12 +155,10 @@ HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, factorStormDurationOpenStructure, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Normal, failureProbabilityOpenStructure, - HydraRingDeviationType.Standard, 0.0, - 1.0, double.NaN); // TODO: Pass as deterministic value as soon as Hydra-Ring is updated - yield return new HydraRingVariable(69, HydraRingDistributionType.Normal, failureProbabilityReparation, - HydraRingDeviationType.Standard, 0.0, - 1.0, double.NaN); // TODO: Pass as deterministic value as soon as Hydra-Ring is updated + yield return new HydraRingVariable(68, HydraRingDistributionType.Deterministic, failureProbabilityOpenStructure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); + yield return new HydraRingVariable(69, HydraRingDistributionType.Deterministic, failureProbabilityReparation, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(71, HydraRingDistributionType.Deterministic, identicalApertures, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, @@ -180,9 +178,8 @@ yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, failureProbabilityStructureWithErosion, - HydraRingDeviationType.Standard, 0.0, - 1.0, double.NaN); // TODO: Pass as deterministic value as soon as Hydra-Ring is updated + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityStructureWithErosion, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation, double.NaN); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs =================================================================== diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresOvertoppingCalculationInput.cs (.../StructuresOvertoppingCalculationInput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -197,9 +197,8 @@ yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, failureProbabilityStructureWithErosion, - HydraRingDeviationType.Standard, 0.0, - 1.0, double.NaN); // TODO: Pass as deterministic value as soon as Hydra-Ring is updated + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityStructureWithErosion, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, widthFlowAperturesMean, widthFlowAperturesVariation, double.NaN); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs =================================================================== diff -u -r87a404e38145e69630b7deed3e6600b3d1dff9f2 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 87a404e38145e69630b7deed3e6600b3d1dff9f2) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/Structures/StructuresStabilityPointCalculationInput.cs (.../StructuresStabilityPointCalculationInput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -282,9 +282,8 @@ yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, insideWaterLevelFailureConstructionMean, insideWaterLevelFailureConstructionStandardDeviation, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Normal, failureProbabilityRepairClosure, - HydraRingDeviationType.Standard, 0.0, - 1.0, double.NaN); // TODO: Pass as deterministic value as soon as Hydra-Ring is updated + yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, failureProbabilityRepairClosure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, failureCollisionEnergyMean, failureCollisionEnergyVariation, double.NaN); @@ -299,9 +298,8 @@ shipVelocityVariation, double.NaN); yield return new HydraRingVariable(90, HydraRingDistributionType.Deterministic, levellingCount, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Normal, probabilityCollisionSecondaryStructure, - HydraRingDeviationType.Standard, 0.0, - 1.0, double.NaN); // TODO: Pass as deterministic value as soon as Hydra-Ring is updated + yield return new HydraRingVariable(91, HydraRingDistributionType.Deterministic, probabilityCollisionSecondaryStructure, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(92, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, flowVelocityStructureClosableMean, flowVelocityStructureClosableStandardDeviation, double.NaN); @@ -325,9 +323,8 @@ yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, criticalOvertoppingDischargeMean, criticalOvertoppingDischargeVariation, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, failureProbabilityStructureWithErosion, - HydraRingDeviationType.Standard, 0.0, - 1.0, double.NaN); // TODO: Pass as deterministic value as soon as Hydra-Ring is updated + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, failureProbabilityStructureWithErosion, + HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, stormDurationMean, stormDurationVariation, double.NaN); Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs =================================================================== diff -u -r19674fbb52038a17df349319e2bd9fca258e8df6 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 19674fbb52038a17df349319e2bd9fca258e8df6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Input/WaveConditions/WaveConditionsCalculationInput.cs (.../WaveConditionsCalculationInput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -82,7 +82,7 @@ { get { - return 7; + return 8; } } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationAlphaOutput.cs =================================================================== diff -u -r4477e75623600b68603b5f96175eea2431fe1cd5 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationAlphaOutput.cs (.../ExceedanceProbabilityCalculationAlphaOutput.cs) (revision 4477e75623600b68603b5f96175eea2431fe1cd5) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationAlphaOutput.cs (.../ExceedanceProbabilityCalculationAlphaOutput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -22,8 +22,8 @@ namespace Ringtoets.HydraRing.Calculation.Data.Output { /// - /// Container of all relevant output generated by a type I calculation via Hydra-Ring: - /// Given a set of random variables, compute the probability of failure. + /// Container of all relevant alpha output generated by Hydra-Ring calculations that compute a + /// probability of failure. /// public class ExceedanceProbabilityCalculationAlphaOutput : ExceedanceProbabilityCalculationOutputBase { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationOutput.cs =================================================================== diff -u -r0467e8cd28578cf205b473d3830dbd02adb29feb -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationOutput.cs (.../ExceedanceProbabilityCalculationOutput.cs) (revision 0467e8cd28578cf205b473d3830dbd02adb29feb) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationOutput.cs (.../ExceedanceProbabilityCalculationOutput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -24,8 +24,8 @@ namespace Ringtoets.HydraRing.Calculation.Data.Output { /// - /// Container of all relevant output generated by a type I calculation via Hydra-Ring: - /// Given a set of random variables, compute the probability of failure. + /// Container of all relevant output generated by Hydra-Ring calculations that compute a + /// probability of failure. /// public class ExceedanceProbabilityCalculationOutput : ExceedanceProbabilityCalculationOutputBase { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationOutputBase.cs =================================================================== diff -u -r4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationOutputBase.cs (.../ExceedanceProbabilityCalculationOutputBase.cs) (revision 4ba68ad8c0ed15ce0449c39a5c6df1ef53daf866) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ExceedanceProbabilityCalculationOutputBase.cs (.../ExceedanceProbabilityCalculationOutputBase.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -22,7 +22,7 @@ namespace Ringtoets.HydraRing.Calculation.Data.Output { /// - /// Base class for exceedance probability calculation output. + /// Base class for output generated by Hydra-Ring calculations that compute a probability of failure. /// public abstract class ExceedanceProbabilityCalculationOutputBase { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ReliabilityIndexCalculationOutput.cs =================================================================== diff -u -rbc4ac80f66ddacc89d279d1260465c63ddee4d58 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ReliabilityIndexCalculationOutput.cs (.../ReliabilityIndexCalculationOutput.cs) (revision bc4ac80f66ddacc89d279d1260465c63ddee4d58) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/ReliabilityIndexCalculationOutput.cs (.../ReliabilityIndexCalculationOutput.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -22,8 +22,8 @@ namespace Ringtoets.HydraRing.Calculation.Data.Output { /// - /// Container of all relevant output generated by a type II calculation via Hydra-Ring: - /// Iterate towards a reliability index. + /// Container of all relevant output generated by Hydra-Ring calculations that + /// iterate towards a reliability index. /// public class ReliabilityIndexCalculationOutput { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/DesignTablesSetting.cs =================================================================== diff -u -re4565100f14feece0bea5bc7acf9eef9acf7a8e6 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/DesignTablesSetting.cs (.../DesignTablesSetting.cs) (revision e4565100f14feece0bea5bc7acf9eef9acf7a8e6) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Settings/DesignTablesSetting.cs (.../DesignTablesSetting.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -43,7 +43,7 @@ /// /// Gets the minimum value to use while iterating towards a reliability index. /// - /// This property is only applicable in case of type II computations. + /// Only relevant for calculations that iterate towards a reliability index. public double ValueMin { get @@ -55,7 +55,7 @@ /// /// Gets the maximum value to use while iterating towards a reliability index. /// - /// This property is only applicable in case of type II computations. + /// Only relevant for calculations that iterate towards a reliability index. public double ValueMax { get Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DikesOvertopping.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/DllLinearizedBetaAlpha.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.Test.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.TestUtils.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Database.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.DuneErosionWrapper.Tests.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.DuneErosionWrapper.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.IO.Native.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.IO.TestUtils.Native.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.MacroStability.Wrapper.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.Piping2017Wrapper.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/HydraRing.PluginShared.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/LicenseAGPL.txt =================================================================== diff -u --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/LicenseAGPL.txt (revision 0) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/LicenseAGPL.txt (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/MechanismComputation.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/RingComputation.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/RunTimeLibs.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/StructuresStructuralFailure2017wrapper.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/config.sqlite =================================================================== diff -u -rfef3460a27a37aaa34948649aae3dd9ae143041c -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/dikesOverflow.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/dllHydraulicDunes.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/duneErosion.Native.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/exeOosterschelde.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/exePreprocessClosure2017.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/exePreprocessForRelevantWindDirections.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/feedbackDLL.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/hydraring_computation.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/ifdlg100.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/integrationTests.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/libicaf.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/linearizedBetaAlpha.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/macroStability.Native.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfc100d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfc100ud.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfc110d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfc110ud.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfcm100d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfcm100ud.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfcm110d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/mfcm110ud.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/msvcp100d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/msvcp110d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/msvcr100.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/msvcr100d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/msvcr110d.dll =================================================================== diff -u -rc2a3a81f0c071f5f68aaa4a2cdc42831c94f5b82 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/piping2017.Native.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresClosure2017.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresOvertopping2017.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/structuresStructuralFailure2017.Native.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/unitTests.exe =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/HydraRing/winapi.dll =================================================================== diff -u -rc34c2e384cd7dae5371fb5d827ac26cb66e70cfe -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 Binary files differ Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs =================================================================== diff -u -re69acb9595f7bf1d202ddd1fb51934b66768b75d -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision e69acb9595f7bf1d202ddd1fb51934b66768b75d) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ExceedanceProbabilityCalculationParser.cs (.../ExceedanceProbabilityCalculationParser.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -30,8 +30,7 @@ namespace Ringtoets.HydraRing.Calculation.Parsers { /// - /// Parser for the output of a Hydra-Ring type I calculation via Hydra-Ring: - /// Given a set of random variables, compute the probability of failure. + /// Parser for the output of Hydra-Ring calculations that compute a probability of failure. /// public class ExceedanceProbabilityCalculationParser : IHydraRingFileParser { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs (.../ReliabilityIndexCalculationParser.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/ReliabilityIndexCalculationParser.cs (.../ReliabilityIndexCalculationParser.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -29,8 +29,7 @@ namespace Ringtoets.HydraRing.Calculation.Parsers { /// - /// Parser for the output of a Hydra-Ring type II calculation: - /// Iterate towards a reliability index. + /// Parser for the output of Hydra-Ring calculations that iterate towards a reliability index. /// public class ReliabilityIndexCalculationParser : IHydraRingFileParser { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/DesignTablesSettingsProvider.cs =================================================================== diff -u -re3f9dffa91a0def0b6e6bc7dfabef74cc64745c5 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision e3f9dffa91a0def0b6e6bc7dfabef74cc64745c5) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Providers/DesignTablesSettingsProvider.cs (.../DesignTablesSettingsProvider.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -69,11 +69,11 @@ { { HydraRingFailureMechanismType.AssessmentLevel, - new DesignTablesSetting(5, 15) + new DesignTablesSetting(2, 4) }, { HydraRingFailureMechanismType.WaveHeight, - new DesignTablesSetting(5, 15) + new DesignTablesSetting(1, 4) }, { HydraRingFailureMechanismType.WavePeakPeriod, @@ -85,15 +85,15 @@ }, { HydraRingFailureMechanismType.QVariant, - new DesignTablesSetting(5, 15) + new DesignTablesSetting(10, 50) }, { HydraRingFailureMechanismType.DikesOvertopping, new DesignTablesSetting(double.NaN, double.NaN) }, { HydraRingFailureMechanismType.DikesHeight, - new DesignTablesSetting(5, 15) + new DesignTablesSetting(2, 4) }, { HydraRingFailureMechanismType.DikesPiping, Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj =================================================================== diff -u -re9ed7ace8ecabdee49a6635bf43b1fbb3613a090 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision e9ed7ace8ecabdee49a6635bf43b1fbb3613a090) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -258,15 +258,6 @@ Always - - Always - - - Always - - - Always - Always @@ -306,15 +297,6 @@ Always - - Always - - - Always - - - Always - Always @@ -333,6 +315,9 @@ Always + + Always + Always @@ -351,63 +336,24 @@ Always - - Always - - - Always - Always - - Always - Always - - Always - - - Always - - - Always - Always - - Always - Always - - Always - - - Always - Always - - Always - - - Always - - - Always - Always - - Always - Always @@ -432,9 +378,6 @@ Always - - Always - Always @@ -456,9 +399,6 @@ Always - - Always - Always Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingConfigurationService.cs (.../HydraRingConfigurationService.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -50,7 +50,7 @@ /// Performing piping calculations (DesignTables > AlternativeId) /// /// - /// Type 3 computations (DesignTables > Method) + /// Type III calculations (DesignTables > Method) /// /// /// In the end, the configuration can be used to generate a Hydra-Ring database creation script. @@ -305,13 +305,13 @@ "LoadVariableId", defaultHydraRingValue // Fixed: not relevant }, { - "TableMin", defaultHydraRingValue // Fixed: no support for type III computations (see "Method") + "TableMin", defaultHydraRingValue // Fixed: no support for type III calculations (see "Method") }, { - "TableMax", defaultHydraRingValue // Fixed: no support for type III computations (see "Method") + "TableMax", defaultHydraRingValue // Fixed: no support for type III calculations (see "Method") }, { - "TableStepSize", defaultHydraRingValue // Fixed: no support for type III computations (see "Method") + "TableStepSize", defaultHydraRingValue // Fixed: no support for type III calculations (see "Method") }, { "ValueMin", GetHydraRingValue(designTablesSetting.ValueMin) Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs =================================================================== diff -u -r512177cc50d892bede45024499342a94ae867cfb -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/AssessmentLevelCalculationInputTest.cs (.../AssessmentLevelCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -44,7 +44,7 @@ // Assert double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.AreEqual(HydraRingFailureMechanismType.AssessmentLevel, assessmentLevelCalculationInput.FailureMechanismType); - Assert.AreEqual(2, assessmentLevelCalculationInput.CalculationTypeId); + Assert.AreEqual(9, assessmentLevelCalculationInput.CalculationTypeId); Assert.AreEqual(26, assessmentLevelCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, assessmentLevelCalculationInput.HydraulicBoundaryLocationId); Assert.IsNotNull(assessmentLevelCalculationInput.Section); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/DikeHeightCalculationInputTest.cs (.../DikeHeightCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -76,14 +76,12 @@ exponentModelFactorShallowMean, exponentModelFactorShallowStandardDeviation); // Assert - const int expectedCalculationTypeId = 2; - const int expectedVariableId = 1; double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.IsInstanceOf(dikeHeightCalculationInput); - Assert.AreEqual(expectedCalculationTypeId, dikeHeightCalculationInput.CalculationTypeId); + Assert.AreEqual(9, dikeHeightCalculationInput.CalculationTypeId); Assert.AreEqual(hydraulicBoundaryLocationId, dikeHeightCalculationInput.HydraulicBoundaryLocationId); Assert.AreEqual(HydraRingFailureMechanismType.DikesHeight, dikeHeightCalculationInput.FailureMechanismType); - Assert.AreEqual(expectedVariableId, dikeHeightCalculationInput.VariableId); + Assert.AreEqual(1, dikeHeightCalculationInput.VariableId); Assert.IsNotNull(dikeHeightCalculationInput.Section); HydraRingDataEqualityHelper.AreEqual(GetDefaultDikeHeightVariables().ToArray(), dikeHeightCalculationInput.Variables.ToArray()); CollectionAssert.AreEqual(expectedRingProfilePoints, dikeHeightCalculationInput.ProfilePoints); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs =================================================================== diff -u -r512177cc50d892bede45024499342a94ae867cfb -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 512177cc50d892bede45024499342a94ae867cfb) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Hydraulics/WaveHeightCalculationInputTest.cs (.../WaveHeightCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -44,7 +44,7 @@ // Assert double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.AreEqual(HydraRingFailureMechanismType.WaveHeight, waveHeightCalculationInput.FailureMechanismType); - Assert.AreEqual(2, waveHeightCalculationInput.CalculationTypeId); + Assert.AreEqual(9, waveHeightCalculationInput.CalculationTypeId); Assert.AreEqual(28, waveHeightCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, waveHeightCalculationInput.HydraulicBoundaryLocationId); Assert.IsNotNull(waveHeightCalculationInput.Section); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs =================================================================== diff -u -r03b153b8f94dc5ff3619bdd52c79394a0d7fde85 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs (.../ReliabilityIndexCalculationInputTest.cs) (revision 03b153b8f94dc5ff3619bdd52c79394a0d7fde85) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/ReliabilityIndexCalculationInputTest.cs (.../ReliabilityIndexCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -43,7 +43,7 @@ // Assert double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.AreEqual(locationId, reliabilityIndexCalculationInput.HydraulicBoundaryLocationId); - Assert.AreEqual(2, reliabilityIndexCalculationInput.CalculationTypeId); + Assert.AreEqual(9, reliabilityIndexCalculationInput.CalculationTypeId); CollectionAssert.IsEmpty(reliabilityIndexCalculationInput.Variables); CollectionAssert.IsEmpty(reliabilityIndexCalculationInput.ProfilePoints); CollectionAssert.IsEmpty(reliabilityIndexCalculationInput.ForelandsPoints); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs =================================================================== diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureCalculationInputTest.cs (.../StructuresClosureCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -97,16 +97,16 @@ { yield return new HydraRingVariable(58, HydraRingDistributionType.Deterministic, 1.1, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Normal, 3.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Normal, 4.4, HydraRingDeviationType.Standard, 0.0, 1.0, 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, 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); yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 17.7, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs =================================================================== diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureFloodedCulvertCalculationInputTest.cs (.../StructuresClosureFloodedCulvertCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -127,8 +127,8 @@ yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(66, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 21.1, 22.2, double.NaN); yield return new HydraRingVariable(67, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 23.3, 24.4, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Normal, 3.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Normal, 4.4, HydraRingDeviationType.Standard, 0.0, 1.0, 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, 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); @@ -137,7 +137,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 17.7, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs =================================================================== diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureLowSillCalculationInputTest.cs (.../StructuresClosureLowSillCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -135,8 +135,8 @@ yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 23.3, 24.4, double.NaN); yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 25.5, 26.6, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Normal, 3.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Normal, 4.4, HydraRingDeviationType.Standard, 0.0, 1.0, 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, 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); @@ -145,7 +145,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 17.7, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 29.9, 30.0, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); yield return new HydraRingVariable(129, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs =================================================================== diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresClosureVerticalWallCalculationInputTest.cs (.../StructuresClosureVerticalWallCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -136,8 +136,8 @@ yield return new HydraRingVariable(61, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(62, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 24.4, 25.5, double.NaN); yield return new HydraRingVariable(63, HydraRingDistributionType.Deterministic, 2.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(68, HydraRingDistributionType.Normal, 3.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); - yield return new HydraRingVariable(69, HydraRingDistributionType.Normal, 4.4, HydraRingDeviationType.Standard, 0.0, 1.0, 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, 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); @@ -146,7 +146,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 12.2, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 13.3, 14.4, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 15.5, 16.6, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 17.7, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 17.7, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 28.8, 29.9, double.NaN); yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, 30.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs =================================================================== diff -u -r5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 5cbdfc02ed72dd65d6d6eea33a33804ea6cf6b02) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresOvertoppingCalculationInputTest.cs (.../StructuresOvertoppingCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -112,7 +112,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 15.5, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 16.6, 17.7, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 18.8, 19.9, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 20.0, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 20.0, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 21.1, 22.2, double.NaN); yield return new HydraRingVariable(107, HydraRingDistributionType.Deterministic, 23.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 24.4, 25.5, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs =================================================================== diff -u -r87a404e38145e69630b7deed3e6600b3d1dff9f2 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 87a404e38145e69630b7deed3e6600b3d1dff9f2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointCalculationInputTest.cs (.../StructuresStabilityPointCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -152,13 +152,13 @@ yield return new HydraRingVariable(64, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 7.7, 8.8, double.NaN); yield return new HydraRingVariable(65, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 9.9, 10.0, double.NaN); yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Normal, 13.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); 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, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Normal, 23.3, HydraRingDeviationType.Standard, 0.0, 1.0, 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); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); @@ -167,7 +167,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 39.9, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs =================================================================== diff -u -r87a404e38145e69630b7deed3e6600b3d1dff9f2 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 87a404e38145e69630b7deed3e6600b3d1dff9f2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertLinearCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -195,13 +195,13 @@ yield return new HydraRingVariable(80, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); yield return new HydraRingVariable(83, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Normal, 13.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); 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, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Normal, 23.3, HydraRingDeviationType.Standard, 0.0, 1.0, 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); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); @@ -210,7 +210,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 39.9, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs =================================================================== diff -u -r87a404e38145e69630b7deed3e6600b3d1dff9f2 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 87a404e38145e69630b7deed3e6600b3d1dff9f2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs (.../StructuresStabilityPointFloodedCulvertQuadraticCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -195,13 +195,13 @@ yield return new HydraRingVariable(81, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); yield return new HydraRingVariable(84, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Normal, 13.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); 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, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Normal, 23.3, HydraRingDeviationType.Standard, 0.0, 1.0, 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); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); @@ -210,7 +210,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 39.9, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); yield return new HydraRingVariable(131, HydraRingDistributionType.Deterministic, 44.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillLinearCalculationInputTest.cs (.../StructuresStabilityPointLowSillLinearCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -194,13 +194,13 @@ yield return new HydraRingVariable(80, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 54.4, 55.5, double.NaN); yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); yield return new HydraRingVariable(83, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Normal, 13.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); 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, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Normal, 23.3, HydraRingDeviationType.Standard, 0.0, 1.0, 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); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); @@ -209,7 +209,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 39.9, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs =================================================================== diff -u -r07cf1185ccd0260f3e72818dff093ff39dbdd816 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 07cf1185ccd0260f3e72818dff093ff39dbdd816) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/Structures/StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs (.../StructuresStabilityPointLowSillQuadraticCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -194,13 +194,13 @@ yield return new HydraRingVariable(81, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 54.4, 55.5, double.NaN); yield return new HydraRingVariable(82, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 11.1, 12.2, double.NaN); yield return new HydraRingVariable(84, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 56.6, 57.7, double.NaN); - yield return new HydraRingVariable(85, HydraRingDistributionType.Normal, 13.3, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(85, HydraRingDistributionType.Deterministic, 13.3, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(86, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 14.4, 15.5, double.NaN); 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, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); - yield return new HydraRingVariable(91, HydraRingDistributionType.Normal, 23.3, HydraRingDeviationType.Standard, 0.0, 1.0, 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); yield return new HydraRingVariable(94, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 28.8, 29.9, double.NaN); @@ -209,7 +209,7 @@ yield return new HydraRingVariable(97, HydraRingDistributionType.Deterministic, 34.4, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(103, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Standard, 35.5, 36.6, double.NaN); yield return new HydraRingVariable(104, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 37.7, 38.8, double.NaN); - yield return new HydraRingVariable(105, HydraRingDistributionType.Normal, 39.9, HydraRingDeviationType.Standard, 0.0, 1.0, double.NaN); + yield return new HydraRingVariable(105, HydraRingDistributionType.Deterministic, 39.9, HydraRingDeviationType.Standard, double.NaN, double.NaN, double.NaN); yield return new HydraRingVariable(106, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Variation, 58.8, 59.9, double.NaN); yield return new HydraRingVariable(108, HydraRingDistributionType.LogNormal, double.NaN, HydraRingDeviationType.Variation, 40.0, 41.1, double.NaN); yield return new HydraRingVariable(130, HydraRingDistributionType.Normal, double.NaN, HydraRingDeviationType.Standard, 42.2, 43.3, double.NaN); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCalculationInputTest.cs (.../WaveConditionsCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -59,13 +59,11 @@ b); // Assert - const int expectedCalculationTypeId = 7; - const int expectedVariableId = 114; double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.IsInstanceOf(waveConditionsCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCalculationInput.FailureMechanismType); - Assert.AreEqual(expectedCalculationTypeId, waveConditionsCalculationInput.CalculationTypeId); - Assert.AreEqual(expectedVariableId, waveConditionsCalculationInput.VariableId); + Assert.AreEqual(8, waveConditionsCalculationInput.CalculationTypeId); + Assert.AreEqual(114, waveConditionsCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsCalculationInput.HydraulicBoundaryLocationId); Assert.IsNotNull(waveConditionsCalculationInput.Section); Assert.AreEqual(sectionId, waveConditionsCalculationInput.Section.SectionId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsCosineCalculationInputTest.cs (.../WaveConditionsCosineCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -61,13 +61,11 @@ c); // Assert - const int expectedCalculationTypeId = 7; - const int expectedVariableId = 114; double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.IsInstanceOf(waveConditionsCosineCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsCosineCalculationInput.FailureMechanismType); - Assert.AreEqual(expectedCalculationTypeId, waveConditionsCosineCalculationInput.CalculationTypeId); - Assert.AreEqual(expectedVariableId, waveConditionsCosineCalculationInput.VariableId); + Assert.AreEqual(8, waveConditionsCosineCalculationInput.CalculationTypeId); + Assert.AreEqual(114, waveConditionsCosineCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsCosineCalculationInput.HydraulicBoundaryLocationId); Assert.IsNotNull(waveConditionsCosineCalculationInput.Section); Assert.AreEqual(sectionId, waveConditionsCosineCalculationInput.Section.SectionId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs =================================================================== diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Input/WaveConditions/WaveConditionsTrapezoidCalculationInputTest.cs (.../WaveConditionsTrapezoidCalculationInputTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -62,13 +62,11 @@ beta2); // Assert - const int expectedCalculationTypeId = 7; - const int expectedVariableId = 114; double expectedBeta = StatisticsConverter.NormToBeta(norm); Assert.IsInstanceOf(waveConditionsTrapezoidCalculationInput); Assert.AreEqual(HydraRingFailureMechanismType.QVariant, waveConditionsTrapezoidCalculationInput.FailureMechanismType); - Assert.AreEqual(expectedCalculationTypeId, waveConditionsTrapezoidCalculationInput.CalculationTypeId); - Assert.AreEqual(expectedVariableId, waveConditionsTrapezoidCalculationInput.VariableId); + Assert.AreEqual(8, waveConditionsTrapezoidCalculationInput.CalculationTypeId); + Assert.AreEqual(114, waveConditionsTrapezoidCalculationInput.VariableId); Assert.AreEqual(hydraulicBoundaryLocationId, waveConditionsTrapezoidCalculationInput.HydraulicBoundaryLocationId); Assert.IsNotNull(waveConditionsTrapezoidCalculationInput.Section); Assert.AreEqual(sectionId, waveConditionsTrapezoidCalculationInput.Section.SectionId); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs =================================================================== diff -u -r87a404e38145e69630b7deed3e6600b3d1dff9f2 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 87a404e38145e69630b7deed3e6600b3d1dff9f2) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Integration/HydraRingConfigurationServiceIntegrationTest.cs (.../HydraRingConfigurationServiceIntegrationTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -54,7 +54,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 2, 26, 0, 0, 0, 0, 2.18, 4.18, 3.71901648545568);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (1, 1, 1, 1, 9, 26, 0, 0, 0, 0, 2.18, 4.18, 3.71901648545568);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + "INSERT INTO [Numerics] VALUES (1, 1, 1, 1, 1, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine + @@ -126,7 +126,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 0, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (1, 11, 1, 1, 2, 28, 0, 0, 0, 0, 0.11, 2.11, 3.71901648545568);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (1, 11, 1, 1, 9, 28, 0, 0, 0, 0, 0.11, 2.11, 3.71901648545568);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + "INSERT INTO [Numerics] VALUES (1, 11, 1, 1, 11, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine + @@ -355,7 +355,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 3.3, 2.2);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 2, 1, 0, 0, 0, 0, 3.48, 5.48, 3.09023230616781);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (1, 101, 1, 1, 9, 1, 0, 0, 0, 0, 3.48, 5.48, 3.09023230616781);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + "INSERT INTO [Numerics] VALUES (1, 101, 1, 1, 102, 1, 9, 150, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine + @@ -511,7 +511,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 97, 18.18, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 103, 0, 4, 19.19, 20.2, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 104, 0, 4, 21.21, NULL, NULL, NULL, 0, 22.22, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 105, 23.23, 2, 0, 1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 105, 23.23, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 106, 0, 2, 24.24, NULL, NULL, NULL, 0, 25.25, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 107, 26.26, 0, 0, NULL, NULL, NULL, 1, 0, 99000);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 110, 1, 1, 108, 0, 4, 27.27, NULL, NULL, NULL, 0, 28.28, 999999);" + Environment.NewLine + @@ -600,7 +600,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 56.23, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 7, 114, 0, 0, 0, 0, 1, 5, 3.71901648545568);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 1, 5, 3.71901648545568);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + "INSERT INTO [Numerics] VALUES (1, 3, 1, 1, 5, 4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine + @@ -698,7 +698,7 @@ "INSERT INTO [Sections] VALUES (1, 1, 1, 1, 1, 0, 0, 0, 0, 700004, 700004, 100, 86.48, 0);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [DesignTables];" + Environment.NewLine + - "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 7, 114, 0, 0, 0, 0, 1, 5, 3.71901648545568);" + Environment.NewLine + + "INSERT INTO [DesignTables] VALUES (1, 3, 1, 1, 8, 114, 0, 0, 0, 0, 1, 5, 3.71901648545568);" + Environment.NewLine + Environment.NewLine + "DELETE FROM [Numerics];" + Environment.NewLine + "INSERT INTO [Numerics] VALUES (1, 3, 1, 1, 5, 4, 1, 50, 0.15, 0.01, 0.01, 0.01, 2, 1, 3000, 10000, 0.1, -6, 6, 25);" + Environment.NewLine + @@ -806,8 +806,8 @@ "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, 66, 0, 2, 21.1, 22.2, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "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, 2, 0, 1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 2, 0, 1, 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, 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 + @@ -816,7 +816,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 97, 12.2, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 103, 0, 4, 13.3, 14.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 104, 0, 4, 15.5, NULL, NULL, NULL, 0, 16.6, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 2, 0, 1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 108, 0, 4, 18.8, NULL, NULL, NULL, 0, 19.9, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 129, 20, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + Environment.NewLine + @@ -918,8 +918,8 @@ "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, 64, 0, 2, 23.3, NULL, NULL, NULL, 0, 24.4, 999999);" + Environment.NewLine + "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, 2, 0, 1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 2, 0, 1, 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, 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 + @@ -928,7 +928,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 97, 12.2, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 103, 0, 4, 13.3, 14.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 104, 0, 4, 15.5, NULL, NULL, NULL, 0, 16.6, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 2, 0, 1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 106, 0, 2, 29.9, NULL, NULL, NULL, 0, 30, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 108, 0, 4, 18.8, NULL, NULL, NULL, 0, 19.9, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 129, 20, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1031,8 +1031,8 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 61, 23.3, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 62, 0, 2, 24.4, 25.5, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "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, 2, 0, 1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 69, 4.4, 2, 0, 1, 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, 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 + @@ -1041,7 +1041,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 97, 12.2, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 103, 0, 4, 13.3, 14.4, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 104, 0, 4, 15.5, NULL, NULL, NULL, 0, 16.6, 999999);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 2, 0, 1, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 105, 17.7, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 106, 0, 2, 28.8, NULL, NULL, NULL, 0, 29.9, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 107, 30, 0, 0, NULL, NULL, NULL, 1, 0, 999999);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 111, 1, 1, 108, 0, 4, 18.8, NULL, NULL, NULL, 0, 19.9, 999999);" + Environment.NewLine + @@ -1167,13 +1167,13 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 80, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 11.1, 12.2, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 83, 0, 4, 58.8, NULL, NULL, NULL, 0, 59.9, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 86, 0, 4, 14.4, NULL, NULL, NULL, 0, 15.5, 50);" + Environment.NewLine + "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, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 2, 0, 1, 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 + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1182,7 +1182,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 97, 34.4, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 103, 0, 4, 35.5, 36.6, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 104, 0, 4, 37.7, NULL, NULL, NULL, 0, 38.8, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 108, 0, 4, 40, NULL, NULL, NULL, 0, 41.1, 99000);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 42.2, 43.3, NULL, NULL, 1, 0, 6000);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 131, 44.4, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1314,13 +1314,13 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 81, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 11.1, 12.2, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 84, 0, 4, 58.8, NULL, NULL, NULL, 0, 59.9, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 86, 0, 4, 14.4, NULL, NULL, NULL, 0, 15.5, 50);" + Environment.NewLine + "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, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 2, 0, 1, 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 + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1329,7 +1329,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 97, 34.4, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 103, 0, 4, 35.5, 36.6, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 104, 0, 4, 37.7, NULL, NULL, NULL, 0, 38.8, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 108, 0, 4, 40, NULL, NULL, NULL, 0, 41.1, 99000);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 42.2, 43.3, NULL, NULL, 1, 0, 6000);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 131, 44.4, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1460,13 +1460,13 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 80, 0, 4, 54.4, NULL, NULL, NULL, 0, 55.5, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 11.1, 12.2, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 83, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 86, 0, 4, 14.4, NULL, NULL, NULL, 0, 15.5, 50);" + Environment.NewLine + "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, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 2, 0, 1, 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 + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1475,7 +1475,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 97, 34.4, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 103, 0, 4, 35.5, 36.6, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 104, 0, 4, 37.7, NULL, NULL, NULL, 0, 38.8, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 106, 0, 2, 58.8, NULL, NULL, NULL, 0, 59.9, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 108, 0, 4, 40, NULL, NULL, NULL, 0, 41.1, 99000);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 42.2, 43.3, NULL, NULL, 1, 0, 6000);" + Environment.NewLine + @@ -1607,13 +1607,13 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 81, 0, 4, 54.4, NULL, NULL, NULL, 0, 55.5, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 82, 0, 2, 11.1, 12.2, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 84, 0, 4, 56.6, NULL, NULL, NULL, 0, 57.7, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 85, 13.3, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 86, 0, 4, 14.4, NULL, NULL, NULL, 0, 15.5, 50);" + Environment.NewLine + "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, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 91, 23.3, 2, 0, 1, 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 + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 94, 0, 4, 28.8, 29.9, NULL, NULL, 1, 0, 50);" + Environment.NewLine + @@ -1622,7 +1622,7 @@ "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 97, 34.4, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 103, 0, 4, 35.5, 36.6, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 104, 0, 4, 37.7, NULL, NULL, NULL, 0, 38.8, 50);" + Environment.NewLine + - "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 2, 0, 1, NULL, NULL, 1, 0, 50);" + Environment.NewLine + + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 105, 39.9, 0, 0, NULL, NULL, NULL, 1, 0, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 106, 0, 2, 58.8, NULL, NULL, NULL, 0, 59.9, 50);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 108, 0, 4, 40, NULL, NULL, NULL, 0, 41.1, 99000);" + Environment.NewLine + "INSERT INTO [VariableDatas] VALUES (1, 112, 1, 1, 130, 0, 2, 42.2, 43.3, NULL, NULL, 1, 0, 6000);" + Environment.NewLine + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/DesignTablesSettingsProviderTest.cs =================================================================== diff -u -r9ac410a7a38d8b4664b8847b946c0f04f87eee81 -r716dae0b1b95fb38ad2aa6630f9ba694aa4631b2 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision 9ac410a7a38d8b4664b8847b946c0f04f87eee81) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Providers/DesignTablesSettingsProviderTest.cs (.../DesignTablesSettingsProviderTest.cs) (revision 716dae0b1b95fb38ad2aa6630f9ba694aa4631b2) @@ -30,8 +30,8 @@ public class DesignTablesSettingsProviderTest { [Test] - [TestCase(HydraRingFailureMechanismType.AssessmentLevel, "205", 5.0, 15.0)] - [TestCase(HydraRingFailureMechanismType.QVariant, "205", 5.0, 15.0)] + [TestCase(HydraRingFailureMechanismType.AssessmentLevel, "205", 2.0, 4.0)] + [TestCase(HydraRingFailureMechanismType.QVariant, "205", 10, 50.0)] [TestCase(HydraRingFailureMechanismType.AssessmentLevel, "11-1", 3.28, 5.28)] [TestCase(HydraRingFailureMechanismType.QVariant, "11-1", 1.0, 5.0)] public void GetDesignTablesSetting_KnownRingIdAndFailureMechanismType_ReturnsExpectedDesignTablesSetting(HydraRingFailureMechanismType failureMechanismType, string ringId, double expectedValueMin, double expectedValueMax) @@ -47,13 +47,13 @@ Assert.AreEqual(expectedValueMax, designTablesSetting.ValueMax); } - [TestCase(HydraRingFailureMechanismType.AssessmentLevel, "4", 5.0, 15.0)] - [TestCase(HydraRingFailureMechanismType.QVariant, "4", 5.0, 15.0)] - [TestCase(HydraRingFailureMechanismType.WaveHeight, "205", 5.0, 15.0)] + [TestCase(HydraRingFailureMechanismType.AssessmentLevel, "4", 2.0, 4.0)] + [TestCase(HydraRingFailureMechanismType.QVariant, "4", 10.0, 50.0)] + [TestCase(HydraRingFailureMechanismType.WaveHeight, "205", 1.0, 4.0)] [TestCase(HydraRingFailureMechanismType.WavePeakPeriod, "205", 5.0, 15.0)] [TestCase(HydraRingFailureMechanismType.WaveSpectralPeriod, "205", 5.0, 15.0)] [TestCase(HydraRingFailureMechanismType.DikesOvertopping, "205", double.NaN, double.NaN)] - [TestCase(HydraRingFailureMechanismType.DikesHeight, "205", 5.0, 15.0)] + [TestCase(HydraRingFailureMechanismType.DikesHeight, "205", 2.0, 4.0)] [TestCase(HydraRingFailureMechanismType.DikesPiping, "205", double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresOvertopping, "205", double.NaN, double.NaN)] [TestCase(HydraRingFailureMechanismType.StructuresClosure, "205", double.NaN, double.NaN)]