Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx =================================================================== diff -u -ra4c5de0baacfc253e3e28c572267f909a8473586 -r066ad7278dae669b12b4955db4b6a042ce79d4e4 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx (.../RiskeerEntities.edmx) (revision a4c5de0baacfc253e3e28c572267f909a8473586) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx (.../RiskeerEntities.edmx) (revision 066ad7278dae669b12b4955db4b6a042ce79d4e4) @@ -1272,6 +1272,8 @@ + + @@ -1298,7 +1300,6 @@ - @@ -3084,18 +3085,6 @@ - - - - - - - - - - - - @@ -3980,10 +3969,6 @@ - - - - @@ -4463,7 +4448,7 @@ - + @@ -4719,10 +4704,6 @@ - - - - @@ -5143,7 +5124,7 @@ - + @@ -6231,12 +6212,13 @@ + + - @@ -6266,15 +6248,13 @@ - - - + @@ -7430,7 +7410,7 @@ - + @@ -8198,18 +8178,6 @@ - - - - - - - - - - - - @@ -9518,6 +9486,8 @@ + + @@ -9614,7 +9584,6 @@ - Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram =================================================================== diff -u -ra4c5de0baacfc253e3e28c572267f909a8473586 -r066ad7278dae669b12b4955db4b6a042ce79d4e4 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram (.../RiskeerEntities.edmx.diagram) (revision a4c5de0baacfc253e3e28c572267f909a8473586) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/RiskeerEntities.edmx.diagram (.../RiskeerEntities.edmx.diagram) (revision 066ad7278dae669b12b4955db4b6a042ce79d4e4) @@ -52,100 +52,100 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - - - - + + + + + @@ -218,7 +218,7 @@ - + @@ -282,7 +282,6 @@ - Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresCalculationEntity.cs =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r066ad7278dae669b12b4955db4b6a042ce79d4e4 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresCalculationEntity.cs (.../StabilityPointStructuresCalculationEntity.cs) (revision 066ad7278dae669b12b4955db4b6a042ce79d4e4) @@ -39,7 +39,6 @@ public StabilityPointStructuresCalculationEntity() { StabilityPointStructuresOutputEntities = new HashSet(); - StabilityPointStructuresSectionResultEntities = new HashSet(); } public long StabilityPointStructuresCalculationEntityId { get; set; } @@ -87,16 +86,15 @@ public double? VolumicWeightWater { get; set; } public double? FactorStormDurationOpenStructure { get; set; } public double? DrainCoefficientMean { get; set; } + public byte RelevantForScenario { get; set; } + public double? ScenarioContribution { get; set; } public virtual CalculationGroupEntity CalculationGroupEntity { get; set; } public virtual StabilityPointStructureEntity StabilityPointStructureEntity { get; set; } [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] public virtual ICollection StabilityPointStructuresOutputEntities { get; set; } - [SuppressMessage("Microsoft.Usage", "CA2227:CollectionPropertiesShouldBeReadOnly")] - public virtual ICollection StabilityPointStructuresSectionResultEntities { get; set; } - public byte UseBreakWater { get; set; } public byte BreakWaterType { get; set; } public double? BreakWaterHeight { get; set; } Index: Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresSectionResultEntity.cs =================================================================== diff -u -r95bbe12fc806f0d87b31ba178135094d3150ff8a -r066ad7278dae669b12b4955db4b6a042ce79d4e4 --- Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision 95bbe12fc806f0d87b31ba178135094d3150ff8a) +++ Riskeer/Storage/src/Riskeer.Storage.Core/DbContext/StabilityPointStructuresSectionResultEntity.cs (.../StabilityPointStructuresSectionResultEntity.cs) (revision 066ad7278dae669b12b4955db4b6a042ce79d4e4) @@ -34,7 +34,6 @@ { public long StabilityPointStructuresSectionResultEntityId { get; set; } public long FailureMechanismSectionEntityId { get; set; } - public long? StabilityPointStructuresCalculationEntityId { get; set; } public byte SimpleAssessmentResult { get; set; } public byte DetailedAssessmentResult { get; set; } public byte TailorMadeAssessmentResult { get; set; } @@ -43,6 +42,5 @@ public double? ManualAssemblyProbability { get; set; } public virtual FailureMechanismSectionEntity FailureMechanismSectionEntity { get; set; } - public virtual StabilityPointStructuresCalculationEntity StabilityPointStructuresCalculationEntity { get; set; } } } \ No newline at end of file Index: Riskeer/Storage/src/Riskeer.Storage.Core/Riskeer.risk =================================================================== diff -u -ra4c5de0baacfc253e3e28c572267f909a8473586 -r066ad7278dae669b12b4955db4b6a042ce79d4e4 Binary files differ