Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingCalculationScenarioCreateExtensions.cs (.../PipingCalculationScenarioCreateExtensions.cs) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -91,16 +91,6 @@ entity.DampingFactorExitMean = inputParameters.DampingFactorExit.Mean.Value.ToNaNAsNull(); entity.DampingFactorExitStandardDeviation = inputParameters.DampingFactorExit.StandardDeviation.Value.ToNaNAsNull(); - - entity.SaturatedVolumicWeightOfCoverageLayerMean = inputParameters.SaturatedVolumicWeightOfCoverageLayer.Mean.Value.ToNaNAsNull(); - entity.SaturatedVolumicWeightOfCoverageLayerStandardDeviation = inputParameters.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation.Value.ToNaNAsNull(); - entity.SaturatedVolumicWeightOfCoverageLayerShift = inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift.Value.ToNaNAsNull(); - - entity.Diameter70Mean = inputParameters.Diameter70.Mean.Value.ToNaNAsNull(); - entity.Diameter70StandardDeviation = inputParameters.Diameter70.StandardDeviation.Value.ToNaNAsNull(); - - entity.DarcyPermeabilityMean = inputParameters.DarcyPermeability.Mean.Value.ToNaNAsNull(); - entity.DarcyPermeabilityStandardDeviation = inputParameters.DarcyPermeability.StandardDeviation.Value.ToNaNAsNull(); } private static void CreatePipingOutputEntity(PipingCalculationEntity entity, PipingOutput output, PersistenceRegistry registry) Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r4ba34be778eb5da83e7483592764e8164d2be8af -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 4ba34be778eb5da83e7483592764e8164d2be8af) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 04-aug-2016 10:16:21 */ +/* Created On : 04-aug-2016 11:21:18 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -233,15 +233,8 @@ 'ExitPointL' REAL, 'PhreaticLevelExitMean' REAL, 'PhreaticLevelExitStandardDeviation' REAL, - 'Diameter70Mean' REAL, - 'Diameter70StandardDeviation' REAL, - 'DarcyPermeabilityMean' REAL, - 'DarcyPermeabilityStandardDeviation' REAL, 'DampingFactorExitMean' REAL, 'DampingFactorExitStandardDeviation' REAL, - 'SaturatedVolumicWeightOfCoverageLayerMean' REAL, - 'SaturatedVolumicWeightOfCoverageLayerStandardDeviation' REAL, - 'SaturatedVolumicWeightOfCoverageLayerShift' REAL, 'RelevantForScenario' TINYINT (1) NOT NULL, 'ScenarioContribution' REAL, CONSTRAINT 'FK_PipingCalculationEntity_CalculationGroupEntity' FOREIGN KEY ('CalculationGroupEntityId') REFERENCES 'CalculationGroupEntity' ('CalculationGroupEntityId') ON DELETE No Action ON UPDATE No Action, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PipingCalculationEntity.cs (.../PipingCalculationEntity.cs) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -49,15 +49,8 @@ public Nullable ExitPointL { get; set; } public Nullable PhreaticLevelExitMean { get; set; } public Nullable PhreaticLevelExitStandardDeviation { get; set; } - public Nullable Diameter70Mean { get; set; } - public Nullable Diameter70StandardDeviation { get; set; } - public Nullable DarcyPermeabilityMean { get; set; } - public Nullable DarcyPermeabilityStandardDeviation { get; set; } public Nullable DampingFactorExitMean { get; set; } public Nullable DampingFactorExitStandardDeviation { get; set; } - public Nullable SaturatedVolumicWeightOfCoverageLayerMean { get; set; } - public Nullable SaturatedVolumicWeightOfCoverageLayerStandardDeviation { get; set; } - public Nullable SaturatedVolumicWeightOfCoverageLayerShift { get; set; } public byte RelevantForScenario { get; set; } public Nullable ScenarioContribution { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r4ba34be778eb5da83e7483592764e8164d2be8af -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 4ba34be778eb5da83e7483592764e8164d2be8af) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\Branch_WTI2017\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\repos\WettelijkToetsInstrumentarium\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 -r4ba34be778eb5da83e7483592764e8164d2be8af -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 4ba34be778eb5da83e7483592764e8164d2be8af) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -4,7 +4,7 @@ - + @@ -247,15 +247,8 @@ - - - - - - - @@ -1746,15 +1739,8 @@ - - - - - - - @@ -2780,15 +2766,8 @@ - - - - - - - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -r4ba34be778eb5da83e7483592764e8164d2be8af -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 4ba34be778eb5da83e7483592764e8164d2be8af) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -5,46 +5,46 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs =================================================================== diff -u -ra294987551b0b2d8a27b6e1bc6235b0e2351b6f4 -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision a294987551b0b2d8a27b6e1bc6235b0e2351b6f4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingCalculationEntityReadExtensions.cs (.../PipingCalculationEntityReadExtensions.cs) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -100,13 +100,6 @@ inputParameters.PhreaticLevelExit.StandardDeviation = (RoundedDouble)entity.PhreaticLevelExitStandardDeviation.ToNullAsNaN(); inputParameters.DampingFactorExit.Mean = (RoundedDouble)entity.DampingFactorExitMean.ToNullAsNaN(); inputParameters.DampingFactorExit.StandardDeviation = (RoundedDouble)entity.DampingFactorExitStandardDeviation.ToNullAsNaN(); - inputParameters.SaturatedVolumicWeightOfCoverageLayer.Mean = (RoundedDouble)entity.SaturatedVolumicWeightOfCoverageLayerMean.ToNullAsNaN(); - inputParameters.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation = (RoundedDouble)entity.SaturatedVolumicWeightOfCoverageLayerStandardDeviation.ToNullAsNaN(); - inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift = (RoundedDouble)entity.SaturatedVolumicWeightOfCoverageLayerShift.ToNullAsNaN(); - inputParameters.Diameter70.Mean = (RoundedDouble)entity.Diameter70Mean.ToNullAsNaN(); - inputParameters.Diameter70.StandardDeviation = (RoundedDouble)entity.Diameter70StandardDeviation.ToNullAsNaN(); - inputParameters.DarcyPermeability.Mean = (RoundedDouble)entity.DarcyPermeabilityMean.ToNullAsNaN(); - inputParameters.DarcyPermeability.StandardDeviation = (RoundedDouble)entity.DarcyPermeabilityStandardDeviation.ToNullAsNaN(); } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingCalculationScenarioUpdateExtensions.cs =================================================================== diff -u -rbb04ea61be6e4ce94cb1453c4578b0e9256168c4 -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingCalculationScenarioUpdateExtensions.cs (.../PipingCalculationScenarioUpdateExtensions.cs) (revision bb04ea61be6e4ce94cb1453c4578b0e9256168c4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/Piping/PipingCalculationScenarioUpdateExtensions.cs (.../PipingCalculationScenarioUpdateExtensions.cs) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -98,13 +98,6 @@ entity.PhreaticLevelExitStandardDeviation = inputParameters.PhreaticLevelExit.StandardDeviation.Value.ToNaNAsNull(); entity.DampingFactorExitMean = inputParameters.DampingFactorExit.Mean.Value.ToNaNAsNull(); entity.DampingFactorExitStandardDeviation = inputParameters.DampingFactorExit.StandardDeviation.Value.ToNaNAsNull(); - entity.SaturatedVolumicWeightOfCoverageLayerMean = inputParameters.SaturatedVolumicWeightOfCoverageLayer.Mean.Value.ToNaNAsNull(); - entity.SaturatedVolumicWeightOfCoverageLayerStandardDeviation = inputParameters.SaturatedVolumicWeightOfCoverageLayer.StandardDeviation.Value.ToNaNAsNull(); - entity.SaturatedVolumicWeightOfCoverageLayerShift = inputParameters.SaturatedVolumicWeightOfCoverageLayer.Shift.Value.ToNaNAsNull(); - entity.Diameter70Mean = inputParameters.Diameter70.Mean.Value.ToNaNAsNull(); - entity.Diameter70StandardDeviation = inputParameters.Diameter70.StandardDeviation.Value.ToNaNAsNull(); - entity.DarcyPermeabilityMean = inputParameters.DarcyPermeability.Mean.Value.ToNaNAsNull(); - entity.DarcyPermeabilityStandardDeviation = inputParameters.DarcyPermeability.StandardDeviation.Value.ToNaNAsNull(); } private static void UpdatePipingCalculationOutputs(PipingCalculationEntity entity, PipingCalculationScenario calculation, PersistenceRegistry registry) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs =================================================================== diff -u -r06e4debe3f4a9bdfb38c40b8c00ed013e8f7bb98 -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 06e4debe3f4a9bdfb38c40b8c00ed013e8f7bb98) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -188,19 +188,13 @@ Order = 0, Name = "1", DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }, new PipingCalculationEntity { PipingCalculationEntityId = 6, Order = 1, Name = "2", DampingFactorExitMean = 2, - SaturatedVolumicWeightOfCoverageLayerMean = 2, - Diameter70Mean = 2, - DarcyPermeabilityMean = 2 } } }; @@ -240,19 +234,13 @@ Order = 0, Name = "calculation1", DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }, new PipingCalculationEntity { PipingCalculationEntityId = 6, Order = 2, Name = "calculation2", DampingFactorExitMean = 2, - SaturatedVolumicWeightOfCoverageLayerMean = 2, - Diameter70Mean = 2, - DarcyPermeabilityMean = 2 } }, CalculationGroupEntity1 = Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r2363244674e6b7b97bead9a6855806420d368d80 -r4f92f7d10dc5db623169cf9ff52f506ce0238e9f --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 2363244674e6b7b97bead9a6855806420d368d80) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 4f92f7d10dc5db623169cf9ff52f506ce0238e9f) @@ -77,13 +77,6 @@ PhreaticLevelExitStandardDeviation = GetRandomNullableDoubleInRange(random, 0, 9999.99), DampingFactorExitMean = GetRandomNullableDoubleInRange(random, 1e-6, 9999.99), DampingFactorExitStandardDeviation = GetRandomNullableDoubleInRange(random, 0, 9999.99), - SaturatedVolumicWeightOfCoverageLayerMean = GetRandomNullableDoubleInRange(random, 10.0, 9999.99), - SaturatedVolumicWeightOfCoverageLayerStandardDeviation = GetRandomNullableDoubleInRange(random, 0, 9999.99), - SaturatedVolumicWeightOfCoverageLayerShift = GetRandomNullableDoubleInRange(random, -9999.99, 10.0), - Diameter70Mean = GetRandomNullableDoubleInRange(random, 1e-6, 9999.99), - Diameter70StandardDeviation = GetRandomNullableDoubleInRange(random, 0.0, 9999.99), - DarcyPermeabilityMean = GetRandomNullableDoubleInRange(random, 1e-6, 9999.99), - DarcyPermeabilityStandardDeviation = GetRandomNullableDoubleInRange(random, 0.0, 9999.99) }; var collector = new ReadConversionCollector(); @@ -143,9 +136,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }; var collector = new ReadConversionCollector(); @@ -182,9 +172,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }; var collector = new ReadConversionCollector(); @@ -210,9 +197,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }; var collector = new ReadConversionCollector(); @@ -241,9 +225,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }; var collector = new ReadConversionCollector(); @@ -275,9 +256,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }; var collector = new ReadConversionCollector(); @@ -325,9 +303,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1 }; var collector = new ReadConversionCollector(); @@ -352,9 +327,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1, PipingCalculationOutputEntity = new PipingCalculationOutputEntity { PipingCalculationOutputEntityId = outputId @@ -381,9 +353,6 @@ EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - SaturatedVolumicWeightOfCoverageLayerMean = 1, - Diameter70Mean = 1, - DarcyPermeabilityMean = 1, PipingSemiProbabilisticOutputEntity = new PipingSemiProbabilisticOutputEntity { PipingSemiProbabilisticOutputEntityId = outputId