Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 1b27f4e06335f3ef96a374edfd8c6397ea43d57a) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 07-Sep-2017 3:09:10 PM */ +/* Created On : 11-Sep-2017 10:01:42 AM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1681,19 +1681,19 @@ 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = None, 2 = SuCalculated, 3 = CPhi, 4 = CPhiOrSuCalculated 'UsePop' TINYINT (1) NOT NULL, -- true of false 'AbovePhreaticLevelMean' REAL, - 'AbovePhreaticLevelDeviation' REAL, + 'AbovePhreaticLevelCoefficientOfVariation' REAL, 'AbovePhreaticLevelShift' REAL, 'BelowPhreaticLevelMean' REAL, - 'BelowPhreaticLevelDeviation' REAL, + 'BelowPhreaticLevelCoefficientOfVariation' REAL, 'BelowPhreaticLevelShift' REAL, 'CohesionMean' REAL, - 'CohesionDeviation' REAL, + 'CohesionCoefficientOfVariation' REAL, 'FrictionAngleMean' REAL, - 'FrictionAngleDeviation' REAL, + 'FrictionAngleCoefficientOfVariation' REAL, 'ShearStrengthRatioMean' REAL, - 'ShearStrengthRatioDeviation' REAL, + 'ShearStrengthRatioCoefficientOfVariation' REAL, 'StrengthIncreaseExponentMean' REAL, - 'StrengthIncreaseExponentDeviation' REAL, + 'StrengthIncreaseExponentCoefficientOfVariation' REAL, 'PopMean' REAL, 'PopDeviation' REAL, 'Order' INT (4) NOT NULL, @@ -1719,19 +1719,19 @@ 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = None, 2 = SuCalculated, 3 = CPhi, 4 = CPhiOrSuCalculated 'UsePop' TINYINT (1) NOT NULL, 'AbovePhreaticLevelMean' REAL, - 'AbovePhreaticLevelDeviation' REAL, + 'AbovePhreaticLevelCoefficientOfVariation' REAL, 'AbovePhreaticLevelShift' REAL, 'BelowPhreaticLevelMean' REAL, - 'BelowPhreaticLevelDeviation' REAL, + 'BelowPhreaticLevelCoefficientOfVariation' REAL, 'BelowPhreaticLevelShift' REAL, 'CohesionMean' REAL, - 'CohesionDeviation' REAL, + 'CohesionCoefficientOfVariation' REAL, 'FrictionAngleMean' REAL, - 'FrictionAngleDeviation' REAL, + 'FrictionAngleCoefficientOfVariation' REAL, 'ShearStrengthRatioMean' REAL, - 'ShearStrengthRatioDeviation' REAL, + 'ShearStrengthRatioCoefficientOfVariation' REAL, 'StrengthIncreaseExponentMean' REAL, - 'StrengthIncreaseExponentDeviation' REAL, + 'StrengthIncreaseExponentCoefficientOfVariation' REAL, 'PopMean' REAL, 'PopDeviation' REAL, 'Order' INT (4) NOT NULL, @@ -1769,15 +1769,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionInwardsDikeHeightOutputEntity_GrassCoverErosionInwardsOutputEntity' ON 'GrassCoverErosionInwardsDikeHeightOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsDikeHeightOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionInwardsDikeHeightOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsDikeHeightOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionInwardsDikeHeightOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2016,15 +2016,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionInwardsOutputEntity_GrassCoverErosionInwardsCalculationEntity' ON 'GrassCoverErosionInwardsOutputEntity' ('GrassCoverErosionInwardsCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionInwardsOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionInwardsOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2087,15 +2087,15 @@ CREATE INDEX 'IXFK_HeightStructuresOutputEntity_HeightStructuresCalculationEntity' ON 'HeightStructuresOutputEntity' ('HeightStructuresCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteHeightStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON HeightStructuresOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteHeightStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON HeightStructuresOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2142,15 +2142,15 @@ CREATE INDEX 'IXFK_ClosingStructuresOutputEntity_ClosingStructuresCalculationEntity' ON 'ClosingStructuresOutputEntity' ('ClosingStructuresCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteClosingStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON ClosingStructuresOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteClosingStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON ClosingStructuresOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2161,15 +2161,15 @@ CREATE INDEX 'IXFK_StabilityPointStructuresOutputEntity_StabilityPointStructuresCalculationEntity' ON 'StabilityPointStructuresOutputEntity' ('StabilityPointStructuresCalculationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteStabilityPointStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON StabilityPointStructuresOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteStabilityPointStructuresOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON StabilityPointStructuresOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2180,15 +2180,15 @@ CREATE INDEX 'IXFK_HydraulicLocationOutputEntity_HydraulicLocationEntity' ON 'HydraulicLocationOutputEntity' ('HydraulicLocationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] - AFTER DELETE - ON HydraulicLocationOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultSubMechanismIllustrationPointEntity - WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL - AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] + AFTER DELETE + ON HydraulicLocationOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultSubMechanismIllustrationPointEntity + WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL + AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; END; ; @@ -2199,15 +2199,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionOutwardsHydraulicLocationOutputEntity_GrassCoverErosionOutwardsHydraulicLocationEntity' ON 'GrassCoverErosionOutwardsHydraulicLocationOutputEntity' ('GrassCoverErosionOutwardsHydraulicLocationEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultSubMechanismIllustrationPointEntity - WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL - AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionOutwardsHydraulicLocationOutputEntity_RemoveGeneralResultSubMechanismIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionOutwardsHydraulicLocationOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultSubMechanismIllustrationPointEntity + WHERE OLD.GeneralResultSubMechanismIllustrationPointEntityId IS NOT NULL + AND GeneralResultSubMechanismIllustrationPointEntityId IS OLD.GeneralResultSubMechanismIllustrationPointEntityId; END; ; @@ -2234,15 +2234,15 @@ CREATE INDEX 'IXFK_GrassCoverErosionInwardsOvertoppingRateOutputEntity_GrassCoverErosionInwardsOutputEntity' ON 'GrassCoverErosionInwardsOvertoppingRateOutputEntity' ('GrassCoverErosionInwardsOutputEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOvertoppingRateOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] - AFTER DELETE - ON GrassCoverErosionInwardsOvertoppingRateOutputEntity - FOR EACH ROW -BEGIN - DELETE - FROM GeneralResultFaultTreeIllustrationPointEntity - WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL - AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteGrassCoverErosionInwardsOvertoppingRateOutputEntity_RemoveGeneralResultFaultTreeIllustrationPointEntity] + AFTER DELETE + ON GrassCoverErosionInwardsOvertoppingRateOutputEntity + FOR EACH ROW +BEGIN + DELETE + FROM GeneralResultFaultTreeIllustrationPointEntity + WHERE OLD.GeneralResultFaultTreeIllustrationPointEntityId IS NOT NULL + AND GeneralResultFaultTreeIllustrationPointEntityId IS OLD.GeneralResultFaultTreeIllustrationPointEntityId; END; ; @@ -2257,15 +2257,15 @@ CREATE INDEX 'IXFK_GeneralResultSubMechanismIllustrationPointStochastEntity_StochastEntity' ON 'GeneralResultSubMechanismIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGeneralResultSubMechanismIllustrationPointStochastEntity_RemoveStochastEntity] - AFTER DELETE - ON GeneralResultSubMechanismIllustrationPointStochastEntity - FOR EACH ROW -BEGIN - DELETE - FROM StochastEntity - WHERE OLD.StochastEntityId IS NOT NULL - AND StochastEntityId IS OLD.StochastEntityId; +CREATE TRIGGER [TR_AfterDeleteGeneralResultSubMechanismIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON GeneralResultSubMechanismIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE + FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL + AND StochastEntityId IS OLD.StochastEntityId; END; ; @@ -2280,15 +2280,15 @@ CREATE INDEX 'IXFK_FaultTreeIllustrationPointStochastEntity_StochastEntity' ON 'FaultTreeIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] - AFTER DELETE - ON FaultTreeIllustrationPointStochastEntity - FOR EACH ROW -BEGIN - DELETE - FROM StochastEntity - WHERE OLD.StochastEntityId IS NOT NULL - AND StochastEntityId IS OLD.StochastEntityId; +CREATE TRIGGER [TR_AfterDeleteFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON FaultTreeIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE + FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL + AND StochastEntityId IS OLD.StochastEntityId; END; ; @@ -2299,15 +2299,15 @@ CREATE INDEX 'IXFK_GeneralResultFaultTreeIllustrationPointStochastEntity_StochastEntity' ON 'GeneralResultFaultTreeIllustrationPointStochastEntity' ('StochastEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteGeneralResultFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] - AFTER DELETE - ON GeneralResultFaultTreeIllustrationPointStochastEntity - FOR EACH ROW -BEGIN - DELETE - FROM StochastEntity - WHERE OLD.StochastEntityId IS NOT NULL - AND StochastEntityId IS OLD.StochastEntityId; +CREATE TRIGGER [TR_AfterDeleteGeneralResultFaultTreeIllustrationPointStochastEntity_RemoveStochastEntity] + AFTER DELETE + ON GeneralResultFaultTreeIllustrationPointStochastEntity + FOR EACH ROW +BEGIN + DELETE + FROM StochastEntity + WHERE OLD.StochastEntityId IS NOT NULL + AND StochastEntityId IS OLD.StochastEntityId; END; ; @@ -2318,15 +2318,15 @@ CREATE INDEX 'IXFK_TopLevelSubMechanismIllustrationPointEntity_SubMechanismIllustrationPointEntity' ON 'TopLevelSubMechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteTopLevelSubMechanismIllustrationPointEntity_RemoveSubMechanismIllustrationPointEntity] - AFTER DELETE - ON TopLevelSubMechanismIllustrationPointEntity - FOR EACH ROW -BEGIN - DELETE - FROM SubMechanismIllustrationPointEntity - WHERE OLD.SubMechanismIllustrationPointEntityId IS NOT NULL - AND SubMechanismIllustrationPointEntityId IS OLD.SubMechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteTopLevelSubMechanismIllustrationPointEntity_RemoveSubMechanismIllustrationPointEntity] + AFTER DELETE + ON TopLevelSubMechanismIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE + FROM SubMechanismIllustrationPointEntity + WHERE OLD.SubMechanismIllustrationPointEntityId IS NOT NULL + AND SubMechanismIllustrationPointEntityId IS OLD.SubMechanismIllustrationPointEntityId; END; ; @@ -2337,15 +2337,15 @@ CREATE INDEX 'IXFK_TopLevelFaultTreeIllustrationPointEntity_GeneralResultFaultTreeIllustrationPointEntity' ON 'TopLevelFaultTreeIllustrationPointEntity' ('GeneralResultFaultTreeIllustrationPointEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteTopLevelFaultTreeIllustrationPointEntity_RemoveFaultTreeIllustrationPointEntity] - AFTER DELETE - ON TopLevelFaultTreeIllustrationPointEntity - FOR EACH ROW -BEGIN - DELETE - FROM FaultTreeIllustrationPointEntity - WHERE OLD.FaultTreeIllustrationPointEntityId IS NOT NULL - AND FaultTreeIllustrationPointEntityId IS OLD.FaultTreeIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteTopLevelFaultTreeIllustrationPointEntity_RemoveFaultTreeIllustrationPointEntity] + AFTER DELETE + ON TopLevelFaultTreeIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE + FROM FaultTreeIllustrationPointEntity + WHERE OLD.FaultTreeIllustrationPointEntityId IS NOT NULL + AND FaultTreeIllustrationPointEntityId IS OLD.FaultTreeIllustrationPointEntityId; END; ; @@ -2360,15 +2360,15 @@ CREATE INDEX 'IXFK_FaultTreeIllustrationPointEntity_SubMechanismIllustrationPointEntity' ON 'FaultTreeSubmechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId' ASC) ; -CREATE TRIGGER [TR_AfterDeleteFaultTreeSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity] - AFTER DELETE - ON FaultTreeSubmechanismIllustrationPointEntity - FOR EACH ROW -BEGIN - DELETE - FROM SubmechanismIllustrationPointEntity - WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL - AND SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId; +CREATE TRIGGER [TR_AfterDeleteFaultTreeSubmechanismIllustrationPointEntity_RemoveSubmechanismIllustrationPointEntity] + AFTER DELETE + ON FaultTreeSubmechanismIllustrationPointEntity + FOR EACH ROW +BEGIN + DELETE + FROM SubmechanismIllustrationPointEntity + WHERE OLD.SubmechanismIllustrationPointEntityId IS NOT NULL + AND SubmechanismIllustrationPointEntityId IS OLD.SubmechanismIllustrationPointEntityId; END; ; Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayer1DEntity.cs =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayer1DEntity.cs (.../MacroStabilityInwardsSoilLayer1DEntity.cs) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayer1DEntity.cs (.../MacroStabilityInwardsSoilLayer1DEntity.cs) (revision 1b27f4e06335f3ef96a374edfd8c6397ea43d57a) @@ -41,19 +41,19 @@ public byte ShearStrengthModel { get; set; } public byte UsePop { get; set; } public double? AbovePhreaticLevelMean { get; set; } - public double? AbovePhreaticLevelDeviation { get; set; } + public double? AbovePhreaticLevelCoefficientOfVariation { get; set; } public double? AbovePhreaticLevelShift { get; set; } public double? BelowPhreaticLevelMean { get; set; } - public double? BelowPhreaticLevelDeviation { get; set; } + public double? BelowPhreaticLevelCoefficientOfVariation { get; set; } public double? BelowPhreaticLevelShift { get; set; } public double? CohesionMean { get; set; } - public double? CohesionDeviation { get; set; } + public double? CohesionCoefficientOfVariation { get; set; } public double? FrictionAngleMean { get; set; } - public double? FrictionAngleDeviation { get; set; } + public double? FrictionAngleCoefficientOfVariation { get; set; } public double? ShearStrengthRatioMean { get; set; } - public double? ShearStrengthRatioDeviation { get; set; } + public double? ShearStrengthRatioCoefficientOfVariation { get; set; } public double? StrengthIncreaseExponentMean { get; set; } - public double? StrengthIncreaseExponentDeviation { get; set; } + public double? StrengthIncreaseExponentCoefficientOfVariation { get; set; } public double? PopMean { get; set; } public double? PopDeviation { get; set; } public int Order { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayer2DEntity.cs =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayer2DEntity.cs (.../MacroStabilityInwardsSoilLayer2DEntity.cs) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/MacroStabilityInwardsSoilLayer2DEntity.cs (.../MacroStabilityInwardsSoilLayer2DEntity.cs) (revision 1b27f4e06335f3ef96a374edfd8c6397ea43d57a) @@ -40,19 +40,19 @@ public byte ShearStrengthModel { get; set; } public byte UsePop { get; set; } public double? AbovePhreaticLevelMean { get; set; } - public double? AbovePhreaticLevelDeviation { get; set; } + public double? AbovePhreaticLevelCoefficientOfVariation { get; set; } public double? AbovePhreaticLevelShift { get; set; } public double? BelowPhreaticLevelMean { get; set; } - public double? BelowPhreaticLevelDeviation { get; set; } + public double? BelowPhreaticLevelCoefficientOfVariation { get; set; } public double? BelowPhreaticLevelShift { get; set; } public double? CohesionMean { get; set; } - public double? CohesionDeviation { get; set; } + public double? CohesionCoefficientOfVariation { get; set; } public double? FrictionAngleMean { get; set; } - public double? FrictionAngleDeviation { get; set; } + public double? FrictionAngleCoefficientOfVariation { get; set; } public double? ShearStrengthRatioMean { get; set; } - public double? ShearStrengthRatioDeviation { get; set; } + public double? ShearStrengthRatioCoefficientOfVariation { get; set; } public double? StrengthIncreaseExponentMean { get; set; } - public double? StrengthIncreaseExponentDeviation { get; set; } + public double? StrengthIncreaseExponentCoefficientOfVariation { get; set; } public double? PopMean { get; set; } public double? PopDeviation { get; set; } public int Order { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -r5d924a3334b0532730e8ea4bd9e97a5d48a72344 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 5d924a3334b0532730e8ea4bd9e97a5d48a72344) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 1b27f4e06335f3ef96a374edfd8c6397ea43d57a) @@ -19,7 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -// T4 code generation is enabled for model 'D:\WTI\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 -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 1b27f4e06335f3ef96a374edfd8c6397ea43d57a) @@ -4,7 +4,7 @@ - + @@ -711,19 +711,19 @@ - + - + - + - + - + - + @@ -740,19 +740,19 @@ - + - + - + - + - + - + @@ -4826,19 +4826,19 @@ - + - + - + - + - + - + @@ -4856,19 +4856,19 @@ - + - + - + - + - + - + @@ -7661,19 +7661,19 @@ - + - + - + - + - + - + @@ -7692,19 +7692,19 @@ - + - + - + - + - + - + Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 1b27f4e06335f3ef96a374edfd8c6397ea43d57a) @@ -6,92 +6,92 @@ - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - - + + + + + Index: build/DatabaseStructure.sql =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision bd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 1b27f4e06335f3ef96a374edfd8c6397ea43d57a) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 07-Sep-2017 3:09:10 PM */ +/* Created On : 11-Sep-2017 10:01:42 AM */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -1681,19 +1681,19 @@ 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = None, 2 = SuCalculated, 3 = CPhi, 4 = CPhiOrSuCalculated 'UsePop' TINYINT (1) NOT NULL, -- true of false 'AbovePhreaticLevelMean' REAL, - 'AbovePhreaticLevelDeviation' REAL, + 'AbovePhreaticLevelCoefficientOfVariation' REAL, 'AbovePhreaticLevelShift' REAL, 'BelowPhreaticLevelMean' REAL, - 'BelowPhreaticLevelDeviation' REAL, + 'BelowPhreaticLevelCoefficientOfVariation' REAL, 'BelowPhreaticLevelShift' REAL, 'CohesionMean' REAL, - 'CohesionDeviation' REAL, + 'CohesionCoefficientOfVariation' REAL, 'FrictionAngleMean' REAL, - 'FrictionAngleDeviation' REAL, + 'FrictionAngleCoefficientOfVariation' REAL, 'ShearStrengthRatioMean' REAL, - 'ShearStrengthRatioDeviation' REAL, + 'ShearStrengthRatioCoefficientOfVariation' REAL, 'StrengthIncreaseExponentMean' REAL, - 'StrengthIncreaseExponentDeviation' REAL, + 'StrengthIncreaseExponentCoefficientOfVariation' REAL, 'PopMean' REAL, 'PopDeviation' REAL, 'Order' INT (4) NOT NULL, @@ -1719,19 +1719,19 @@ 'ShearStrengthModel' TINYINT (1) NOT NULL, -- Enumtype: 1 = None, 2 = SuCalculated, 3 = CPhi, 4 = CPhiOrSuCalculated 'UsePop' TINYINT (1) NOT NULL, 'AbovePhreaticLevelMean' REAL, - 'AbovePhreaticLevelDeviation' REAL, + 'AbovePhreaticLevelCoefficientOfVariation' REAL, 'AbovePhreaticLevelShift' REAL, 'BelowPhreaticLevelMean' REAL, - 'BelowPhreaticLevelDeviation' REAL, + 'BelowPhreaticLevelCoefficientOfVariation' REAL, 'BelowPhreaticLevelShift' REAL, 'CohesionMean' REAL, - 'CohesionDeviation' REAL, + 'CohesionCoefficientOfVariation' REAL, 'FrictionAngleMean' REAL, - 'FrictionAngleDeviation' REAL, + 'FrictionAngleCoefficientOfVariation' REAL, 'ShearStrengthRatioMean' REAL, - 'ShearStrengthRatioDeviation' REAL, + 'ShearStrengthRatioCoefficientOfVariation' REAL, 'StrengthIncreaseExponentMean' REAL, - 'StrengthIncreaseExponentDeviation' REAL, + 'StrengthIncreaseExponentCoefficientOfVariation' REAL, 'PopMean' REAL, 'PopDeviation' REAL, 'Order' INT (4) NOT NULL, Index: design/DatabaseDesign.eap =================================================================== diff -u -rbd21fbd130d32ac7d8f5acc37e20dc2e7fb3b6d4 -r1b27f4e06335f3ef96a374edfd8c6397ea43d57a Binary files differ