Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresCalculationCreateExtensions.cs =================================================================== diff -u -rab20c4eb4ca81bd3845d50210d2bdb301177af6a -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresCalculationCreateExtensions.cs (.../HeightStructuresCalculationCreateExtensions.cs) (revision ab20c4eb4ca81bd3845d50210d2bdb301177af6a) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HeightStructures/HeightStructuresCalculationCreateExtensions.cs (.../HeightStructuresCalculationCreateExtensions.cs) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -90,7 +90,7 @@ entity.CriticalOvertoppingDischargeMean = input.CriticalOvertoppingDischarge.Mean.Value.ToNaNAsNull(); entity.CriticalOvertoppingDischargeCoefficientOfVariation = input.CriticalOvertoppingDischarge.CoefficientOfVariation.Value.ToNaNAsNull(); - entity.FailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion.ToNaNAsNull(); + entity.FailureProbabilityStructureWithErosion = input.FailureProbabilityStructureWithErosion; entity.WidthFlowAperturesMean = input.WidthFlowApertures.Mean.Value.ToNaNAsNull(); entity.WidthFlowAperturesCoefficientOfVariation = input.WidthFlowApertures.CoefficientOfVariation.Value.ToNaNAsNull(); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r749f4e50391ac399e02cb497966ae7d749d5fd1e -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 749f4e50391ac399e02cb497966ae7d749d5fd1e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 25-okt-2016 15:07:04 */ +/* Created On : 26-Oct-2016 10:02:33 AM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -906,7 +906,7 @@ 'FlowWidthAtBottomProtectionStandardDeviation' REAL, 'CriticalOvertoppingDischargeMean' REAL, 'CriticalOvertoppingDischargeCoefficientOfVariation' REAL, - 'FailureProbabilityStructureWithErosion' REAL, + 'FailureProbabilityStructureWithErosion' REAL NOT NULL, 'WidthFlowAperturesMean' REAL, 'WidthFlowAperturesCoefficientOfVariation' REAL, 'StormDurationMean' REAL, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs =================================================================== diff -u -r9f192d2deed876584c9b69cfc2f600d906674fa2 -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision 9f192d2deed876584c9b69cfc2f600d906674fa2) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/HeightStructuresCalculationEntity.cs (.../HeightStructuresCalculationEntity.cs) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -53,7 +53,7 @@ public Nullable FlowWidthAtBottomProtectionStandardDeviation { get; set; } public Nullable CriticalOvertoppingDischargeMean { get; set; } public Nullable CriticalOvertoppingDischargeCoefficientOfVariation { get; set; } - public Nullable FailureProbabilityStructureWithErosion { get; set; } + public double FailureProbabilityStructureWithErosion { get; set; } public Nullable WidthFlowAperturesMean { get; set; } public Nullable WidthFlowAperturesCoefficientOfVariation { get; set; } public Nullable StormDurationMean { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r749f4e50391ac399e02cb497966ae7d749d5fd1e -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 749f4e50391ac399e02cb497966ae7d749d5fd1e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\Clean_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r749f4e50391ac399e02cb497966ae7d749d5fd1e -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 749f4e50391ac399e02cb497966ae7d749d5fd1e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -4,7 +4,7 @@ - + @@ -352,7 +352,7 @@ - + @@ -2705,7 +2705,7 @@ - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r749f4e50391ac399e02cb497966ae7d749d5fd1e -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 749f4e50391ac399e02cb497966ae7d749d5fd1e) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -7,59 +7,59 @@ - - - - - - + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs =================================================================== diff -u -rcecb97ce5adb57cec9f89b557d6fafce09c9ed65 -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs (.../HeightStructuresCalculationEntityReadExtensions.cs) (revision cecb97ce5adb57cec9f89b557d6fafce09c9ed65) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensions.cs (.../HeightStructuresCalculationEntityReadExtensions.cs) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -22,7 +22,6 @@ using System; using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Data; -using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Data.Structures; using Ringtoets.HeightStructures.Data; @@ -80,13 +79,7 @@ inputParameters.FlowWidthAtBottomProtection.StandardDeviation = (RoundedDouble) entity.FlowWidthAtBottomProtectionStandardDeviation.ToNullAsNaN(); inputParameters.CriticalOvertoppingDischarge.Mean = (RoundedDouble) entity.CriticalOvertoppingDischargeMean.ToNullAsNaN(); inputParameters.CriticalOvertoppingDischarge.CoefficientOfVariation = (RoundedDouble) entity.CriticalOvertoppingDischargeCoefficientOfVariation.ToNullAsNaN(); - - double failureProbabilityStructureWithErosion = entity.FailureProbabilityStructureWithErosion.ToNullAsNaN(); - if (!double.IsNaN(failureProbabilityStructureWithErosion) && double.IsNaN(inputParameters.FailureProbabilityStructureWithErosion)) - { - inputParameters.FailureProbabilityStructureWithErosion = failureProbabilityStructureWithErosion; - } - + inputParameters.FailureProbabilityStructureWithErosion = entity.FailureProbabilityStructureWithErosion; inputParameters.WidthFlowApertures.Mean = (RoundedDouble) entity.WidthFlowAperturesMean.ToNullAsNaN(); inputParameters.WidthFlowApertures.CoefficientOfVariation = (RoundedDouble) entity.WidthFlowAperturesCoefficientOfVariation.ToNullAsNaN(); Index: Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs =================================================================== diff -u -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f) +++ Ringtoets/Common/src/Ringtoets.Common.Data/Structures/StructuresInputBase.cs (.../StructuresInputBase.cs) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -90,7 +90,7 @@ CoefficientOfVariation = (RoundedDouble) 0.15 }; - failureProbabilityStructureWithErosion = double.NaN; + failureProbabilityStructureWithErosion = 0; widthFlowApertures = new VariationCoefficientNormalDistribution(2) { Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs =================================================================== diff -u -rbcaf65d1f53f270fba046eaa396d3be77bd08c0f -r50e7c9ffa6c528abd1a1ee61784f78d5983465fe --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision bcaf65d1f53f270fba046eaa396d3be77bd08c0f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Structures/StructuresInputBaseTest.cs (.../StructuresInputBaseTest.cs) (revision 50e7c9ffa6c528abd1a1ee61784f78d5983465fe) @@ -115,7 +115,7 @@ DistributionAssert.AreEqual(widthFlowApertures, input.WidthFlowApertures); DistributionAssert.AreEqual(stormDuration, input.StormDuration); - Assert.IsNaN(input.FailureProbabilityStructureWithErosion); + Assert.AreEqual(0, input.FailureProbabilityStructureWithErosion); } [Test] @@ -172,21 +172,6 @@ #endregion - private class SimpleStructuresInput : StructuresInputBase - { - public bool Updated { get; private set; } - - protected override void UpdateStructureParameters() - { - Updated = true; - } - } - - private class SimpleStructure : StructureBase - { - public SimpleStructure(ConstructionProperties constructionProperties) : base(constructionProperties) {} - } - #region Hydraulic data [Test] @@ -559,5 +544,20 @@ } #endregion + + private class SimpleStructuresInput : StructuresInputBase + { + public bool Updated { get; private set; } + + protected override void UpdateStructureParameters() + { + Updated = true; + } + } + + private class SimpleStructure : StructureBase + { + public SimpleStructure(ConstructionProperties constructionProperties) : base(constructionProperties) { } + } } } \ No newline at end of file